}
/* skip mouse motion events without pressed button outside level editor */
- if (button_status == MB_RELEASED && game_status != GAME_MODE_EDITOR &&
- game_status != GAME_MODE_PLAYING)
+ if (button_status == MB_RELEASED &&
+ game_status != GAME_MODE_EDITOR && game_status != GAME_MODE_PLAYING)
return 0;
else
return 1;
}
+/* to prevent delay problems, skip mouse motion events if the very next
+ event is also a mouse motion event (and therefore effectively only
+ handling the last of a row of mouse motion events in the event queue) */
+
+boolean SkipPressedMouseMotionEvent(const Event *event)
+{
+ /* nothing to do if the current event is not a mouse motion event */
+ if (event->type != EVENT_MOTIONNOTIFY)
+ return FALSE;
+
+ /* only skip motion events with pressed button outside level editor */
+ if (button_status == MB_RELEASED ||
+ game_status == GAME_MODE_EDITOR || game_status == GAME_MODE_PLAYING)
+ return FALSE;
+
+ if (PendingEvent())
+ {
+ Event next_event;
+
+ PeekEvent(&next_event);
+
+ /* if next event is also a mouse motion event, skip the current one */
+ if (next_event.type == EVENT_MOTIONNOTIFY)
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
/* this is only really needed for non-SDL targets to filter unwanted events;
when using SDL with properly installed event filter, this function can be
replaced with a simple "NextEvent()" call, but it doesn't hurt either */
{
while (PendingEvent())
{
+ boolean handle_this_event = FALSE;
+
NextEvent(event);
if (FilterMouseMotionEvents(event))
+ handle_this_event = TRUE;
+
+ if (SkipPressedMouseMotionEvent(event))
+ handle_this_event = FALSE;
+
+ if (handle_this_event)
return TRUE;
}
{
Event event;
- if (NextValidEvent(&event))
+ while (NextValidEvent(&event))
{
switch(event.type)
{
else
{
/* when playing, display a special mouse pointer inside the playfield */
- if (game_status == GAME_MODE_PLAYING)
+ if (game_status == GAME_MODE_PLAYING && !tape.pausing)
{
if (!playfield_cursor_set && cursor_inside_playfield &&
DelayReached(&playfield_cursor_delay, 1000))
if (!PointerInWindow(window))
return; /* window and pointer are on different screens */
-#if 1
if (button_status == MB_RELEASED && game_status != GAME_MODE_EDITOR)
return;
-#endif
motion_status = TRUE;
Delay(100);
KeyboardAutoRepeatOffUnlessAutoplay();
}
+
if (old_joystick_status != -1)
joystick.status = old_joystick_status;
}
break;
case GAME_MODE_EDITOR:
+ HandleLevelEditorIdle();
break;
case GAME_MODE_INFO:
case GAME_MODE_PLAYING:
#ifdef DEBUG
- if (button == MB_RELEASED)
- {
- if (IN_GFX_SCREEN(mx, my))
- {
- int sx = (mx - SX) / TILEX;
- int sy = (my - SY) / TILEY;
- int x = LEVELX(sx);
- int y = LEVELY(sy);
-
- printf("INFO: SCREEN(%d, %d), LEVEL(%d, %d)\n", sx, sy, x, y);
-
- if (!IN_LEV_FIELD(x, y))
- break;
-
- printf(" Feld[%d][%d] == %d ('%s')\n", x,y, Feld[x][y],
- element_info[Feld[x][y]].token_name);
- printf(" Back[%d][%d] == %d\n", x,y, Back[x][y]);
- printf(" Store[%d][%d] == %d\n", x,y, Store[x][y]);
- printf(" Store2[%d][%d] == %d\n", x,y, Store2[x][y]);
- printf(" StorePlayer[%d][%d] == %d\n", x,y, StorePlayer[x][y]);
- printf(" MovPos[%d][%d] == %d\n", x,y, MovPos[x][y]);
- printf(" MovDir[%d][%d] == %d\n", x,y, MovDir[x][y]);
- printf(" MovDelay[%d][%d] == %d\n", x,y, MovDelay[x][y]);
- printf(" ChangeDelay[%d][%d] == %d\n", x,y, ChangeDelay[x][y]);
- printf(" GfxElement[%d][%d] == %d\n", x,y, GfxElement[x][y]);
- printf(" GfxAction[%d][%d] == %d\n", x,y, GfxAction[x][y]);
- printf(" GfxFrame[%d][%d] == %d\n", x,y, GfxFrame[x][y]);
- printf("\n");
- }
- }
+ if (button == MB_PRESSED && !motion_status && IN_GFX_SCREEN(mx, my))
+ DumpTile(LEVELX((mx - SX) / TILEX), LEVELY((my - SY) / TILEY));
#endif
break;
#define MAX_CHEAT_INPUT_LEN 32
-static void HandleKeysCheating(Key key)
+static void HandleKeysSpecial(Key key)
{
static char cheat_input[2 * MAX_CHEAT_INPUT_LEN + 1] = "";
char letter = getCharFromKey(key);
printf("::: '%s' [%d]\n", cheat_input, cheat_input_len);
#endif
-#if 1
- if (is_string_suffix(cheat_input, ":insert solution tape"))
- InsertSolutionTape();
-#else
- if (is_string_suffix(cheat_input, ":ist"))
- InsertSolutionTape();
-#endif
-
+ if (game_status == GAME_MODE_MAIN)
+ {
+ if (is_string_suffix(cheat_input, ":insert-solution-tape") ||
+ is_string_suffix(cheat_input, ":ist"))
+ {
+ InsertSolutionTape();
+ }
+ else if (is_string_suffix(cheat_input, ":reload-graphics") ||
+ is_string_suffix(cheat_input, ":rg"))
+ {
+ ReloadCustomArtwork(1 << ARTWORK_TYPE_GRAPHICS);
+ DrawMainMenu();
+ }
+ else if (is_string_suffix(cheat_input, ":reload-sounds") ||
+ is_string_suffix(cheat_input, ":rs"))
+ {
+ ReloadCustomArtwork(1 << ARTWORK_TYPE_SOUNDS);
+ DrawMainMenu();
+ }
+ else if (is_string_suffix(cheat_input, ":reload-music") ||
+ is_string_suffix(cheat_input, ":rm"))
+ {
+ ReloadCustomArtwork(1 << ARTWORK_TYPE_MUSIC);
+ DrawMainMenu();
+ }
+ else if (is_string_suffix(cheat_input, ":reload-artwork") ||
+ is_string_suffix(cheat_input, ":ra"))
+ {
+ ReloadCustomArtwork(1 << ARTWORK_TYPE_GRAPHICS |
+ 1 << ARTWORK_TYPE_SOUNDS |
+ 1 << ARTWORK_TYPE_MUSIC);
+ DrawMainMenu();
+ }
+ else if (is_string_suffix(cheat_input, ":dump-level") ||
+ is_string_suffix(cheat_input, ":dl"))
+ {
+ DumpLevel(&level);
+ }
+ else if (is_string_suffix(cheat_input, ":dump-tape") ||
+ is_string_suffix(cheat_input, ":dt"))
+ {
+ DumpTape(&tape);
+ }
+ }
+ else if (game_status == GAME_MODE_PLAYING)
+ {
#ifdef DEBUG
- else if (is_string_suffix(cheat_input, ":dump tape"))
- DumpTape(&tape);
- else if (is_string_suffix(cheat_input, ".q"))
- for (i = 0; i < MAX_INVENTORY_SIZE; i++)
- if (local_player->inventory_size < MAX_INVENTORY_SIZE)
- local_player->inventory_element[local_player->inventory_size++] =
- EL_DYNAMITE;
+ if (is_string_suffix(cheat_input, ".q"))
+ for (i = 0; i < MAX_INVENTORY_SIZE; i++)
+ if (local_player->inventory_size < MAX_INVENTORY_SIZE)
+ local_player->inventory_element[local_player->inventory_size++] =
+ EL_DYNAMITE;
#endif
+ }
+ else if (game_status == GAME_MODE_EDITOR)
+ {
+ if (is_string_suffix(cheat_input, ":dump-brush") ||
+ is_string_suffix(cheat_input, ":DB"))
+ {
+ DumpBrush();
+ }
+ else if (is_string_suffix(cheat_input, ":DDB"))
+ {
+ DumpBrush_Small();
+ }
+ }
}
void HandleKey(Key key, int key_status)
{ &custom_key.up, DEFAULT_KEY_UP, JOY_UP },
{ &custom_key.down, DEFAULT_KEY_DOWN, JOY_DOWN },
{ &custom_key.snap, DEFAULT_KEY_SNAP, JOY_BUTTON_1 },
- { &custom_key.bomb, DEFAULT_KEY_BOMB, JOY_BUTTON_2 }
+ { &custom_key.drop, DEFAULT_KEY_DROP, JOY_BUTTON_2 }
};
if (game_status == GAME_MODE_PLAYING)
{
/* only needed for single-step tape recording mode */
static boolean clear_button_2[MAX_PLAYERS] = { FALSE,FALSE,FALSE,FALSE };
- static boolean bomb_placed[MAX_PLAYERS] = { FALSE,FALSE,FALSE,FALSE };
+ static boolean element_dropped[MAX_PLAYERS] = { FALSE,FALSE,FALSE,FALSE };
int pnr;
for (pnr = 0; pnr < MAX_PLAYERS; pnr++)
if (key_action & KEY_MOTION)
{
if (stored_player[pnr].action & KEY_BUTTON_2)
- bomb_placed[pnr] = TRUE;
+ element_dropped[pnr] = TRUE;
}
}
else if (key_status == KEY_RELEASED &&
(key_action & KEY_BUTTON_2))
{
- if (!bomb_placed[pnr])
+ if (!element_dropped[pnr])
{
TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
clear_button_2[pnr] = TRUE;
}
- bomb_placed[pnr] = FALSE;
+ element_dropped[pnr] = FALSE;
}
}
else if (tape.recording && tape.pausing && (key_action & KEY_ACTION))
if (key_status == KEY_RELEASED)
return;
- if ((key == KSYM_Return || key == setup.shortcut.toggle_pause) &&
- game_status == GAME_MODE_PLAYING && AllPlayersGone)
+ if (game_status == GAME_MODE_PLAYING && AllPlayersGone &&
+ (key == KSYM_Return || key == setup.shortcut.toggle_pause))
{
CloseDoor(DOOR_CLOSE_1);
game_status = GAME_MODE_MAIN;
DrawMainMenu();
+
+ return;
+ }
+
+ if (game_status == GAME_MODE_MAIN && key == setup.shortcut.toggle_pause)
+ {
+ StartGameActions(options.network, setup.autorecord, NEW_RANDOMIZE);
+
return;
}
- /* special key shortcuts */
if (game_status == GAME_MODE_MAIN || game_status == GAME_MODE_PLAYING)
{
if (key == setup.shortcut.save_game)
TapeQuickLoad();
else if (key == setup.shortcut.toggle_pause)
TapeTogglePause(TAPE_TOGGLE_MANUAL);
-
- HandleKeysCheating(key);
}
+ HandleKeysSpecial(key);
+
if (HandleGadgetsKeyInput(key))
{
if (key != KSYM_Escape) /* always allow ESC key to be handled */
case GAME_MODE_INFO:
switch(key)
{
+ case KSYM_space:
case KSYM_Return:
if (game_status == GAME_MODE_MAIN)
HandleMainMenu(0,0, 0,0, MB_MENU_CHOICE);
case GAME_MODE_SCORES:
switch(key)
{
+ case KSYM_space:
case KSYM_Return:
case KSYM_Escape:
game_status = GAME_MODE_MAIN;
}
break;
-#if 0
- case KSYM_a:
- if (ScrollStepSize == TILEX/8)
- ScrollStepSize = TILEX/4;
- else
- ScrollStepSize = TILEX/8;
- printf("ScrollStepSize == %d\n", ScrollStepSize);
- break;
-#endif
-
-#if 0
- case KSYM_m:
- if (MoveSpeed == 8)
- {
- MoveSpeed = 4;
- ScrollStepSize = TILEX/4;
- }
- else
- {
- MoveSpeed = 8;
- ScrollStepSize = TILEX/8;
- }
- printf("MoveSpeed == %d\n", MoveSpeed);
- break;
-#endif
-
case KSYM_f:
ScrollStepSize = TILEX/8;
printf("ScrollStepSize == %d (1/8)\n", ScrollStepSize);
printf("ScrollStepSize == %d (1/1)\n", ScrollStepSize);
break;
-#if 0
-
- case KSYM_z:
- {
- int i;
-
- for (i = 0; i < MAX_PLAYERS; i++)
- {
- printf("Player %d:\n", i);
- printf(" jx == %d, jy == %d\n",
- stored_player[i].jx, stored_player[i].jy);
- printf(" last_jx == %d, last_jy == %d\n",
- stored_player[i].last_jx, stored_player[i].last_jy);
- }
- printf("\n");
- }
-
+ case KSYM_v:
+ printf("::: currently using game engine version %d\n",
+ game.engine_version);
break;
-#endif
#endif
default:
return;
}
-#if defined(PLATFORM_UNIX)
+#if defined(NETWORK_AVALIABLE)
if (options.network)
HandleNetworking();
#endif
projects / rocksndiamonds.git / blobdiff