projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed function 'NextEvent' to 'WaitEvent'
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index 5b1e5771c671ca48ae568bdd221dd8100799966f..10b866d433f5d72a8cbde3275db3516317af5a0e 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-142,7
+142,7
@@
boolean NextValidEvent(Event *event)
{
boolean handle_this_event = FALSE;
{
boolean handle_this_event = FALSE;
-
Nex
tEvent(event);
+
Wai
tEvent(event);
if (FilterEvents(event))
handle_this_event = TRUE;
if (FilterEvents(event))
handle_this_event = TRUE;
@@
-344,7
+344,7
@@
void ClearEventQueue()
{
Event event;
{
Event event;
-
Nex
tEvent(&event);
+
Wai
tEvent(&event);
switch (event.type)
{
switch (event.type)
{
@@
-392,7
+392,7
@@
void SleepWhileUnmapped()
{
Event event;
{
Event event;
-
Nex
tEvent(&event);
+
Wai
tEvent(&event);
switch (event.type)
{
switch (event.type)
{
@@
-1275,7
+1275,7
@@
void HandleButton(int mx, int my, int button, int button_nr)
if (HandleGlobalAnimClicks(mx, my, button))
{
/* do not handle this button event anymore */
if (HandleGlobalAnimClicks(mx, my, button))
{
/* do not handle this button event anymore */
-
mx = my = -32; /* force mouse event to be outside screen tiles
*/
+
return; /* force mouse event not to be handled at all
*/
}
if (button_hold && game_status == GAME_MODE_PLAYING && tape.pausing)
}
if (button_hold && game_status == GAME_MODE_PLAYING && tape.pausing)
@@
-1441,6
+1441,11
@@
static void HandleKeysSpecial(Key key)
{
SaveNativeLevel(&level);
}
{
SaveNativeLevel(&level);
}
+ else if (is_string_suffix(cheat_input, ":frames-per-second") ||
+ is_string_suffix(cheat_input, ":fps"))
+ {
+ global.show_frames_per_second = !global.show_frames_per_second;
+ }
}
else if (game_status == GAME_MODE_PLAYING)
{
}
else if (game_status == GAME_MODE_PLAYING)
{
@@
-1470,7
+1475,7
@@
void HandleKeysDebug(Key key)
if (game_status == GAME_MODE_PLAYING || !setup.debug.frame_delay_game_only)
{
if (game_status == GAME_MODE_PLAYING || !setup.debug.frame_delay_game_only)
{
- boolean mod_key_pressed = (
GetKeyModState(
) != KMOD_None);
+ boolean mod_key_pressed = (
(GetKeyModState() & KMOD_Valid
) != KMOD_None);
for (i = 0; i < NUM_DEBUG_FRAME_DELAY_KEYS; i++)
{
for (i = 0; i < NUM_DEBUG_FRAME_DELAY_KEYS; i++)
{