projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed doing global animation stuff when it is disabled in setup menu
[rocksndiamonds.git]
/
src
/
anim.c
diff --git
a/src/anim.c
b/src/anim.c
index 9097d88cb9f3600a1988365386315449c9917e48..7dc621986b5e5f9fdd7138a58296697946796f1b 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-56,9
+56,10
@@
#define ANIM_STATE_RUNNING (1 << 2)
/* values for global animation control */
#define ANIM_STATE_RUNNING (1 << 2)
/* values for global animation control */
-#define ANIM_START 0
-#define ANIM_CONTINUE 1
-#define ANIM_STOP 2
+#define ANIM_NO_ACTION 0
+#define ANIM_START 1
+#define ANIM_CONTINUE 2
+#define ANIM_STOP 3
struct GlobalAnimPartControlInfo
struct GlobalAnimPartControlInfo
@@
-520,6
+521,9
@@
void DrawGlobalAnimationsExt(int drawing_stage)
{
int mode_nr;
{
int mode_nr;
+ if (!setup.toons)
+ return;
+
if (global.anim_status != anim_status_last)
{
boolean before_fading = (global.anim_status == GAME_MODE_PSEUDO_FADING);
if (global.anim_status != anim_status_last)
{
boolean before_fading = (global.anim_status == GAME_MODE_PSEUDO_FADING);
@@
-567,7
+571,7
@@
void DrawGlobalAnimationsExt(int drawing_stage)
anim_status_last = global.anim_status;
}
anim_status_last = global.anim_status;
}
- if (
!setup.toons ||
global.anim_status == GAME_MODE_LOADING)
+ if (global.anim_status == GAME_MODE_LOADING)
return;
if (drawing_stage == DRAW_GLOBAL_ANIM_STAGE_1)
return;
if (drawing_stage == DRAW_GLOBAL_ANIM_STAGE_1)