Renamed clock.cpp/h to event.cpp/h, did some long overdue cleanups to

[virtualjaguar] / src / joystick.cpp

diff --git a/src/joystick.cpp b/src/joystick.cpp
index 5d969d0fd26d0d7b122c30d0ea2d07103968b0f5..aa81c0ff3ebc107412ba38e365a80dd6735bd759 100644 (file)
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -8,12 +8,12 @@
 
 #include "joystick.h"
 
-#include <time.h>
 #include <SDL.h>
-#include "jaguar.h"
-#include "log.h"
+#include <time.h>
 #include "gpu.h"
 #include "gui.h"
+#include "jaguar.h"
+#include "log.h"
 #include "settings.h"
 #include "video.h"
 
@@ -72,7 +72,6 @@ void JoystickInit(void)
 
 void JoystickExec(void)
 {
-//     extern bool useJoystick;
        uint8 * keystate = SDL_GetKeyState(NULL);
 
        memset(joypad_0_buttons, 0, 21);
@@ -155,7 +154,7 @@ void JoystickExec(void)
        if (keystate[SDLK_q])
                start_logging = 1;
        if (keystate[SDLK_w])
-               gpu_reset_stats();
+               GPUResetStats();
 //     if (keystate[SDLK_u])           jaguar_long_write(0xf1c384,jaguar_long_read(0xf1c384)+1);
        if (keystate[SDLK_d])
                DumpMainMemory();