Corrected speed limits

This commit is contained in:
simon.kagstrom 2009-01-11 18:38:34 +00:00
parent e50680a4b8
commit 4846968ba4
2 changed files with 16 additions and 8 deletions

View File

@ -1,8 +1,11 @@
version 3: version 3:
* Various cleanup of the code
* Fixed a bug in the menu code which was triggered when there * Fixed a bug in the menu code which was triggered when there
is more than one submenu is more than one submenu
* Make speed configurable and change the menus a bit * Make speed configurable (basically fast/normal/slow) and
change the menus a bit
* Skip SDL_Delay and SDL_GetTicks() which seem to give strange * Skip SDL_Delay and SDL_GetTicks() which seem to give strange
results. Use gettime and usleep instead. results. Use gettime and usleep instead.

View File

@ -345,14 +345,19 @@ void C64::other_options(Prefs *np)
menu_t display_menu; menu_t display_menu;
int submenus[2] = { np->DisplayOption}; int submenus[2] = { np->DisplayOption};
#define SPEED_95 40
#define SPEED_110 34
#define SPEED_100 38
switch (np->MsPerFrame) switch (np->MsPerFrame)
{ {
case 36: case SPEED_95:
submenus[1] = 0; break; submenus[1] = 0; break;
case 38: case SPEED_110:
submenus[1] = 1; break;
default:
submenus[1] = 2; break; submenus[1] = 2; break;
default:
/* If it has some other value... */
submenus[1] = 1; break;
} }
menu_init(&display_menu, this->menu_font, other_options_messages, menu_init(&display_menu, this->menu_font, other_options_messages,
32, 32, MENU_SIZE_X, MENU_SIZE_Y); 32, 32, MENU_SIZE_X, MENU_SIZE_Y);
@ -363,12 +368,12 @@ void C64::other_options(Prefs *np)
switch(submenus[1]) switch(submenus[1])
{ {
case 0: case 0:
np->MsPerFrame = 36; break; np->MsPerFrame = SPEED_95; break;
case 1: case 1:
np->MsPerFrame = 38; break; np->MsPerFrame = SPEED_100; break;
case 2: case 2:
default: default:
np->MsPerFrame = 39; break; np->MsPerFrame = SPEED_110; break;
} }
this->prefs_changed = true; this->prefs_changed = true;
} }