MESS SVN History

15994 Revisions

r8697 Tuesday 3rd August, 2010 at 12:09:46 UTC by Roberto Zandonà
[C64] preliminary crosshair for light gun

[src/mess/machine]	cbm.c cbmipt.c
[src/mess/video]	vic6567.c

src/mess/machine/cbmipt.c
r8696	r8697
156	156	PORT_CATEGORY_ITEM( 0x03, "Mouse (Non Proportional) 1350", 13 )
157	157	PORT_CATEGORY_ITEM( 0x04, "Lightpen", 14 )
158	158	// PORT_CATEGORY_ITEM( 0x05, "Koala Pad", 15 )
159		PORT_CATEGORY_ITEM( 0x06, "Lightgun", 14 )
	159	PORT_CATEGORY_ITEM( 0x06, "Lightgun", 16 )
160	160	PORT_CATEGORY_ITEM( 0x07, "No Device Connected", 17 )
161	161	PORT_CATEGORY_CLASS( 0x70, 0x00, "Gameport B" )
162	162	PORT_CATEGORY_ITEM( 0x00, DEF_STR( Joystick ), 20 )
r8696	r8697
235	235
236	236	PORT_START("LIGHTX")
237	237	PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X) PORT_NAME("Lightpen X Axis") PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_PLAYER(1) PORT_CATEGORY(14)
238		/* PORT_BIT( 0x1ff,0,IPT_PADDLE) PORT_SENSITIVITY(30) PORT_KEYDELTA(2) PORT_MINMAX(0,320-1) PORT_CODE_DEC(KEYCODE_LEFT) PORT_CODE_INC(KEYCODE_RIGHT) PORT_CODE_DEC(JOYCODE_X_LEFT_SWITCH) PORT_CODE_INC(JOYCODE_X_RIGHT_SWITCH) PORT_PLAYER(1) */
239	238
240	239	PORT_START("LIGHTY")
241	240	PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y) PORT_NAME("Lightpen Y Axis") PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(30) PORT_KEYDELTA(20) PORT_PLAYER(1) PORT_CATEGORY(14)
242		/* PORT_BIT( 0xff,0,IPT_PADDLE) PORT_SENSITIVITY(30) PORT_KEYDELTA(2) PORT_MINMAX(0,200-1) PORT_CODE_DEC(KEYCODE_UP) PORT_CODE_INC(KEYCODE_DOWN) PORT_CODE_DEC(JOYCODE_Y_UP_SWITCH) PORT_CODE_INC(JOYCODE_Y_DOWN_SWITCH) PORT_PLAYER(2) */
243	241
244	242	PORT_START("OTHER")
245	243	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Paddle 1 Button") PORT_CATEGORY(11) PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(JOYCODE_BUTTON1)

src/mess/machine/cbm.c
r8696	r8697
23	23
24	24	static TIMER_CALLBACK( lightpen_tick )
25	25	{
26		if ((input_port_read(machine, "CTRLSEL") & 0x07) == 0x04)
	26	if (((input_port_read(machine, "CTRLSEL") & 0x07) == 0x04) \|\| ((input_port_read(machine, "CTRLSEL") & 0x07) == 0x06))
27	27	{
28	28	/* enable lightpen crosshair */
29	29	crosshair_set_screen(machine, 0, CROSSHAIR_SCREEN_ALL);

src/mess/video/vic6567.c
r8696	r8697
205	205	#define VIC6569_Y_BEGIN -6
206	206	#define VIC2_X_BEGIN ((vic2->type == VIC6569 \|\| vic2->type == VIC8566) ? VIC6569_X_BEGIN : VIC6567_X_BEGIN)
207	207	#define VIC2_Y_BEGIN ((vic2->type == VIC6569 \|\| vic2->type == VIC8566) ? VIC6569_Y_BEGIN : VIC6567_Y_BEGIN)
208		#define VIC2_X_VALUE ((LIGHTPEN_X_VALUE + VIC2_X_BEGIN + VIC2_MAME_XPOS))
209		#define VIC2_Y_VALUE ((LIGHTPEN_Y_VALUE + VIC2_Y_BEGIN + VIC2_MAME_YPOS))
	208	#define VIC2_X_VALUE ((LIGHTPEN_X_VALUE + 38) / 2)
	209	#define VIC2_Y_VALUE ((LIGHTPEN_Y_VALUE + 6) )
210	210
211	211	#define VIC2E_K0_LEVEL (vic2->reg[0x2f] & 0x01)
212	212	#define VIC2E_K1_LEVEL (vic2->reg[0x2f] & 0x02)

15994 Revisions