The-Homebrew-Cloud/frodo-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/frodo-wii.git synced 2024-11-22 19:39:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed pause problem on menu entry (fake -1 keypress afterwards)

Browse Source
This commit is contained in:
simon.kagstrom 2009-01-05 14:38:10 +00:00
parent 2b7277d676
commit 32fb147ba4
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
Src/C64_SDL.i
View File

@ -255,7 +255,6 @@ void C64::display_options(Prefs *np)
menu_fini(&display_menu); menu_fini(&display_menu);
} }
void C64::save_load_state(Prefs *np) void C64::save_load_state(Prefs *np)
{ {
menu_t save_load_menu; menu_t save_load_menu;
@ -338,7 +337,7 @@ void C64::Run(void)
} }
/* From dreamcast port */ /* From dreamcast port */
static const char *auto_seq[4] = static char *auto_seq[4] =
{ {
"\nLOAD \"*\",8,1\nRUN\n", "\nLOAD \"*\",8,1\nRUN\n",
"\nLOAD \"*\",9,1\nRUN\n", "\nLOAD \"*\",9,1\nRUN\n",
@ -353,6 +352,10 @@ extern "C" int get_kc_from_char(char c_in, int *shifted);
void C64::VBlank(bool draw_frame) void C64::VBlank(bool draw_frame)
{ {
// Poll joysticks
TheCIA1->Joystick1 = poll_joystick(0);
TheCIA1->Joystick2 = poll_joystick(1);
// Poll keyboard // Poll keyboard
TheDisplay->PollKeyboard(TheCIA1->KeyMatrix, TheCIA1->RevMatrix, &joykey); TheDisplay->PollKeyboard(TheCIA1->KeyMatrix, TheCIA1->RevMatrix, &joykey);
if (TheDisplay->quit_requested) if (TheDisplay->quit_requested)
@ -380,9 +383,6 @@ void C64::VBlank(bool draw_frame)
} }
} }
} }
// Poll joysticks
TheCIA1->Joystick1 = poll_joystick(0);
TheCIA1->Joystick2 = poll_joystick(1);
// Count TOD clocks // Count TOD clocks
TheCIA1->CountTOD(); TheCIA1->CountTOD();
@ -460,6 +460,8 @@ void C64::VBlank(bool draw_frame)
this->NewPrefs(np); this->NewPrefs(np);
ThePrefs = *np; ThePrefs = *np;
ThePrefs.Save(PREFS_PATH); ThePrefs.Save(PREFS_PATH);
TheDisplay->FakeKeyPress(-1, false, TheCIA1->KeyMatrix,
TheCIA1->RevMatrix);
this->have_a_break = false; this->have_a_break = false;
} }
@ -540,23 +542,24 @@ uint8 C64::poll_joystick(int port)
j &= 0xef; // Button j &= 0xef; // Button
if (held & WPAD_BUTTON_HOME) if (held & WPAD_BUTTON_HOME)
this->enter_menu(); this->enter_menu();
else
if ( (held & WPAD_BUTTON_A) && ThePrefs.JoystickKeyBinding[0]) {
TheDisplay->FakeKeyPressRepeat(ThePrefs.JoystickKeyBinding[0], if ( (held & WPAD_BUTTON_A) && ThePrefs.JoystickKeyBinding[0])
false, TheCIA1->KeyMatrix, TheCIA1->RevMatrix); TheDisplay->FakeKeyPressRepeat(ThePrefs.JoystickKeyBinding[0],
if ( (held & WPAD_BUTTON_B) && ThePrefs.JoystickKeyBinding[1]) false, TheCIA1->KeyMatrix, TheCIA1->RevMatrix);
TheDisplay->FakeKeyPressRepeat(ThePrefs.JoystickKeyBinding[1], if ( (held & WPAD_BUTTON_B) && ThePrefs.JoystickKeyBinding[1])
false, TheCIA1->KeyMatrix, TheCIA1->RevMatrix); TheDisplay->FakeKeyPressRepeat(ThePrefs.JoystickKeyBinding[1],
if ( (held & WPAD_BUTTON_PLUS) && ThePrefs.JoystickKeyBinding[2]) false, TheCIA1->KeyMatrix, TheCIA1->RevMatrix);
TheDisplay->FakeKeyPressRepeat(ThePrefs.JoystickKeyBinding[2], if ( (held & WPAD_BUTTON_PLUS) && ThePrefs.JoystickKeyBinding[2])
false, TheCIA1->KeyMatrix, TheCIA1->RevMatrix); TheDisplay->FakeKeyPressRepeat(ThePrefs.JoystickKeyBinding[2],
if ( (held & WPAD_BUTTON_MINUS) && ThePrefs.JoystickKeyBinding[3]) false, TheCIA1->KeyMatrix, TheCIA1->RevMatrix);
TheDisplay->FakeKeyPressRepeat(ThePrefs.JoystickKeyBinding[3], if ( (held & WPAD_BUTTON_MINUS) && ThePrefs.JoystickKeyBinding[3])
false, TheCIA1->KeyMatrix, TheCIA1->RevMatrix); TheDisplay->FakeKeyPressRepeat(ThePrefs.JoystickKeyBinding[3],
if ( (held & WPAD_BUTTON_1) && ThePrefs.JoystickKeyBinding[4]) false, TheCIA1->KeyMatrix, TheCIA1->RevMatrix);
TheDisplay->FakeKeyPressRepeat(ThePrefs.JoystickKeyBinding[4], if ( (held & WPAD_BUTTON_1) && ThePrefs.JoystickKeyBinding[4])
false, TheCIA1->KeyMatrix, TheCIA1->RevMatrix); TheDisplay->FakeKeyPressRepeat(ThePrefs.JoystickKeyBinding[4],
false, TheCIA1->KeyMatrix, TheCIA1->RevMatrix);
}
return j; return j;
#elif defined(HAVE_LINUX_JOYSTICK_H) #elif defined(HAVE_LINUX_JOYSTICK_H)

2
Src/Display.h
View File

@ -131,7 +131,7 @@ private:
char speedometer_string[16]; // Speedometer text char speedometer_string[16]; // Speedometer text
void draw_string(SDL_Surface *s, int x, int y, const char *str, uint8 front_color, uint8 back_color); void draw_string(SDL_Surface *s, int x, int y, const char *str, uint8 front_color, uint8 back_color);
#endif #endif
#ifdef __unix #ifdef __unix
void draw_led(int num, int state); // Draw one LED void draw_led(int num, int state); // Draw one LED
static void pulse_handler(...); // LED error blinking static void pulse_handler(...); // LED error blinking