Previous 15994 Revisions Next

r8696 Tuesday 3rd August, 2010 at 09:24:54 UTC by Roberto Zandonà
[C64] implemented light gun (required by Army Days and Gangster); yet the crosshair is not visible
[src/mess/machine]c64.c cbmipt.c
[src/mess/video]vic6567.c

src/mess/machine/cbmipt.c
r8695r8696
156156   PORT_CATEGORY_ITEM( 0x03, "Mouse (Non Proportional) 1350", 13 )
157157   PORT_CATEGORY_ITEM( 0x04, "Lightpen", 14 )
158158//  PORT_CATEGORY_ITEM( 0x05, "Koala Pad", 15 )
159   PORT_CATEGORY_ITEM( 0x06, "Lightgun", 14 )
159160   PORT_CATEGORY_ITEM( 0x07, "No Device Connected", 17 )
160161   PORT_CATEGORY_CLASS( 0x70, 0x00, "Gameport B" )
161162   PORT_CATEGORY_ITEM( 0x00, DEF_STR( Joystick ), 20 )
r8695r8696
233234   PORT_BIT( 0x7e, 0x00, IPT_TRACKBALL_Y) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(1) PORT_CATEGORY(12) PORT_REVERSE
234235
235236   PORT_START("LIGHTX")
236   PORT_BIT( 0x7e, 0x00, IPT_TRACKBALL_X) PORT_NAME("Lightpen X Axis") PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(30) PORT_KEYDELTA(2) PORT_PLAYER(1) PORT_CATEGORY(14)
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)
237238   /* 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) */
238239
239240   PORT_START("LIGHTY")
240   PORT_BIT( 0x7e, 0x00, IPT_TRACKBALL_Y) PORT_NAME("Lightpen Y Axis") PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(30) PORT_KEYDELTA(2) PORT_PLAYER(1) PORT_CATEGORY(14)
241   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)
241242   /* 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) */
242243
243244   PORT_START("OTHER")
src/mess/machine/c64.c
r8695r8696
634634   UINT8 cia0porta = mos6526_pa_r(machine->device("cia_0"), 0);
635635   int controller1 = input_port_read(machine, "CTRLSEL") & 0x07;
636636   int controller2 = input_port_read(machine, "CTRLSEL") & 0x70;
637
638637   /* Notice that only a single input is defined for Mouse & Lightpen in both ports */
639638   switch (controller1)
640639   {
r8695r8696
664663            pot1 = input_port_read(machine, "LIGHTX");
665664         break;
666665
666      case 0x06:
667         if (which && (input_port_read(machine, "OTHER") & 0x04))   /* Lightpen Signal */
668            pot2 = 0x00;
669         break;
670
667671      case 0x00:
668672      case 0x07:
669673         break;
r8695r8696
701705            pot3 = input_port_read(machine, "LIGHTX");
702706         break;
703707
708      case 0x60:
709         if (which && (input_port_read(machine, "OTHER") & 0x04))   /* Lightpen Signal */
710            pot4 = 0x00;
711         break;
712
704713      case 0x00:
705714      case 0x70:
706715         break;
r8695r8696
712721
713722   if (input_port_read(machine, "CTRLSEL") & 0x80)      /* Swap */
714723   {
715      temp = pot1; pot1 = pot2; pot2 = temp;
716      temp = pot3; pot3 = pot4; pot4 = temp;
724      temp = pot1; pot1 = pot3; pot3 = temp;
725      temp = pot2; pot2 = pot4; pot4 = temp;
717726   }
718727
719728   switch (cia0porta & 0xc0)
720729   {
721   case 0x40:
722      return which ? pot2 : pot1;
730      case 0x40:
731         return which ? pot2 : pot1;
723732
724   case 0x80:
725      return which ? pot4 : pot3;
733      case 0x80:
734         return which ? pot4 : pot3;
726735
727   default:
728      return 0;
736      case 0xc0:
737         return which ? pot2 : pot1;
738
739      default:
740         return 0;
729741   }
730742}
731743
src/mess/video/vic6567.c
r8695r8696
205205#define VIC6569_Y_BEGIN         -6
206206#define VIC2_X_BEGIN         ((vic2->type == VIC6569 || vic2->type == VIC8566) ? VIC6569_X_BEGIN : VIC6567_X_BEGIN)
207207#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) / 2)
208#define VIC2_X_VALUE         ((LIGHTPEN_X_VALUE + VIC2_X_BEGIN + VIC2_MAME_XPOS))
209209#define VIC2_Y_VALUE         ((LIGHTPEN_Y_VALUE + VIC2_Y_BEGIN + VIC2_MAME_YPOS))
210210
211211#define VIC2E_K0_LEVEL         (vic2->reg[0x2f] & 0x01)
r8695r8696
321321
322322   switch (which)
323323   {
324   case 1:                     /* light pen */
325      /* and diode must recognize light */
326      if (1)
327      {
328         vic2->reg[0x13] = VIC2_X_VALUE;
329         vic2->reg[0x14] = VIC2_Y_VALUE;
330      }
331      vic2_set_interrupt(machine, 8, vic2);
332      break;
324      case 1:                     /* light pen */
325         /* and diode must recognize light */
326         if (1)
327         {
328            vic2->reg[0x13] = VIC2_X_VALUE;
329            vic2->reg[0x14] = VIC2_Y_VALUE;
330         }
331         vic2_set_interrupt(machine, 8, vic2);
332         break;
333333   }
334334}
335335

Previous 15994 Revisions Next


© 1998-2018 The MESS Team