projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added also fading in/out global animations to be started/stopped
[rocksndiamonds.git]
/
src
/
events.c
diff --git
a/src/events.c
b/src/events.c
index 9af9d45901658ab5bf8ecb87117ee5684a2ec9ed..bad68898754e4249cdc09113095de3dc57728356 100644
(file)
--- a/
src/events.c
+++ b/
src/events.c
@@
-19,7
+19,7
@@
#include "editor.h"
#include "files.h"
#include "tape.h"
#include "editor.h"
#include "files.h"
#include "tape.h"
-#include "
cartoons
.h"
+#include "
anim
.h"
#include "network.h"
#include "network.h"
@@
-1359,7
+1359,8
@@
void HandleKey(Key key, int key_status)
key == KSYM_plus ||
key == KSYM_0) &&
((GetKeyModState() & KMOD_Control) ||
key == KSYM_plus ||
key == KSYM_0) &&
((GetKeyModState() & KMOD_Control) ||
- (GetKeyModState() & KMOD_Alt)) &&
+ (GetKeyModState() & KMOD_Alt) ||
+ (GetKeyModState() & KMOD_Meta)) &&
video.window_scaling_available &&
!video.fullscreen_enabled)
{
video.window_scaling_available &&
!video.fullscreen_enabled)
{
@@
-1623,15
+1624,6
@@
void HandleNoEvent()
{
case GAME_MODE_MAIN:
DrawPreviewLevelAnimation();
{
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:
break;
case GAME_MODE_EDITOR: