X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fanim.c;h=7f1670708cf2693fc3f0deb5d98858b6c6f656fd;hp=9097d88cb9f3600a1988365386315449c9917e48;hb=ee9e184f386884046f1a9c8720c0ff212738b46a;hpb=b8c4745f91cc4b85243de0cd9394b49e8cb3506e diff --git a/src/anim.c b/src/anim.c index 9097d88c..7f167070 100644 --- 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_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 @@ -516,10 +517,13 @@ void InitGlobalAnimations() InitGlobalAnimControls(); } -void DrawGlobalAnimationsExt(int drawing_stage) +void DrawGlobalAnimationsExt(int drawing_target, int drawing_stage) { int mode_nr; + if (!setup.toons) + return; + 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; } - 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) @@ -667,9 +671,9 @@ void DrawGlobalAnimationsExt(int drawing_stage) } } -void DrawGlobalAnimations(int drawing_stage) +void DrawGlobalAnimations(int drawing_target, int drawing_stage) { - DrawGlobalAnimationsExt(drawing_stage); + DrawGlobalAnimationsExt(drawing_target, drawing_stage); } boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part)