X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=709ad4535c132ea4343f0c19abc630f030f60f4d;hp=ed910e64d924b89bd826ddecfabeed0207213f69;hb=abe44529b439ad39b4d8dbf19cbd67c9b9844279;hpb=b06464b4dc26c0e31ef0bca48b31a4dfbdd549e6 diff --git a/src/events.c b/src/events.c index ed910e64..709ad453 100644 --- a/src/events.c +++ b/src/events.c @@ -1,15 +1,13 @@ -/*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * -*----------------------------------------------------------* -* (c) 1995-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* events.c * -***********************************************************/ +// ============================================================================ +// Rocks'n'Diamonds - McDuffin Strikes Back! +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// events.c +// ============================================================================ #include "libgame/libgame.h" @@ -162,6 +160,10 @@ void EventLoop(void) break; #if defined(TARGET_SDL2) + case SDL_WINDOWEVENT: + HandleWindowEvent((WindowEvent *) &event); + break; + case EVENT_FINGERPRESS: case EVENT_FINGERRELEASE: case EVENT_FINGERMOTION: @@ -171,6 +173,13 @@ void EventLoop(void) case EVENT_TEXTINPUT: HandleTextEvent((TextEvent *) &event); break; + + case SDL_APP_WILLENTERBACKGROUND: + case SDL_APP_DIDENTERBACKGROUND: + case SDL_APP_WILLENTERFOREGROUND: + case SDL_APP_DIDENTERFOREGROUND: + HandlePauseResumeEvent((PauseResumeEvent *) &event); + break; #endif case EVENT_KEYPRESS: @@ -202,9 +211,15 @@ void EventLoop(void) playfield_cursor_set = FALSE; } +#if 0 HandleNoEvent(); +#endif } +#if 1 + HandleNoEvent(); +#endif + /* don't use all CPU time when idle; the main loop while playing has its own synchronization and is CPU friendly, too */ @@ -353,10 +368,6 @@ void SleepWhileUnmapped() void HandleExposeEvent(ExposeEvent *event) { -#if !defined(TARGET_SDL) - RedrawPlayfield(FALSE, event->x, event->y, event->width, event->height); - FlushDisplay(); -#endif } void HandleButtonEvent(ButtonEvent *event) @@ -388,13 +399,467 @@ void HandleMotionEvent(MotionEvent *event) motion_status = TRUE; +#if DEBUG_EVENTS Error(ERR_DEBUG, "MOTION EVENT: button %d moved, x/y %d/%d\n", button_status, event->x, event->y); +#endif HandleButton(event->x, event->y, button_status, button_status); } #if defined(TARGET_SDL2) +void HandleWindowEvent(WindowEvent *event) +{ +#if DEBUG_EVENTS + int subtype = event->event; + + char *event_name = + (subtype == SDL_WINDOWEVENT_SHOWN ? "SDL_WINDOWEVENT_SHOWN" : + subtype == SDL_WINDOWEVENT_HIDDEN ? "SDL_WINDOWEVENT_HIDDEN" : + subtype == SDL_WINDOWEVENT_EXPOSED ? "SDL_WINDOWEVENT_EXPOSED" : + subtype == SDL_WINDOWEVENT_MOVED ? "SDL_WINDOWEVENT_MOVED" : + subtype == SDL_WINDOWEVENT_SIZE_CHANGED ? "SDL_WINDOWEVENT_SIZE_CHANGED" : + subtype == SDL_WINDOWEVENT_RESIZED ? "SDL_WINDOWEVENT_RESIZED" : + subtype == SDL_WINDOWEVENT_MINIMIZED ? "SDL_WINDOWEVENT_MINIMIZED" : + subtype == SDL_WINDOWEVENT_MAXIMIZED ? "SDL_WINDOWEVENT_MAXIMIZED" : + subtype == SDL_WINDOWEVENT_RESTORED ? "SDL_WINDOWEVENT_RESTORED" : + subtype == SDL_WINDOWEVENT_ENTER ? "SDL_WINDOWEVENT_ENTER" : + subtype == SDL_WINDOWEVENT_LEAVE ? "SDL_WINDOWEVENT_LEAVE" : + subtype == SDL_WINDOWEVENT_FOCUS_GAINED ? "SDL_WINDOWEVENT_FOCUS_GAINED" : + subtype == SDL_WINDOWEVENT_FOCUS_LOST ? "SDL_WINDOWEVENT_FOCUS_LOST" : + subtype == SDL_WINDOWEVENT_CLOSE ? "SDL_WINDOWEVENT_CLOSE" : + "(UNKNOWN)"); + + Error(ERR_DEBUG, "WINDOW EVENT: '%s', %ld, %ld", + event_name, event->data1, event->data2); +#endif + + if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED || + event->event == SDL_WINDOWEVENT_RESIZED || + event->event == SDL_WINDOWEVENT_EXPOSED) + SDLRedrawWindow(); + +#if 0 + if (event->event == SDL_WINDOWEVENT_SIZE_CHANGED) + { + // if game started in fullscreen mode, window will also get fullscreen size + if (!video.fullscreen_enabled && video.fullscreen_initial) + { + SDLSetWindowScaling(setup.window_scaling_percent); + + // only do this correction once + video.fullscreen_initial = FALSE; + } + } +#endif + + if (event->event == SDL_WINDOWEVENT_RESIZED && !video.fullscreen_enabled) + { +#if 1 + int new_window_width = event->data1; + int new_window_height = event->data2; + + // if window size has changed after resizing, calculate new scaling factor + if (new_window_width != video.window_width || + new_window_height != video.window_height) + { + int new_xpercent = (100 * new_window_width / video.width); + int new_ypercent = (100 * new_window_height / video.height); + +#if 0 + printf("::: RESIZED from %d, %d to %d, %d\n", + video.window_width, video.window_height, + new_window_width, new_window_height); +#endif + + setup.window_scaling_percent = video.window_scaling_percent = + MIN(MAX(MIN_WINDOW_SCALING_PERCENT, MIN(new_xpercent, new_ypercent)), + MAX_WINDOW_SCALING_PERCENT); + + video.window_width = new_window_width; + video.window_height = new_window_height; + +#if 0 + printf("::: setup.window_scaling_percent set to %d\n", + setup.window_scaling_percent); +#endif + + if (game_status == GAME_MODE_SETUP) + RedrawSetupScreenAfterFullscreenToggle(); + + SetWindowTitle(); + } +#else + // prevent slightly wrong scaling factor due to rounding differences + float scaling_factor = (float)setup.window_scaling_percent / 100; + int old_xsize = (int)(scaling_factor * video.width); + int old_ysize = (int)(scaling_factor * video.height); + int new_xsize = event->data1; + int new_ysize = event->data2; + + // window size is unchanged when going from fullscreen to window mode, + // but reverse calculation of scaling factor might result in a scaling + // factor that is slightly different due to rounding differences; + // therefore compare old/new window size and not old/new scaling factor + if (old_xsize != new_xsize || + old_ysize != new_ysize) + { + int new_xpercent = (100 * new_xsize / video.width); + int new_ypercent = (100 * new_ysize / video.height); + + setup.window_scaling_percent = MIN(new_xpercent, new_ypercent); + + if (setup.window_scaling_percent < MIN_WINDOW_SCALING_PERCENT) + setup.window_scaling_percent = MIN_WINDOW_SCALING_PERCENT; + else if (setup.window_scaling_percent > MAX_WINDOW_SCALING_PERCENT) + setup.window_scaling_percent = MAX_WINDOW_SCALING_PERCENT; + + printf("::: setup.window_scaling_percent set to %d\n", + setup.window_scaling_percent); + } +#endif + } +} + +#if 1 + +#define NUM_TOUCH_FINGERS 3 + +static struct +{ + boolean touched; + SDL_FingerID finger_id; + int counter; + Key key; +} touch_info[NUM_TOUCH_FINGERS]; + +void HandleFingerEvent(FingerEvent *event) +{ + static Key motion_key_x = KSYM_UNDEFINED; + static Key motion_key_y = KSYM_UNDEFINED; + static Key button_key = KSYM_UNDEFINED; + static float motion_x1, motion_y1; + static float button_x1, button_y1; + static SDL_FingerID motion_id = -1; + static SDL_FingerID button_id = -1; + int move_trigger_distance_percent = 2; // percent of touchpad width/height + int drop_trigger_distance_percent = 5; // percent of touchpad width/height + float move_trigger_distance = (float)move_trigger_distance_percent / 100; + float drop_trigger_distance = (float)drop_trigger_distance_percent / 100; + float event_x = event->x; + float event_y = event->y; + +#if 1 +#if DEBUG_EVENTS + Error(ERR_DEBUG, "FINGER EVENT: finger was %s, touch ID %lld, finger ID %lld, x/y %f/%f, dx/dy %f/%f, pressure %f", + event->type == EVENT_FINGERPRESS ? "pressed" : + event->type == EVENT_FINGERRELEASE ? "released" : "moved", + event->touchId, + event->fingerId, + event->x, event->y, + event->dx, event->dy, + event->pressure); +#endif +#endif + + if (game_status != GAME_MODE_PLAYING) + return; + +#if 1 + if (strEqual(setup.touch.control_type, TOUCH_CONTROL_VIRTUAL_BUTTONS)) +#else + boolean use_virtual_button_control = FALSE; + + if (use_virtual_button_control) +#endif + { + int key_status = (event->type == EVENT_FINGERRELEASE ? KEY_RELEASED : + KEY_PRESSED); +#if 1 + Key key = (event->x < 1.0 / 3.0 ? + (event->y < 1.0 / 2.0 ? setup.input[0].key.snap : + setup.input[0].key.drop) : + event->x > 2.0 / 3.0 ? + (event->y < 1.0 / 3.0 ? setup.input[0].key.up : + event->y > 2.0 / 3.0 ? setup.input[0].key.down : + event->x < 5.0 / 6.0 ? setup.input[0].key.left : + setup.input[0].key.right) : + KSYM_UNDEFINED); +#if 0 + char *key_name = (key == setup.input[0].key.snap ? "SNAP" : + key == setup.input[0].key.drop ? "DROP" : + key == setup.input[0].key.up ? "UP" : + key == setup.input[0].key.down ? "DOWN" : + key == setup.input[0].key.left ? "LEFT" : + key == setup.input[0].key.right ? "RIGHT" : "(unknown)"); +#endif + char *key_status_name = (key_status == KEY_RELEASED ? "KEY_RELEASED" : + "KEY_PRESSED"); +#else + Key key = (event->y < 1.0 / 3.0 ? setup.input[0].key.up : + event->y > 2.0 / 3.0 ? setup.input[0].key.down : + event->x < 1.0 / 3.0 ? setup.input[0].key.left : + event->x > 2.0 / 3.0 ? setup.input[0].key.right : + setup.input[0].key.snap); +#endif + int i; + + Error(ERR_DEBUG, "::: key '%s' was '%s' [fingerId: %lld]", + getKeyNameFromKey(key), key_status_name, event->fingerId); + + // check if we already know this touch event's finger id + for (i = 0; i < NUM_TOUCH_FINGERS; i++) + { + if (touch_info[i].touched && + touch_info[i].finger_id == event->fingerId) + { + // Error(ERR_DEBUG, "MARK 1: %d", i); + + break; + } + } + + if (i >= NUM_TOUCH_FINGERS) + { + if (key_status == KEY_PRESSED) + { + int oldest_pos = 0, oldest_counter = touch_info[0].counter; + + // unknown finger id -- get new, empty slot, if available + for (i = 0; i < NUM_TOUCH_FINGERS; i++) + { + if (touch_info[i].counter < oldest_counter) + { + oldest_pos = i; + oldest_counter = touch_info[i].counter; + + // Error(ERR_DEBUG, "MARK 2: %d", i); + } + + if (!touch_info[i].touched) + { + // Error(ERR_DEBUG, "MARK 3: %d", i); + + break; + } + } + + if (i >= NUM_TOUCH_FINGERS) + { + // all slots allocated -- use oldest slot + i = oldest_pos; + + // Error(ERR_DEBUG, "MARK 4: %d", i); + } + } + else + { + // release of previously unknown key (should not happen) + + if (key != KSYM_UNDEFINED) + { + HandleKey(key, KEY_RELEASED); + + Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [1]", + getKeyNameFromKey(key), "KEY_RELEASED", i); + } + } + } + + if (i < NUM_TOUCH_FINGERS) + { + if (key_status == KEY_PRESSED) + { + if (touch_info[i].key != key) + { + if (touch_info[i].key != KSYM_UNDEFINED) + { + HandleKey(touch_info[i].key, KEY_RELEASED); + + Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [2]", + getKeyNameFromKey(touch_info[i].key), "KEY_RELEASED", i); + } + + if (key != KSYM_UNDEFINED) + { + HandleKey(key, KEY_PRESSED); + + Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [3]", + getKeyNameFromKey(key), "KEY_PRESSED", i); + } + } + + touch_info[i].touched = TRUE; + touch_info[i].finger_id = event->fingerId; + touch_info[i].counter = Counter(); + touch_info[i].key = key; + } + else + { + if (touch_info[i].key != KSYM_UNDEFINED) + { + HandleKey(touch_info[i].key, KEY_RELEASED); + + Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d] [4]", + getKeyNameFromKey(touch_info[i].key), "KEY_RELEASED", i); + } + + touch_info[i].touched = FALSE; + touch_info[i].finger_id = 0; + touch_info[i].counter = 0; + touch_info[i].key = 0; + } + } + +#if 0 +#if 1 + Error(ERR_DEBUG, "=> key == '%s', key_status == '%s' [slot %d]", + key_name, key_status_name, i); +#else + Error(ERR_DEBUG, "=> key == %d, key_status == %d [%d]", key, key_status, i); +#endif +#endif + + return; + } + + // use touch direction control + + if (event->type == EVENT_FINGERPRESS) + { + if (event_x > 1.0 / 3.0) + { + // motion area + + motion_id = event->fingerId; + + motion_x1 = event_x; + motion_y1 = event_y; + + motion_key_x = KSYM_UNDEFINED; + motion_key_y = KSYM_UNDEFINED; + + Error(ERR_DEBUG, "---------- MOVE STARTED (WAIT) ----------"); + } + else + { + // button area + + button_id = event->fingerId; + + button_x1 = event_x; + button_y1 = event_y; + + button_key = setup.input[0].key.snap; + + HandleKey(button_key, KEY_PRESSED); + + Error(ERR_DEBUG, "---------- SNAP STARTED ----------"); + } + } + else if (event->type == EVENT_FINGERRELEASE) + { + if (event->fingerId == motion_id) + { + motion_id = -1; + + if (motion_key_x != KSYM_UNDEFINED) + HandleKey(motion_key_x, KEY_RELEASED); + if (motion_key_y != KSYM_UNDEFINED) + HandleKey(motion_key_y, KEY_RELEASED); + + motion_key_x = KSYM_UNDEFINED; + motion_key_y = KSYM_UNDEFINED; + + Error(ERR_DEBUG, "---------- MOVE STOPPED ----------"); + } + else if (event->fingerId == button_id) + { + button_id = -1; + + if (button_key != KSYM_UNDEFINED) + HandleKey(button_key, KEY_RELEASED); + + button_key = KSYM_UNDEFINED; + + Error(ERR_DEBUG, "---------- SNAP STOPPED ----------"); + } + } + else if (event->type == EVENT_FINGERMOTION) + { + if (event->fingerId == motion_id) + { + float distance_x = ABS(event_x - motion_x1); + float distance_y = ABS(event_y - motion_y1); + Key new_motion_key_x = (event_x < motion_x1 ? setup.input[0].key.left : + event_x > motion_x1 ? setup.input[0].key.right : + KSYM_UNDEFINED); + Key new_motion_key_y = (event_y < motion_y1 ? setup.input[0].key.up : + event_y > motion_y1 ? setup.input[0].key.down : + KSYM_UNDEFINED); + + if (distance_x < move_trigger_distance / 2 || + distance_x < distance_y) + new_motion_key_x = KSYM_UNDEFINED; + + if (distance_y < move_trigger_distance / 2 || + distance_y < distance_x) + new_motion_key_y = KSYM_UNDEFINED; + + if (distance_x > move_trigger_distance || + distance_y > move_trigger_distance) + { + if (new_motion_key_x != motion_key_x) + { + if (motion_key_x != KSYM_UNDEFINED) + HandleKey(motion_key_x, KEY_RELEASED); + if (new_motion_key_x != KSYM_UNDEFINED) + HandleKey(new_motion_key_x, KEY_PRESSED); + } + + if (new_motion_key_y != motion_key_y) + { + if (motion_key_y != KSYM_UNDEFINED) + HandleKey(motion_key_y, KEY_RELEASED); + if (new_motion_key_y != KSYM_UNDEFINED) + HandleKey(new_motion_key_y, KEY_PRESSED); + } + + motion_x1 = event_x; + motion_y1 = event_y; + + motion_key_x = new_motion_key_x; + motion_key_y = new_motion_key_y; + + Error(ERR_DEBUG, "---------- MOVE STARTED (MOVE) ----------"); + } + } + else if (event->fingerId == button_id) + { + float distance_x = ABS(event_x - button_x1); + float distance_y = ABS(event_y - button_y1); + + if (distance_x < drop_trigger_distance / 2 && + distance_y > drop_trigger_distance) + { + if (button_key == setup.input[0].key.snap) + HandleKey(button_key, KEY_RELEASED); + + button_x1 = event_x; + button_y1 = event_y; + + button_key = setup.input[0].key.drop; + + HandleKey(button_key, KEY_PRESSED); + + Error(ERR_DEBUG, "---------- DROP STARTED ----------"); + } + } + } +} + +#else + void HandleFingerEvent(FingerEvent *event) { #if 0 @@ -402,6 +867,7 @@ void HandleFingerEvent(FingerEvent *event) int max_events = 10; #endif +#if 0 #if DEBUG_EVENTS Error(ERR_DEBUG, "FINGER EVENT: finger was %s, touch ID %lld, finger ID %lld, x/y %f/%f, dx/dy %f/%f, pressure %f", event->type == EVENT_FINGERPRESS ? "pressed" : @@ -412,6 +878,7 @@ void HandleFingerEvent(FingerEvent *event) event->dx, event->dy, event->pressure); #endif +#endif #if 0 int x = (int)(event->x * video.width); @@ -477,6 +944,8 @@ void HandleFingerEvent(FingerEvent *event) #endif } +#endif + static boolean checkTextInputKeyModState() { // when playing, only handle raw key events and ignore text input @@ -492,12 +961,13 @@ void HandleTextEvent(TextEvent *event) Key key = getKeyFromKeyName(text); #if DEBUG_EVENTS - Error(ERR_DEBUG, "TEXT EVENT: text == '%s' [%d byte(s), '%c'/%d], resulting key == %d (%s)", + Error(ERR_DEBUG, "TEXT EVENT: text == '%s' [%d byte(s), '%c'/%d], resulting key == %d (%s) [%04x]", text, strlen(text), text[0], (int)(text[0]), key, - getKeyNameFromKey(key)); + getKeyNameFromKey(key), + GetKeyModState()); #endif // if (game_status != GAME_MODE_PLAYING && GetKeyModState() != KMOD_None) @@ -511,6 +981,19 @@ void HandleTextEvent(TextEvent *event) HandleKey(key, KEY_RELEASED); } } + +void HandlePauseResumeEvent(PauseResumeEvent *event) +{ + if (event->type == SDL_APP_WILLENTERBACKGROUND) + { + Mix_PauseMusic(); + } + else if (event->type == SDL_APP_DIDENTERFOREGROUND) + { + Mix_ResumeMusic(); + } +} + #endif void HandleKeyEvent(KeyEvent *event) @@ -630,17 +1113,28 @@ void HandleButton(int mx, int my, int button, int button_nr) old_my = my; } +#if defined(PLATFORM_ANDROID) + if (game_status != GAME_MODE_PLAYING && + HandleGadgets(mx, my, button)) + { + /* do not handle this button event anymore */ + mx = my = -32; /* force mouse event to be outside screen tiles */ + } +#else if (HandleGadgets(mx, my, button)) { /* do not handle this button event anymore */ mx = my = -32; /* force mouse event to be outside screen tiles */ } +#endif /* do not use scroll wheel button events for anything other than gadgets */ if (IS_WHEEL_BUTTON(button_nr)) return; +#if 0 Error(ERR_DEBUG, "::: game_status == %d", game_status); +#endif switch (game_status) { @@ -682,8 +1176,10 @@ void HandleButton(int mx, int my, int button, int button_nr) case GAME_MODE_PLAYING: #ifdef DEBUG - if (button == MB_PRESSED && !motion_status && IN_GFX_SCREEN(mx, my)) - DumpTile(LEVELX((mx - SX) / TILEX), LEVELY((my - SY) / TILEY)); + if (button == MB_PRESSED && !motion_status && IN_GFX_FIELD_PLAY(mx, my)) + DumpTile(LEVELX((mx - SX) / TILESIZE_VAR), + LEVELY((my - SY) / TILESIZE_VAR)); + // DumpTile(LEVELX((mx - SX) / TILEX), LEVELY((my - SY) / TILEY)); #endif break; @@ -773,6 +1269,20 @@ static void HandleKeysSpecial(Key key) { DumpTape(&tape); } + else if (is_string_suffix(cheat_input, ":fix-tape") || + is_string_suffix(cheat_input, ":ft")) + { + /* fix single-player tapes that contain player input for more than one + player (due to a bug in 3.3.1.2 and earlier versions), which results + in playing levels with more than one player in multi-player mode, + even though the tape was originally recorded in single-player mode */ + + /* remove player input actions for all players but the first one */ + for (i = 1; i < MAX_PLAYERS; i++) + tape.player_participates[i] = FALSE; + + tape.changed = TRUE; + } else if (is_string_suffix(cheat_input, ":save-native-level") || is_string_suffix(cheat_input, ":snl")) { @@ -979,12 +1489,45 @@ void HandleKey(Key key, int key_status) if (key_status == KEY_RELEASED) return; - if ((key == KSYM_Return || key == KSYM_KP_Enter) && - (GetKeyModState() & KMOD_Alt) && video.fullscreen_available) + if ((key == KSYM_F11 || + ((key == KSYM_Return || + key == KSYM_KP_Enter) && (GetKeyModState() & KMOD_Alt))) && + video.fullscreen_available) { setup.fullscreen = !setup.fullscreen; - ToggleFullscreenIfNeeded(); +#if 0 + printf("::: %d\n", setup.window_scaling_percent); +#endif + + ToggleFullscreenOrChangeWindowScalingIfNeeded(); + + if (game_status == GAME_MODE_SETUP) + RedrawSetupScreenAfterFullscreenToggle(); + + return; + } + + if ((key == KSYM_minus || + key == KSYM_plus || + key == KSYM_0) && + ((GetKeyModState() & KMOD_Control) || + (GetKeyModState() & KMOD_Alt)) && + video.window_scaling_available && + !video.fullscreen_enabled) + { + if (key == KSYM_0) + setup.window_scaling_percent = STD_WINDOW_SCALING_PERCENT; + else + setup.window_scaling_percent += + (key == KSYM_minus ? -1 : +1) * STEP_WINDOW_SCALING_PERCENT; + + if (setup.window_scaling_percent < MIN_WINDOW_SCALING_PERCENT) + setup.window_scaling_percent = MIN_WINDOW_SCALING_PERCENT; + else if (setup.window_scaling_percent > MAX_WINDOW_SCALING_PERCENT) + setup.window_scaling_percent = MAX_WINDOW_SCALING_PERCENT; + + ToggleFullscreenOrChangeWindowScalingIfNeeded(); if (game_status == GAME_MODE_SETUP) RedrawSetupScreenAfterFullscreenToggle(); @@ -1204,6 +1747,7 @@ void HandleKey(Key key, int key_status) } break; +#if 0 case KSYM_s: if (!global.fps_slowdown) { @@ -1223,7 +1767,9 @@ void HandleKey(Key key, int key_status) printf("fps slowdown disabled\n"); } break; +#endif +#if 0 case KSYM_f: ScrollStepSize = TILEX / 8; printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize); @@ -1243,6 +1789,7 @@ void HandleKey(Key key, int key_status) ScrollStepSize = TILEX; printf("ScrollStepSize == %d (1/1)\n", ScrollStepSize); break; +#endif case KSYM_v: printf("::: currently using game engine version %d\n", @@ -1273,7 +1820,13 @@ void HandleNoEvent() { HandleButton(0, 0, -button_status, button_status); +#if 0 return; +#endif + } + else + { + HandleJoystick(); } #if defined(NETWORK_AVALIABLE) @@ -1281,7 +1834,28 @@ void HandleNoEvent() HandleNetworking(); #endif - HandleJoystick(); + switch (game_status) + { + case GAME_MODE_MAIN: + DrawPreviewLevelAnimation(); + DoAnimation(); + break; + + case GAME_MODE_LEVELS: + case GAME_MODE_LEVELNR: + case GAME_MODE_SETUP: + case GAME_MODE_INFO: + case GAME_MODE_SCORES: + DoAnimation(); + break; + + case GAME_MODE_EDITOR: + HandleLevelEditorIdle(); + break; + + default: + break; + } } static int HandleJoystickForAllPlayers() @@ -1358,18 +1932,20 @@ void HandleJoystick() HandleHallOfFame(0, 0, dx, dy, !newbutton); break; +#if 0 case GAME_MODE_EDITOR: HandleLevelEditorIdle(); break; +#endif case GAME_MODE_PLAYING: if (tape.playing || keyboard) newbutton = ((joy & JOY_BUTTON) != 0); #if 0 - if (local_player->LevelSolved_GameEnd && newbutton) + if (newbutton && local_player->LevelSolved_GameEnd) #else - if (AllPlayersGone && newbutton) + if (newbutton && AllPlayersGone) #endif { GameEnd();