projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20060130-1-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 99538b9d4a9b5455c494a2e29dcbf5c037a0ed7e..591b96ab5bdd348c7d921fb4f4423971355e1dc9 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-50,7
+50,7
@@
short StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short Back[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
boolean Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
boolean Pushed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short Back[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
boolean Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
boolean Pushed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-short Change
d
[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short Change
Count
[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short ChangeEvent[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short WasJustMoving[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short WasJustFalling[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short ChangeEvent[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short WasJustMoving[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short WasJustFalling[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@
-3643,6
+3643,11
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"dripper",
"dripper"
},
"dripper",
"dripper"
},
+ {
+ "trigger_ce_value",
+ "trigger",
+ "CE value of element triggering change"
+ },
/* ----------------------------------------------------------------------- */
/* "real" (and therefore drawable) runtime elements */
/* ----------------------------------------------------------------------- */
/* "real" (and therefore drawable) runtime elements */
@@
-3944,6
+3949,11
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"dripper",
"dripper"
},
"dripper",
"dripper"
},
+ {
+ "emc_spring_bumper.active",
+ "emc_spring_bumper",
+ "spring bumper",
+ },
/* ----------------------------------------------------------------------- */
/* "unreal" (and therefore not drawable) runtime elements */
/* ----------------------------------------------------------------------- */
/* "unreal" (and therefore not drawable) runtime elements */
@@
-4044,6
+4054,16
@@
struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
"-",
"-"
},
"-",
"-"
},
+ {
+ "diagonal.shrinking",
+ "-",
+ "-"
+ },
+ {
+ "diagonal.growing",
+ "-",
+ "-"
+ },
/* ----------------------------------------------------------------------- */
/* dummy elements (never used as game elements, only used as graphics) */
/* ----------------------------------------------------------------------- */
/* dummy elements (never used as game elements, only used as graphics) */
@@
-4443,12
+4463,16
@@
struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
{ NULL, 0, 0 }
};
{ NULL, 0, 0 }
};
-struct ElementDirectionInfo element_direction_info[NUM_DIRECTIONS + 1] =
+struct ElementDirectionInfo element_direction_info[NUM_DIRECTIONS
_FULL
+ 1] =
{
{ ".left", MV_BIT_LEFT },
{ ".right", MV_BIT_RIGHT },
{ ".up", MV_BIT_UP },
{ ".down", MV_BIT_DOWN },
{
{ ".left", MV_BIT_LEFT },
{ ".right", MV_BIT_RIGHT },
{ ".up", MV_BIT_UP },
{ ".down", MV_BIT_DOWN },
+ { ".upleft", MV_BIT_UP },
+ { ".upright", MV_BIT_RIGHT },
+ { ".downleft", MV_BIT_LEFT },
+ { ".downright", MV_BIT_DOWN },
{ NULL, 0 }
};
{ NULL, 0 }
};
@@
-4499,9
+4523,13
@@
struct TokenIntPtrInfo image_config_vars[] =
{ "menu.list_size.SCORES", &menu.list_size[GFX_SPECIAL_ARG_SCORES] },
{ "menu.list_size.INFO", &menu.list_size[GFX_SPECIAL_ARG_INFO] },
{ "menu.list_size.SCORES", &menu.list_size[GFX_SPECIAL_ARG_SCORES] },
{ "menu.list_size.INFO", &menu.list_size[GFX_SPECIAL_ARG_INFO] },
+ { "door_1.width", &door_1.width },
+ { "door_1.height", &door_1.height },
{ "door_1.step_offset", &door_1.step_offset },
{ "door_1.step_delay", &door_1.step_delay },
{ "door_1.anim_mode", &door_1.anim_mode },
{ "door_1.step_offset", &door_1.step_offset },
{ "door_1.step_delay", &door_1.step_delay },
{ "door_1.anim_mode", &door_1.anim_mode },
+ { "door_2.width", &door_2.width },
+ { "door_2.height", &door_2.height },
{ "door_2.step_offset", &door_2.step_offset },
{ "door_2.step_delay", &door_2.step_delay },
{ "door_2.anim_mode", &door_2.anim_mode },
{ "door_2.step_offset", &door_2.step_offset },
{ "door_2.step_delay", &door_2.step_delay },
{ "door_2.anim_mode", &door_2.anim_mode },