projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug with high scores for wrong level when auto-playing next level
[rocksndiamonds.git]
/
src
/
anim.c
diff --git
a/src/anim.c
b/src/anim.c
index fbc88c351e5e33ca498db163bb57dde6117794a2..cdde423668a441c691c59bc273a558dc090e2047 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-198,8
+198,8
@@
struct AnimClassGameMode
/* forward declaration for internal use */
static void HandleGlobalAnim(int, int);
static void DoAnimationExt(void);
/* forward declaration for internal use */
static void HandleGlobalAnim(int, int);
static void DoAnimationExt(void);
-static void ResetGlobalAnim_Clickable();
-static void ResetGlobalAnim_Clicked();
+static void ResetGlobalAnim_Clickable(
void
);
+static void ResetGlobalAnim_Clicked(
void
);
static struct GlobalAnimControlInfo global_anim_ctrl[NUM_GAME_MODES];
static struct GlobalAnimControlInfo global_anim_ctrl[NUM_GAME_MODES];
@@
-325,7
+325,7
@@
static int compareGlobalAnimMainControlInfo(const void *obj1, const void *obj2)
return compare_result;
}
return compare_result;
}
-static void InitToonControls()
+static void InitToonControls(
void
)
{
int mode_nr_toons = GAME_MODE_PSEUDO_TOONS;
struct GlobalAnimControlInfo *ctrl = &global_anim_ctrl[mode_nr_toons];
{
int mode_nr_toons = GAME_MODE_PSEUDO_TOONS;
struct GlobalAnimControlInfo *ctrl = &global_anim_ctrl[mode_nr_toons];
@@
-407,7
+407,7
@@
static void InitToonControls()
ctrl->num_anims++;
}
ctrl->num_anims++;
}
-
void InitGlobalAnimControls(
)
+
static void InitGlobalAnimControls(void
)
{
int i, m, a, p;
int mode_nr, anim_nr, part_nr;
{
int i, m, a, p;
int mode_nr, anim_nr, part_nr;
@@
-568,12
+568,12
@@
void InitGlobalAnimControls()
anim_classes_last = ANIM_CLASS_NONE;
}
anim_classes_last = ANIM_CLASS_NONE;
}
-void InitGlobalAnimations()
+void InitGlobalAnimations(
void
)
{
InitGlobalAnimControls();
}
{
InitGlobalAnimControls();
}
-void DrawGlobalAnimationsExt(int drawing_target, int drawing_stage)
+
static
void DrawGlobalAnimationsExt(int drawing_target, int drawing_stage)
{
Bitmap *fade_bitmap =
(drawing_target == DRAW_TO_FADE_SOURCE ? gfx.fade_bitmap_source :
{
Bitmap *fade_bitmap =
(drawing_target == DRAW_TO_FADE_SOURCE ? gfx.fade_bitmap_source :
@@
-806,7
+806,7
@@
void DrawGlobalAnimations(int drawing_target, int drawing_stage)
ResetGlobalAnim_Clicked();
}
ResetGlobalAnim_Clicked();
}
-boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part)
+
static
boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part)
{
int viewport_x;
int viewport_y;
{
int viewport_x;
int viewport_y;
@@
-1035,7
+1035,8
@@
static boolean clickConsumed(struct GlobalAnimPartControlInfo *part)
return (part->control_info.style & STYLE_PASSTHROUGH ? FALSE : TRUE);
}
return (part->control_info.style & STYLE_PASSTHROUGH ? FALSE : TRUE);
}
-int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, int state)
+static int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part,
+ int state)
{
struct GlobalAnimControlInfo *ctrl = &global_anim_ctrl[part->mode_nr];
struct GlobalAnimMainControlInfo *anim = &ctrl->anim[part->anim_nr];
{
struct GlobalAnimControlInfo *ctrl = &global_anim_ctrl[part->mode_nr];
struct GlobalAnimMainControlInfo *anim = &ctrl->anim[part->anim_nr];
@@
-1279,7
+1280,8
@@
int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part, int state)
return ANIM_STATE_RUNNING;
}
return ANIM_STATE_RUNNING;
}
-void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int action)
+static 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;
@@
-1431,7
+1433,7
@@
void HandleGlobalAnim_Main(struct GlobalAnimMainControlInfo *anim, int action)
anim->last_active_part_nr = active_part_nr;
}
anim->last_active_part_nr = active_part_nr;
}
-void HandleGlobalAnim_Mode(struct GlobalAnimControlInfo *ctrl, int action)
+
static
void HandleGlobalAnim_Mode(struct GlobalAnimControlInfo *ctrl, int action)
{
int i;
{
int i;
@@
-1453,7
+1455,7
@@
static void HandleGlobalAnim(int action, int game_mode)
HandleGlobalAnim_Mode(&global_anim_ctrl[game_mode], action);
}
HandleGlobalAnim_Mode(&global_anim_ctrl[game_mode], action);
}
-static void DoAnimationExt()
+static void DoAnimationExt(
void
)
{
int i;
{
int i;
@@
-1491,7
+1493,7
@@
static boolean DoGlobalAnim_EventAction(struct GlobalAnimPartControlInfo *part)
return action_executed;
}
return action_executed;
}
-static void InitGlobalAnim_Clickable()
+static void InitGlobalAnim_Clickable(
void
)
{
int mode_nr;
{
int mode_nr;
@@
-1642,12
+1644,12
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, boolean clicked)
return (anything_clicked || any_event_action);
}
return (anything_clicked || any_event_action);
}
-static void ResetGlobalAnim_Clickable()
+static void ResetGlobalAnim_Clickable(
void
)
{
InitGlobalAnim_Clickable();
}
{
InitGlobalAnim_Clickable();
}
-static void ResetGlobalAnim_Clicked()
+static void ResetGlobalAnim_Clicked(
void
)
{
InitGlobalAnim_Clicked(-1, -1, FALSE);
}
{
InitGlobalAnim_Clicked(-1, -1, FALSE);
}