More changes for upcoming 1.0.5 release

[virtualjaguar] / src / joystick.cpp

diff --git a/src/joystick.cpp b/src/joystick.cpp
index 6ed1fa12194989594a9e234d44884e57d2e8c15b..89a0098afe470d067c8669af3043e31ea653866d 100644 (file)
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -6,17 +6,10 @@
 // Cleanups/fixes by James L. Hammons
 //
 
-//#ifndef __PORT__
-//#include "include/stdafx.h"
-//#include <mmsystem.h>
-//#endif
 #include <time.h>
 #include <SDL.h>
-//#include "SDLptc.h"
 #include "jaguar.h"
 
-void main_screen_switch(void);
-
 #define BUTTON_U               0
 #define BUTTON_D               1
 #define BUTTON_L               2
@@ -40,6 +33,12 @@ void main_screen_switch(void);
 #define BUTTON_OPTION  19
 #define BUTTON_PAUSE   20
 
+// Private function prototypes
+
+void main_screen_switch(void);
+
+// Global vars
+
 static uint8 joystick_ram[4];
 static uint8 joypad_0_buttons[21];
 static uint8 joypad_1_buttons[21];
@@ -51,10 +50,12 @@ int gpu_start_log = 0;
 int op_start_log = 0;
 int blit_start_log = 0;
 int effect_start = 0;
+int effect_start2 = 0, effect_start3 = 0, effect_start4 = 0, effect_start5 = 0, effect_start6 = 0;
 bool interactiveMode = false;
 bool iLeft, iRight, iToggle = false;
 bool keyHeld1 = false, keyHeld2 = false, keyHeld3 = false;
 int objectPtr = 0;
+bool startMemLog = false;
 
 
 void main_screen_switch(void)
@@ -68,8 +69,6 @@ void main_screen_switch(void)
        if (fullscreen)
                mainSurfaceFlags |= SDL_FULLSCREEN;
 
-//???Should we do this???
-//     SDL_FreeSurface(mainSurface);
        mainSurface = SDL_SetVideoMode(tom_width, tom_height, 16, mainSurfaceFlags);
 
        if (mainSurface == NULL)
@@ -79,13 +78,6 @@ void main_screen_switch(void)
        }
 
        SDL_WM_SetCaption("Virtual Jaguar", "Virtual Jaguar");
-/*     if (fullscreen)
-               console.option("fullscreen output");
-       else
-               console.option("windowed output");*/
-
-//     console.close();
-//     console.open("Virtual Jaguar", tom_width, tom_height, format);
 }
 
 void joystick_init(void)
@@ -98,12 +90,12 @@ void joystick_exec(void)
        extern SDL_Joystick * joystick;
        extern bool useJoystick;
        uint8 * keystate = SDL_GetKeyState(NULL);
-//     extern Console console;
        
        memset(joypad_0_buttons, 0, 21);
        memset(joypad_1_buttons, 0, 21);
        gpu_start_log = 0;                                                      // Only log while key down!
        effect_start = 0;
+       effect_start2 = effect_start3 = effect_start4 = effect_start5 = effect_start6 = 0;
        blit_start_log = 0;
        iLeft = iRight = false;
 
@@ -145,8 +137,19 @@ void joystick_exec(void)
                op_start_log = 1;
        if (keystate[SDLK_b])
                blit_start_log = 1;
+
        if (keystate[SDLK_1])
                effect_start = 1;
+       if (keystate[SDLK_2])
+               effect_start2 = 1;
+       if (keystate[SDLK_3])
+               effect_start3 = 1;
+       if (keystate[SDLK_4])
+               effect_start4 = 1;
+       if (keystate[SDLK_5])
+               effect_start5 = 1;
+       if (keystate[SDLK_6])
+               effect_start6 = 1;
 
        if (keystate[SDLK_i])
                interactiveMode = true;
@@ -175,6 +178,11 @@ void joystick_exec(void)
        else
                keyHeld3 = false;
 
