projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
code cleanup
[rocksndiamonds.git]
/
src
/
anim.c
diff --git
a/src/anim.c
b/src/anim.c
index 70600166488ce6cd34396635e7b5cedf467d9e45..fa124cb6ab692e957125a060b0d8ffe0a013ef96 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-1248,7
+1248,9
@@
void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int action)
{
struct GlobalAnimPartControlInfo *part;
struct GraphicInfo *c = &anim->control_info;
{
struct GlobalAnimPartControlInfo *part;
struct GraphicInfo *c = &anim->control_info;
+ int num_parts = anim->num_parts + (anim->has_base ? 1 : 0);
int state, active_part_nr;
int state, active_part_nr;
+ int i;
#if 0
printf("::: HandleGlobalAnim_Main: %d, %d => %d\n",
#if 0
printf("::: HandleGlobalAnim_Main: %d, %d => %d\n",
@@
-1289,13
+1291,8
@@
void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int action)
case ANIM_STOP:
anim->state = ANIM_STATE_INACTIVE;
case ANIM_STOP:
anim->state = ANIM_STATE_INACTIVE;
- {
- int num_parts = anim->num_parts + (anim->has_base ? 1 : 0);
- int i;
-
- for (i = 0; i < num_parts; i++)
- StopGlobalAnimSoundAndMusic(&anim->part[i]);
- }
+ for (i = 0; i < num_parts; i++)
+ StopGlobalAnimSoundAndMusic(&anim->part[i]);
return;
return;
@@
-1305,9
+1302,6
@@
void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int action)
if (c->anim_mode & ANIM_ALL || anim->num_parts == 0)
{
if (c->anim_mode & ANIM_ALL || anim->num_parts == 0)
{
- int num_parts = anim->num_parts + (anim->has_base ? 1 : 0);
- int i;
-
#if 0
printf("::: HandleGlobalAnim_Main: %d, %d => %d\n",
anim->mode_nr, anim->nr, num_parts);
#if 0
printf("::: HandleGlobalAnim_Main: %d, %d => %d\n",
anim->mode_nr, anim->nr, num_parts);
@@
-1469,7
+1463,8
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
boolean any_part_clicked = FALSE;
int mode_nr;
boolean any_part_clicked = FALSE;
int mode_nr;
- for (mode_nr = 0; mode_nr < NUM_GAME_MODES; mode_nr++)
+ // check game modes in reverse draw order (to stop when clicked)
+ for (mode_nr = NUM_GAME_MODES - 1; mode_nr >= 0; mode_nr--)
{
struct GlobalAnimControlInfo *ctrl = &global_anim_ctrl[mode_nr];
int anim_nr;
{
struct GlobalAnimControlInfo *ctrl = &global_anim_ctrl[mode_nr];
int anim_nr;