projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moved code to check for file in level directories to separate function
[rocksndiamonds.git]
/
src
/
anim.c
diff --git
a/src/anim.c
b/src/anim.c
index 1389dc4e8815451aaa2a49d6d78190f841871e22..53435a97a71f660a6c5c62c904220ed3890f0fa3 100644
(file)
--- a/
src/anim.c
+++ b/
src/anim.c
@@
-599,7
+599,7
@@
static void InitGlobalAnimControls(void)
}
// apply special settings to pointer-style animations
}
// apply special settings to pointer-style animations
- if (part->control_info.class == get_hash_from_
key
("pointer"))
+ if (part->control_info.class == get_hash_from_
string
("pointer"))
{
// force pointer-style animations to be checked for clicks first
part->control_info.draw_order = 1000000;
{
// force pointer-style animations to be checked for clicks first
part->control_info.draw_order = 1000000;
@@
-987,7
+987,7
@@
static boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part
boolean changed = FALSE;
if (part->last_anim_status == global.anim_status &&
boolean changed = FALSE;
if (part->last_anim_status == global.anim_status &&
- part->control_info.class != get_hash_from_
key
("pointer"))
+ part->control_info.class != get_hash_from_
string
("pointer"))
return FALSE;
part->last_anim_status = global.anim_status;
return FALSE;
part->last_anim_status = global.anim_status;
@@
-996,8
+996,8
@@
static boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part
part->class_playfield_or_door = FALSE;
part->class_playfield_or_door = FALSE;
- if (part->control_info.class == get_hash_from_
key
("window") ||
- part->control_info.class == get_hash_from_
key
("border"))
+ if (part->control_info.class == get_hash_from_
string
("window") ||
+ part->control_info.class == get_hash_from_
string
("border"))
{
viewport_x = 0;
viewport_y = 0;
{
viewport_x = 0;
viewport_y = 0;
@@
-1006,7
+1006,7
@@
static boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part
part->drawing_stage = DRAW_GLOBAL_ANIM_STAGE_2;
}
part->drawing_stage = DRAW_GLOBAL_ANIM_STAGE_2;
}
- else if (part->control_info.class == get_hash_from_
key
("pointer"))
+ else if (part->control_info.class == get_hash_from_
string
("pointer"))
{
int mx = MIN(MAX(0, gfx.mouse_x), WIN_XSIZE - 1);
int my = MIN(MAX(0, gfx.mouse_y), WIN_YSIZE - 1);
{
int mx = MIN(MAX(0, gfx.mouse_x), WIN_XSIZE - 1);
int my = MIN(MAX(0, gfx.mouse_y), WIN_YSIZE - 1);
@@
-1027,7
+1027,7
@@
static boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part
if (global.anim_status != GAME_MODE_LOADING)
gfx.cursor_mode_override = CURSOR_NONE;
}
if (global.anim_status != GAME_MODE_LOADING)
gfx.cursor_mode_override = CURSOR_NONE;
}
- else if (part->control_info.class == get_hash_from_
key
("door_1"))
+ else if (part->control_info.class == get_hash_from_
string
("door_1"))
{
viewport_x = DX;
viewport_y = DY;
{
viewport_x = DX;
viewport_y = DY;
@@
-1036,7
+1036,7
@@
static boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part
part->class_playfield_or_door = TRUE;
}
part->class_playfield_or_door = TRUE;
}
- else if (part->control_info.class == get_hash_from_
key
("door_2"))
+ else if (part->control_info.class == get_hash_from_
string
("door_2"))
{
if (part->mode_nr == GAME_MODE_EDITOR)
{
{
if (part->mode_nr == GAME_MODE_EDITOR)
{
@@
-1075,7
+1075,7
@@
static boolean SetGlobalAnimPart_Viewport(struct GlobalAnimPartControlInfo *part
part->viewport_width = viewport_width;
part->viewport_height = viewport_height;
part->viewport_width = viewport_width;
part->viewport_height = viewport_height;
- if (part->control_info.class != get_hash_from_
key
("pointer"))
+ if (part->control_info.class != get_hash_from_
string
("pointer"))
changed = TRUE;
}
changed = TRUE;
}
@@
-1613,7
+1613,7
@@
static int HandleGlobalAnim_Part(struct GlobalAnimPartControlInfo *part,
part->step_yoffset = 0;
}
part->step_yoffset = 0;
}
- if (part->control_info.class != get_hash_from_
key
("pointer"))
+ if (part->control_info.class != get_hash_from_
string
("pointer"))
{
if (c->x != ARG_UNDEFINED_VALUE)
part->x = c->x;
{
if (c->x != ARG_UNDEFINED_VALUE)
part->x = c->x;
@@
-2076,7
+2076,7
@@
static boolean InitGlobalAnim_Clicked(int mx, int my, int clicked_event)
// if request dialog is active, only handle pointer-style animations
if (game.request_active &&
// if request dialog is active, only handle pointer-style animations
if (game.request_active &&
- part->control_info.class != get_hash_from_
key
("pointer"))
+ part->control_info.class != get_hash_from_
string
("pointer"))
continue;
if (clicked_event == ANIM_CLICKED_RESET)
continue;
if (clicked_event == ANIM_CLICKED_RESET)