projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040319-B-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 2fa12d6a5f7901d754ca75db5683ce2aeb3525d6..7e197d453398aa64fb78683aee966b949f336f83 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-58,8
+58,9
@@
short WasJustFalling[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaCnt[MAX_NUM_AMOEBA];
short AmoebaCnt2[MAX_NUM_AMOEBA];
short AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaCnt[MAX_NUM_AMOEBA];
short AmoebaCnt2[MAX_NUM_AMOEBA];
-short ExplodePhase[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short ExplodePhase[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short ExplodeDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@
-89,7
+90,7
@@
int ZX, ZY;
int ExitX, ExitY;
int AllPlayersGone;
int ExitX, ExitY;
int AllPlayersGone;
-int TimeFrames, TimePlayed, TimeLeft;
+int TimeFrames, TimePlayed, TimeLeft
, TapeTime
;
boolean network_player_action_received = FALSE;
boolean network_player_action_received = FALSE;
@@
-657,7
+658,7
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
{
"black_orb",
"black_orb",
{
"black_orb",
"black_orb",
- "bomb"
+ "b
lack orb b
omb"
},
{
"amoeba_to_diamond",
},
{
"amoeba_to_diamond",
@@
-3399,6
+3400,16
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"unknown",
"unknown element"
},
"unknown",
"unknown element"
},
+ {
+ "trigger_element",
+ "trigger",
+ "element triggering change"
+ },
+ {
+ "trigger_player",
+ "trigger",
+ "player triggering change"
+ },
/* ----------------------------------------------------------------------- */
/* "real" (and therefore drawable) runtime elements */
/* ----------------------------------------------------------------------- */
/* "real" (and therefore drawable) runtime elements */
@@
-3855,12
+3866,17
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-"
},
{
"-"
},
{
- "internal
/editor
",
+ "internal
_clipboard_custom
",
"internal",
"internal",
- "-"
+ "empty custom element"
+ },
+ {
+ "internal_clipboard_group",
+ "internal",
+ "empty group element"
},
{
},
{
- "internal
/
dummy",
+ "internal
_
dummy",
"internal",
"-"
},
"internal",
"-"
},