+       if (keystate[SDLK_e])
+               startMemLog = true;
+       if (keystate[SDLK_r])
+               WriteLog("\n--------> MARK!\n\n");
+
        if (keystate[SDLK_KP0])         joypad_0_buttons[BUTTON_0] = 0x01;
        if (keystate[SDLK_KP1])         joypad_0_buttons[BUTTON_1] = 0x01;
        if (keystate[SDLK_KP2])         joypad_0_buttons[BUTTON_2] = 0x01;
@@ -192,11 +200,8 @@ void joystick_exec(void)
     /* Added/Changed by SDLEMU (http://sdlemu.ngemu.com */
     /* Joystick support                                 */
     
-//    if (console.JoyEnabled() == 1)
     if (useJoystick)
     {
-//             int16 x = SDL_JoystickGetAxis(console.joystick, 0),
-//                     y = SDL_JoystickGetAxis(console.joystick, 1);
                int16 x = SDL_JoystickGetAxis(joystick, 0),
                        y = SDL_JoystickGetAxis(joystick, 1);
        
@@ -209,13 +214,10 @@ void joystick_exec(void)
                if (y < -16384)
                        joypad_0_buttons[BUTTON_U] = 0x01;
        
-//             if (SDL_JoystickGetButton(console.joystick, 0) == SDL_PRESSED)
                if (SDL_JoystickGetButton(joystick, 0) == SDL_PRESSED)
                        joypad_0_buttons[BUTTON_A] = 0x01;
-//             if (SDL_JoystickGetButton(console.joystick, 1) == SDL_PRESSED)
                if (SDL_JoystickGetButton(joystick, 1) == SDL_PRESSED)
                        joypad_0_buttons[BUTTON_B] = 0x01;
-//             if (SDL_JoystickGetButton(console.joystick, 2) == SDL_PRESSED)
                if (SDL_JoystickGetButton(joystick, 2) == SDL_PRESSED)
                        joypad_0_buttons[BUTTON_C] = 0x01;
        }
@@ -236,18 +238,6 @@ void joystick_done(void)
 {
 }
 
-void joystick_byte_write(uint32 offset, uint8 data)
-{
-       joystick_ram[offset&0x03] = data;
-}
-
-void joystick_word_write(uint32 offset, uint16 data)
-{
-       offset &= 0x03;
-       joystick_ram[offset+0] = (data >> 8) & 0xFF;
-       joystick_ram[offset+1] = data & 0xFF;
-}
-
 uint8 joystick_byte_read(uint32 offset)
 {
        extern bool hardwareTypeNTSC;
@@ -259,7 +249,7 @@ uint8 joystick_byte_read(uint32 offset)
                int pad0Index = joystick_ram[1] & 0x0F;
                int pad1Index = (joystick_ram[1] >> 4) & 0x0F;
                
-// This is bad--we're assuming that a bit is set in the last case
+// This is bad--we're assuming that a bit is set in the last case. Might not be so!
                if (!(pad0Index & 0x01)) 
                        pad0Index = 0;
                else if (!(pad0Index & 0x02)) 
@@ -291,7 +281,6 @@ uint8 joystick_byte_read(uint32 offset)
        }
        else if (offset == 3)
        {
-//             uint8 data = ((1 << 5) | (1 << 4) | 0x0F);
                uint8 data = 0x2F | (hardwareTypeNTSC ? 0x10 : 0x00);
                int pad0Index = joystick_ram[1] & 0x0F;
 //unused               int pad1Index = (joystick_ram[1] >> 4) & 0x0F;
@@ -328,3 +317,15 @@ uint16 joystick_word_read(uint32 offset)
 {
        return ((uint16)joystick_byte_read((offset+0)&0x03) << 8) | joystick_byte_read((offset+1)&0x03);
 }
+
+void joystick_byte_write(uint32 offset, uint8 data)
+{
+       joystick_ram[offset&0x03] = data;
+}
+
+void joystick_word_write(uint32 offset, uint16 data)
+{
+       offset &= 0x03;
+       joystick_ram[offset+0] = (data >> 8) & 0xFF;
+       joystick_ram[offset+1] = data & 0xFF;
+}