X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=ee5e492c93c0d94f786af2d20e3a239a92ae2b82;hp=0d1f6baf371a34982db7915ebd947e531bc96ca7;hb=9db7595a83420f029dd52a462d766d4ac585e9c7;hpb=931d95b5a399bbed7280bd39be8373adad147dc2 diff --git a/src/events.c b/src/events.c index 0d1f6baf..ee5e492c 100644 --- a/src/events.c +++ b/src/events.c @@ -268,12 +268,14 @@ void HandleOtherEvents(Event *event) HandleJoystickEvent(event); break; +#if defined(USE_DRAG_AND_DROP) case SDL_DROPBEGIN: case SDL_DROPCOMPLETE: case SDL_DROPFILE: case SDL_DROPTEXT: HandleDropEvent(event); break; +#endif default: break; @@ -403,7 +405,10 @@ void ClearPlayerAction(void) // simulate key release events for still pressed keys key_joystick_mapping = 0; for (i = 0; i < MAX_PLAYERS; i++) + { stored_player[i].action = 0; + stored_player[i].snap_action = 0; + } ClearJoystickState(); ClearPlayerMouseAction(); @@ -1525,6 +1530,7 @@ void HandleClientMessageEvent(ClientMessageEvent *event) CloseAllAndExit(0); } +#if defined(USE_DRAG_AND_DROP) static boolean HandleDropFileEvent(char *filename) { Error(ERR_DEBUG, "DROP FILE EVENT: '%s'", filename); @@ -1643,6 +1649,7 @@ void HandleDropEvent(Event *event) if (event->drop.file != NULL) SDL_free(event->drop.file); } +#endif void HandleButton(int mx, int my, int button, int button_nr) { @@ -1934,13 +1941,13 @@ boolean HandleKeysDebug(Key key, int key_status) SetVideoFrameDelay(GameFrameDelay); if (GameFrameDelay > ONE_SECOND_DELAY) - Error(ERR_DEBUG, "frame delay == %d ms", GameFrameDelay); + Error(ERR_INFO, "frame delay == %d ms", GameFrameDelay); else if (GameFrameDelay != 0) - Error(ERR_DEBUG, "frame delay == %d ms (max. %d fps / %d %%)", + Error(ERR_INFO, "frame delay == %d ms (max. %d fps / %d %%)", GameFrameDelay, ONE_SECOND_DELAY / GameFrameDelay, GAME_FRAME_DELAY * 100 / GameFrameDelay); else - Error(ERR_DEBUG, "frame delay == 0 ms (maximum speed)"); + Error(ERR_INFO, "frame delay == 0 ms (maximum speed)"); return TRUE; } @@ -1953,14 +1960,14 @@ boolean HandleKeysDebug(Key key, int key_status) { options.debug = !options.debug; - Error(ERR_DEBUG, "debug mode %s", + Error(ERR_INFO, "debug mode %s", (options.debug ? "enabled" : "disabled")); return TRUE; } else if (key == KSYM_v) { - Error(ERR_DEBUG, "currently using game engine version %d", + Error(ERR_INFO, "currently using game engine version %d", game.engine_version); return TRUE;