static int setup_mode = SETUP_MODE_MAIN;
static int info_mode = INFO_MODE_MAIN;
-#define mSX (SX + (game_status >= GAME_MODE_MAIN && \
- game_status <= GAME_MODE_SETUP ? \
- menu.draw_xoffset[game_status] : menu.draw_xoffset_default))
-#define mSY (SY + (game_status >= GAME_MODE_MAIN && \
- game_status <= GAME_MODE_SETUP ? \
- menu.draw_yoffset[game_status] : menu.draw_yoffset_default))
+#define DRAW_OFFSET_MODE(x) (x >= GAME_MODE_MAIN && \
+ x <= GAME_MODE_SETUP ? x : \
+ x == GAME_MODE_PSEUDO_TYPENAME ? \
+ GAME_MODE_MAIN : GAME_MODE_DEFAULT)
+
+#define mSX (SX + menu.draw_xoffset[DRAW_OFFSET_MODE(game_status)])
+#define mSY (SY + menu.draw_yoffset[DRAW_OFFSET_MODE(game_status)])
#define NUM_MENU_ENTRIES_ON_SCREEN (menu.list_size[game_status] > 2 ? \
menu.list_size[game_status] : \
void HandleMainMenu(int mx, int my, int dx, int dy, int button)
{
+ static unsigned long level_delay = 0;
static int choice = 5;
int x = 0;
int y = choice;
if (y == 1 && ((x == 10 && level_nr > leveldir_current->first_level) ||
(x == 14 && level_nr < leveldir_current->last_level)) &&
- button)
+ button && DelayReached(&level_delay, GADGET_FRAME_DELAY))
{
- static unsigned long level_delay = 0;
int step = (button == 1 ? 1 : button == 2 ? 5 : 10);
int old_level_nr = level_nr;
int new_level_nr;
new_level_nr = leveldir_current->last_level;
#if 1
- if (setup.handicap && new_level_nr > leveldir_current->handicap_level + 1)
- new_level_nr = leveldir_current->handicap_level;
-
- if (setup.handicap && new_level_nr > leveldir_current->handicap_level &&
- leveldir_current->handicap_level < leveldir_current->last_level)
+ if (setup.handicap && new_level_nr > leveldir_current->handicap_level)
{
- if (setup.skip_levels &&
+ /* skipping levels is only allowed when trying to skip single level */
+ if (setup.skip_levels && step == 1 &&
Request("Level still unsolved ! Skip despite handicap ?", REQ_ASK))
{
leveldir_current->handicap_level++;
new_level_nr = leveldir_current->handicap_level;
#endif
- if (new_level_nr != old_level_nr &&
- DelayReached(&level_delay, GADGET_FRAME_DELAY))
+ if (new_level_nr != old_level_nr)
{
level_nr = new_level_nr;