projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20070304-1-src
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index 65b06803a9e62f2f7693939f74a6df4ae9f605e6..d08de9edf5ce16d679d5667756b4a70aca33bcad 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-127,7
+127,7
@@
void EventLoop(void)
while (NextValidEvent(&event))
{
while (NextValidEvent(&event))
{
- switch(event.type)
+ switch
(event.type)
{
case EVENT_BUTTONPRESS:
case EVENT_BUTTONRELEASE:
{
case EVENT_BUTTONPRESS:
case EVENT_BUTTONRELEASE:
@@
-194,7
+194,7
@@
void EventLoop(void)
void HandleOtherEvents(Event *event)
{
void HandleOtherEvents(Event *event)
{
- switch(event->type)
+ switch
(event->type)
{
case EVENT_EXPOSE:
HandleExposeEvent((ExposeEvent *) event);
{
case EVENT_EXPOSE:
HandleExposeEvent((ExposeEvent *) event);
@@
-238,7
+238,7
@@
void ClearEventQueue()
NextEvent(&event);
NextEvent(&event);
- switch(event.type)
+ switch
(event.type)
{
case EVENT_BUTTONRELEASE:
button_status = MB_RELEASED;
{
case EVENT_BUTTONRELEASE:
button_status = MB_RELEASED;
@@
-281,7
+281,7
@@
void SleepWhileUnmapped()
NextEvent(&event);
NextEvent(&event);
- switch(event.type)
+ switch
(event.type)
{
case EVENT_BUTTONRELEASE:
button_status = MB_RELEASED;
{
case EVENT_BUTTONRELEASE:
button_status = MB_RELEASED;
@@
-667,8
+667,18
@@
void HandleKey(Key key, int key_status)
element_dropped[pnr] = FALSE;
}
}
element_dropped[pnr] = FALSE;
}
}
+#if 1
+ else if (tape.recording && tape.pausing)
+ {
+ /* prevent key release events from un-pausing a paused game */
+ if (key_status == KEY_PRESSED &&
+ (key_action & KEY_ACTION))
+ TapeTogglePause(TAPE_TOGGLE_MANUAL);
+ }
+#else
else if (tape.recording && tape.pausing && (key_action & KEY_ACTION))
TapeTogglePause(TAPE_TOGGLE_MANUAL);
else if (tape.recording && tape.pausing && (key_action & KEY_ACTION))
TapeTogglePause(TAPE_TOGGLE_MANUAL);
+#endif
}
}
else
}
}
else
@@
-701,12
+711,14
@@
void HandleKey(Key key, int key_status)
ToggleFullscreenIfNeeded();
ToggleFullscreenIfNeeded();
+ if (game_status == GAME_MODE_SETUP)
+ RedrawSetupScreenAfterFullscreenToggle();
+
return;
}
return;
}
-#if 1
- if (game_status == GAME_MODE_PLAYING &&
- local_player->LevelSolved_GameEnd &&
+#if 0
+ if (game_status == GAME_MODE_PLAYING && local_player->LevelSolved_GameEnd &&
(key == KSYM_Return || key == setup.shortcut.toggle_pause))
#else
if (game_status == GAME_MODE_PLAYING && AllPlayersGone &&
(key == KSYM_Return || key == setup.shortcut.toggle_pause))
#else
if (game_status == GAME_MODE_PLAYING && AllPlayersGone &&
@@
-768,7
+780,7
@@
void HandleKey(Key key, int key_status)
key = KSYM_UNDEFINED;
}
key = KSYM_UNDEFINED;
}
- switch(game_status)
+ switch
(game_status)
{
case GAME_MODE_PSEUDO_TYPENAME:
HandleTypeName(0, key);
{
case GAME_MODE_PSEUDO_TYPENAME:
HandleTypeName(0, key);
@@
-780,7
+792,7
@@
void HandleKey(Key key, int key_status)
case GAME_MODE_SETUP:
case GAME_MODE_INFO:
case GAME_MODE_SCORES:
case GAME_MODE_SETUP:
case GAME_MODE_INFO:
case GAME_MODE_SCORES:
- switch(key)
+ switch
(key)
{
case KSYM_space:
case KSYM_Return:
{
case KSYM_space:
case KSYM_Return:
@@
-851,7
+863,7
@@
void HandleKey(Key key, int key_status)
case GAME_MODE_PLAYING:
{
case GAME_MODE_PLAYING:
{
- switch(key)
+ switch
(key)
{
case KSYM_Escape:
RequestQuitGame(setup.ask_on_escape);
{
case KSYM_Escape:
RequestQuitGame(setup.ask_on_escape);
@@
-1016,7
+1028,7
@@
void HandleJoystick()
int dx = (left ? -1 : right ? 1 : 0);
int dy = (up ? -1 : down ? 1 : 0);
int dx = (left ? -1 : right ? 1 : 0);
int dy = (up ? -1 : down ? 1 : 0);
- switch(game_status)
+ switch
(game_status)
{
case GAME_MODE_TITLE:
case GAME_MODE_MAIN:
{
case GAME_MODE_TITLE:
case GAME_MODE_MAIN:
@@
-1055,7
+1067,7
@@
void HandleJoystick()
if (tape.playing || keyboard)
newbutton = ((joy & JOY_BUTTON) != 0);
if (tape.playing || keyboard)
newbutton = ((joy & JOY_BUTTON) != 0);
-#if
1
+#if
0
if (local_player->LevelSolved_GameEnd && newbutton)
#else
if (AllPlayersGone && newbutton)
if (local_player->LevelSolved_GameEnd && newbutton)
#else
if (AllPlayersGone && newbutton)