projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
set default position for snapshot buttons (for old level set compatibility)
[rocksndiamonds.git]
/
src
/
screens.c
diff --git
a/src/screens.c
b/src/screens.c
index 6ee974e01917746dfe3407a7e7e9d49ae11ea5d4..d1b80e26eddf43d8ec759c59adbeba7eaffc38ec 100644
(file)
--- a/
src/screens.c
+++ b/
src/screens.c
@@
-2178,10
+2178,10
@@
static void changeSetupValue(int, int, int);
void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
int mode, int num_page_entries, int max_page_entries)
{
void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
int mode, int num_page_entries, int max_page_entries)
{
- static int game_status_last;
- static int num_page_entries_last[NUM_SPECIAL_GFX_ARGS];
+ static int num_page_entries_all_last[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
static int choice_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
static int first_entry_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
static int choice_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
static int first_entry_stores[NUM_SPECIAL_GFX_ARGS][MAX_MENU_MODES];
+ int *num_page_entries_last = num_page_entries_all_last[game_status];
int *choice_store = choice_stores[game_status];
int *first_entry_store = first_entry_stores[game_status];
int choice = choice_store[mode]; /* starts with 0 */
int *choice_store = choice_stores[game_status];
int *first_entry_store = first_entry_stores[game_status];
int choice = choice_store[mode]; /* starts with 0 */
@@
-2198,18
+2198,15
@@
void HandleMenuScreen(int mx, int my, int dx, int dy, int button,
// check if number of menu page entries has changed (may happen by change
// of custom artwork definition value for 'list_size' for this menu screen)
// (in this case, the last menu position most probably has to be corrected)
// check if number of menu page entries has changed (may happen by change
// of custom artwork definition value for 'list_size' for this menu screen)
// (in this case, the last menu position most probably has to be corrected)
- if (game_status != game_status_last &&
- num_page_entries != num_page_entries_last[game_status])
+ if (num_page_entries != num_page_entries_last[mode])
{
{
- for (i = 0; i < MAX_MENU_MODES; i++)
- choice_store[i] = first_entry_store[i] = 0;
+ choice_store[mode] = first_entry_store[mode] = 0;
choice = first_entry = 0;
y = y_old = 0;
choice = first_entry = 0;
y = y_old = 0;
- }
-
game_status_last = game_statu
s;
- num_page_entries_last[game_status] = num_page_entries;
+
num_page_entries_last[mode] = num_page_entrie
s;
+ }
/* advance to first valid menu entry */
while (choice < num_page_entries &&
/* advance to first valid menu entry */
while (choice < num_page_entries &&
@@
-5289,6
+5286,7
@@
static struct TokenInfo setup_info_game[] =
#endif
{ TYPE_ENTER_LIST, execSetupChooseSnapshotMode,"Game Engine Snapshot Mode:" },
{ TYPE_STRING, &snapshot_mode_text, "" },
#endif
{ TYPE_ENTER_LIST, execSetupChooseSnapshotMode,"Game Engine Snapshot Mode:" },
{ TYPE_STRING, &snapshot_mode_text, "" },
+ { TYPE_SWITCH, &setup.show_snapshot_buttons,"Show Snapshot Buttons:" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execSetupMain, "Back" },
{ TYPE_EMPTY, NULL, "" },
{ TYPE_LEAVE_MENU, execSetupMain, "Back" },