// by cal2
// GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS)
// Cleanups/fixes by James L. Hammons
+// (C) 2010 Underground Software
+//
+// JLH = James L. Hammons <jlhamm@acm.org>
+//
+// Who When What
+// --- ---------- -------------------------------------------------------------
+// JLH 01/16/2010 Created this log ;-)
//
#include "joystick.h"
#include <SDL.h>
#include <time.h>
#include "gpu.h"
-#include "gui.h"
+//#include "gui.h"
#include "jaguar.h"
#include "log.h"
#include "settings.h"
if (keystate[vjs.p1KeyBindings[20]])
joypad_0_buttons[BUTTON_d] = 0x01;
- extern bool debounceRunKey;
+#warning "!!! FIX !!! (debounceRunKey)"
+// extern bool debounceRunKey;
+ bool debounceRunKey;
if (keystate[SDLK_ESCAPE])
{
if (!debounceRunKey)
- finished = true;
+#warning "!!! FIX !!! (finished = true)"
+;// finished = true;
}
else
debounceRunKey = false;
if (keystate[SDLK_TAB])
{
if (!GUIKeyHeld)
- showGUI = !showGUI, GUIKeyHeld = true;
+#warning "!!! FIX !!! (showGUI = !showGUI, ...)"
+;// showGUI = !showGUI, GUIKeyHeld = true;
}
else
GUIKeyHeld = false;
if (vjs.useJoystick)
{
- extern SDL_Joystick * joystick;
- int16 x = SDL_JoystickGetAxis(joystick, 0),
- y = SDL_JoystickGetAxis(joystick, 1);
+ extern SDL_Joystick * joystick1;
+ int16 x = SDL_JoystickGetAxis(joystick1, 0),
+ y = SDL_JoystickGetAxis(joystick1, 1);
if (x > 16384)
joypad_0_buttons[BUTTON_R] = 0x01;
if (y < -16384)
joypad_0_buttons[BUTTON_U] = 0x01;
- if (SDL_JoystickGetButton(joystick, 0) == SDL_PRESSED)
+ if (SDL_JoystickGetButton(joystick1, 0) == SDL_PRESSED)
joypad_0_buttons[BUTTON_A] = 0x01;
- if (SDL_JoystickGetButton(joystick, 1) == SDL_PRESSED)
+ if (SDL_JoystickGetButton(joystick1, 1) == SDL_PRESSED)
joypad_0_buttons[BUTTON_B] = 0x01;
- if (SDL_JoystickGetButton(joystick, 2) == SDL_PRESSED)
+ if (SDL_JoystickGetButton(joystick1, 2) == SDL_PRESSED)
joypad_0_buttons[BUTTON_C] = 0x01;
}
uint8 JoystickReadByte(uint32 offset)
{
-#warning No bounds checking done in JoystickReadByte!
+#warning "No bounds checking done in JoystickReadByte!"
// extern bool hardwareTypeNTSC;
offset &= 0x03;
int pad1Index = (joystick_ram[1] >> 4) & 0x0F;
// This is bad--we're assuming that a bit is set in the last case. Might not be so!
+// NOTE: values $7, B, D, & E are only legal ones for pad 0, (rows 3 to 0, in both cases)
+// $E, D, B, & 7 are only legal ones for pad 1
+// So the following code is WRONG!
+
if (!(pad0Index & 0x01))
pad0Index = 0;
else if (!(pad0Index & 0x02))
int pad0Index = joystick_ram[1] & 0x0F;
//unused int pad1Index = (joystick_ram[1] >> 4) & 0x0F;
+//WTF is this shit?
if (!(pad0Index & 0x01))
{
if (joypad_0_buttons[BUTTON_PAUSE])
if (joypad_0_buttons[BUTTON_OPTION])
data ^= 0x02;
}
+
return data;
}
void JoystickWriteWord(uint32 offset, uint16 data)
{
-#warning No bounds checking done for JoystickWriteWord!
+#warning "No bounds checking done for JoystickWriteWord!"
offset &= 0x03;
joystick_ram[offset + 0] = (data >> 8) & 0xFF;
joystick_ram[offset + 1] = data & 0xFF;