misc fixes

lantus · Aug 19, 2018 · cb92973 · cb92973
1 parent 9b1f0cc
commit cb92973
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/src/nx/nx_display.c b/src/nx/nx_display.c
@@ -148,10 +148,10 @@ void osd_update_video_and_audio(struct mame_display *display)
          const uint32_t x = display->game_visible_area.min_x;
          const uint32_t y = display->game_visible_area.min_y;
          const uint32_t pitch = display->game_bitmap->rowpixels;
-
+		  
          // Copy pixels
 
-         //if(display->game_bitmap->depth == 16)			
+         if(display->game_bitmap->depth == 16)			
          {            	
 
 			// theres probably a much cleaner way of doing this

diff --git a/src/nx/nx_input.c b/src/nx/nx_input.c
@@ -81,10 +81,10 @@ void nxCustomizeInputPortDefaults( struct ipd *defaults )
 		switch( entry->type )
 		{
 		case IPT_UI_CONFIGURE:
-			/*REMAP_SEQ_7(  	BUTTONCODE( 0, BUTTON_RA ), CODE_OR, 
-							BUTTONCODE( 1, BUTTON_RA ), CODE_OR,
-							BUTTONCODE( 2, BUTTON_RA ), CODE_OR,
-							BUTTONCODE( 3, BUTTON_RA ));*/
+			REMAP_SEQ_7(  	BUTTONCODE( 0, BUTTON_RA_STICK ), CODE_OR, 
+							BUTTONCODE( 1, BUTTON_RA_STICK ), CODE_OR,
+							BUTTONCODE( 2, BUTTON_RA_STICK ), CODE_OR,
+							BUTTONCODE( 3, BUTTON_RA_STICK ));
 			break;
 		case IPT_UI_CANCEL:
 			REMAP_SEQ_11(	JOYCODE_1_SELECT, JOYCODE_1_START, CODE_OR, 

diff --git a/src/nx/nx_joystick.c b/src/nx/nx_joystick.c
@@ -78,6 +78,7 @@ void nxInitializeJoystick( void )
     ADDENTRY( "Minus",        JOYCODE( stickIndex, JT_BUTTON, BUTTON_MINUS ),          STDCODE( SELECT ) );     
     ADDENTRY( "LThumb",       JOYCODE( stickIndex, JT_BUTTON, BUTTON_ZL ),             CODE_OTHER );
     ADDENTRY( "RThumb",       JOYCODE( stickIndex, JT_BUTTON, BUTTON_ZR ),             CODE_OTHER );
+	ADDENTRY( "RA Stick",     JOYCODE( stickIndex, JT_BUTTON, BUTTON_RA_STICK ),       CODE_OTHER );
 
 
   }
@@ -130,7 +131,11 @@ int osd_is_joy_pressed( int joycode )
 				case BUTTON_PLUS:
 					return (buttons & KEY_PLUS);
 				case BUTTON_MINUS:
-					return (buttons & KEY_MINUS);				 
+					return (buttons & KEY_MINUS);		
+				case BUTTON_LA_STICK:
+					return (buttons & KEY_LSTICK);	
+				case BUTTON_RA_STICK:
+					return (buttons & KEY_RSTICK);						
 			}
 			break;
 

diff --git a/src/nx/nx_joystick.h b/src/nx/nx_joystick.h
@@ -47,7 +47,9 @@ typedef enum ButtonID {
   BUTTON_PLUS,
   BUTTON_MINUS,   
   BUTTON_ZL,               
-  BUTTON_ZR                
+  BUTTON_ZR,
+  BUTTON_LA_STICK,
+  BUTTON_RA_STICK,
 };