X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fevents.c;h=619a7f13495fdc76c984724e718cd430d4ba3544;hb=85279bc51ad11bce89beae5b0e02f1faec520afa;hp=bb6628964d216db9fb65949b80c36fe00bfb4c4a;hpb=f857fec3082c785b0dd271b6ad1b7642a2ed4e65;p=rocksndiamonds.git diff --git a/src/events.c b/src/events.c index bb662896..619a7f13 100644 --- a/src/events.c +++ b/src/events.c @@ -58,7 +58,8 @@ int FilterMouseMotionEvents(const Event *event) } /* skip mouse motion events without pressed button outside level editor */ - if (button_status == MB_RELEASED && game_status != GAME_MODE_EDITOR) + if (button_status == MB_RELEASED && game_status != GAME_MODE_EDITOR && + game_status != GAME_MODE_PLAYING) return 0; else return 1; @@ -625,16 +626,16 @@ void HandleKey(Key key, int key_status) case KSYM_Page_Up: if (game_status == GAME_MODE_LEVELS) - HandleChooseLevel(0,0, 0,-SCR_FIELDY, MB_MENU_MARK); + HandleChooseLevel(0,0, 0, -1 * SCROLL_PAGE, MB_MENU_MARK); else if (game_status == GAME_MODE_SETUP) - HandleSetupScreen(0,0, 0,-SCR_FIELDY, MB_MENU_MARK); + HandleSetupScreen(0,0, 0, -1 * SCROLL_PAGE, MB_MENU_MARK); break; case KSYM_Page_Down: if (game_status == GAME_MODE_LEVELS) - HandleChooseLevel(0,0, 0,SCR_FIELDY, MB_MENU_MARK); + HandleChooseLevel(0,0, 0, +1 * SCROLL_PAGE, MB_MENU_MARK); else if (game_status == GAME_MODE_SETUP) - HandleSetupScreen(0,0, 0,SCR_FIELDY, MB_MENU_MARK); + HandleSetupScreen(0,0, 0, +1 * SCROLL_PAGE, MB_MENU_MARK); break; #ifdef DEBUG @@ -662,11 +663,11 @@ void HandleKey(Key key, int key_status) break; case KSYM_Page_Up: - HandleHallOfFame(0,0, 0,-SCR_FIELDY, MB_MENU_MARK); + HandleHallOfFame(0,0, 0, -1 * SCROLL_PAGE, MB_MENU_MARK); break; case KSYM_Page_Down: - HandleHallOfFame(0,0, 0,SCR_FIELDY, MB_MENU_MARK); + HandleHallOfFame(0,0, 0, +1 * SCROLL_PAGE, MB_MENU_MARK); break; default: