projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040315-2-src
[rocksndiamonds.git]
/
src
/
main.h
diff --git
a/src/main.h
b/src/main.h
index cb739c041ccedc618bd196d452b74247444433eb..037ac80fcb6b45c118f721d10176ca68eed0fa09 100644
(file)
--- a/
src/main.h
+++ b/
src/main.h
@@
-902,8
+902,10
@@
/* ---------- end of custom elements section ------------------------------- */
#define EL_UNKNOWN 656
/* ---------- end of custom elements section ------------------------------- */
#define EL_UNKNOWN 656
+#define EL_TRIGGER_ELEMENT 657
+#define EL_TRIGGER_PLAYER 658
-#define NUM_FILE_ELEMENTS 65
7
+#define NUM_FILE_ELEMENTS 65
9
/* "real" (and therefore drawable) runtime elements */
/* "real" (and therefore drawable) runtime elements */
@@
-1542,7
+1544,7
@@
struct ElementChangeInfo
int delay_random; /* added frame delay before changed (random) */
int delay_frames; /* either 1 (frames) or 50 (seconds; 50 fps) */
int delay_random; /* added frame delay before changed (random) */
int delay_frames; /* either 1 (frames) or 50 (seconds; 50 fps) */
- short trigger_element; /*
custom
element triggering change */
+ short trigger_element; /* element triggering change */
int content[3][3]; /* new elements after extended change */
boolean use_content; /* use extended change content */
int content[3][3]; /* new elements after extended change */
boolean use_content; /* use extended change content */
@@
-1559,6
+1561,11
@@
struct ElementChangeInfo
void (*change_function)(int x, int y);
void (*post_change_function)(int x, int y);
void (*change_function)(int x, int y);
void (*post_change_function)(int x, int y);
+ /* ---------- internal values used at runtime when playing ---------- */
+
+ short actual_trigger_element; /* element that actually triggered change */
+ int actual_trigger_player; /* player which actually triggered change */
+
/* ---------- internal values used in level editor ---------- */
int direct_action; /* change triggered by actions on element */
/* ---------- internal values used in level editor ---------- */
int direct_action; /* change triggered by actions on element */