Fixed a bug in turbo mode, changed + and - buttons

This commit is contained in:
fabio.olimpieri 2012-05-06 17:23:35 +00:00
parent b30f329a50
commit ec7e56b438
4 changed files with 6 additions and 4 deletions

View File

@ -514,8 +514,8 @@ inline void show_screen (int tstados) {
ordenador.tstados_counter += tstados; ordenador.tstados_counter += tstados;
ordenador.cicles_counter += tstados; ordenador.cicles_counter += tstados;
if (curr_frames!=jump_frames) { if (curr_frames<jump_frames) { //Jump the frame drawing
if (ordenador.tstados_counter>=69888) { if (ordenador.tstados_counter>=69888) {
ordenador.tstados_counter-=69888; ordenador.tstados_counter-=69888;
ordenador.interr = 1; ordenador.interr = 1;

View File

@ -361,6 +361,7 @@ static void emulation_settings(void)
} else { } else {
ordenador.tst_sample=3500000/ordenador.freq; ordenador.tst_sample=3500000/ordenador.freq;
jump_frames=0; jump_frames=0;
curr_frames=0;
} }
ordenador.dblscan = !submenus[4]; ordenador.dblscan = !submenus[4];

View File

@ -696,10 +696,10 @@ uint32_t menu_wait_key_press(void)
keys |= KEY_ESCAPE; keys |= KEY_ESCAPE;
if (SDL_JoystickGetButton(joy, 5) != 0 || /* + */ if (SDL_JoystickGetButton(joy, 5) != 0 || /* + */
SDL_JoystickGetButton(joy, 18) != 0) /* C+ */ SDL_JoystickGetButton(joy, 18) != 0) /* C+ */
keys |= KEY_PAGEDOWN; keys |= KEY_PAGEUP;
if (SDL_JoystickGetButton(joy, 4) != 0 || /* - */ if (SDL_JoystickGetButton(joy, 4) != 0 || /* - */
SDL_JoystickGetButton(joy, 17) != 0) /* C- */ SDL_JoystickGetButton(joy, 17) != 0) /* C- */
keys |= KEY_PAGEUP; keys |= KEY_PAGEDOWN;
joy_bottons_last[nr][0]=SDL_JoystickGetButton(joy, 0) ; /* A */ joy_bottons_last[nr][0]=SDL_JoystickGetButton(joy, 0) ; /* A */
joy_bottons_last[nr][1] =SDL_JoystickGetButton(joy, 3) ; /* 2 */ joy_bottons_last[nr][1] =SDL_JoystickGetButton(joy, 3) ; /* 2 */

View File

@ -286,6 +286,7 @@ void settings_menu() {
ordenador.tst_sample=3500000/ordenador.freq; ordenador.tst_sample=3500000/ordenador.freq;
ordenador.turbo = 0; ordenador.turbo = 0;
jump_frames=0; jump_frames=0;
curr_frames=0;
} else { } else {
ordenador.tst_sample=12000000/ordenador.freq; //5,0 MHz max emulation speed for wii at full frames ordenador.tst_sample=12000000/ordenador.freq; //5,0 MHz max emulation speed for wii at full frames
ordenador.turbo = 1; ordenador.turbo = 1;