projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20050307-1-src
[rocksndiamonds.git]
/
src
/
game_em
/
main_em.h
diff --git
a/src/game_em/main_em.h
b/src/game_em/main_em.h
index cf583dbb0716c56b96c0de1a71043557750b0dd9..345107efb821e9cf93676f865badbc1fb3b2e54c 100644
(file)
--- a/
src/game_em/main_em.h
+++ b/
src/game_em/main_em.h
@@
-362,6
+362,18
@@
enum
Xfake_door_6,
Xfake_door_7,
Xfake_door_8,
Xfake_door_6,
Xfake_door_7,
Xfake_door_8,
+
+#if 1
+ Xfake_acid_1,
+ Xfake_acid_2,
+ Xfake_acid_3,
+ Xfake_acid_4,
+ Xfake_acid_5,
+ Xfake_acid_6,
+ Xfake_acid_7,
+ Xfake_acid_8,
+#endif
+
Xsteel_1,
Xsteel_2,
Xsteel_3,
Xsteel_1,
Xsteel_2,
Xsteel_3,
@@
-474,10
+486,12
@@
enum
SAMPLE_crack, /* stone hits nut */
SAMPLE_bug, /* bug moves */
SAMPLE_tank, /* tank moves */
SAMPLE_crack, /* stone hits nut */
SAMPLE_bug, /* bug moves */
SAMPLE_tank, /* tank moves */
- SAMPLE_android, /* android places something */
+ SAMPLE_android_clone, /* android places something */
+ SAMPLE_android_move, /* android moves */
SAMPLE_spring, /* spring hits ground/wall/bumper, stone hits spring */
SAMPLE_slurp, /* spring kills alien */
SAMPLE_spring, /* spring hits ground/wall/bumper, stone hits spring */
SAMPLE_slurp, /* spring kills alien */
- SAMPLE_eater, /* eater sits/eats diamond */
+ SAMPLE_eater, /* eater sits */
+ SAMPLE_eater_eat, /* eater eats diamond */
SAMPLE_alien, /* alien moves */
SAMPLE_collect, /* player collects object */
SAMPLE_diamond, /* diamond/emerald hits ground */
SAMPLE_alien, /* alien moves */
SAMPLE_collect, /* player collects object */
SAMPLE_diamond, /* diamond/emerald hits ground */
@@
-491,7
+505,8
@@
enum
SAMPLE_grow, /* growing wall grows */
SAMPLE_wonder, /* wonderwall is active */
SAMPLE_door, /* player goes thru door (gate) */
SAMPLE_grow, /* growing wall grows */
SAMPLE_wonder, /* wonderwall is active */
SAMPLE_door, /* player goes thru door (gate) */
- SAMPLE_exit, /* player goes into exit */
+ SAMPLE_exit_open, /* exit opens */
+ SAMPLE_exit_leave, /* player goes into exit */
SAMPLE_dynamite, /* player places dynamite */
SAMPLE_tick, /* dynamite ticks */
SAMPLE_press, /* player presses wheel/wind/switch */
SAMPLE_dynamite, /* player places dynamite */
SAMPLE_tick, /* dynamite ticks */
SAMPLE_press, /* player presses wheel/wind/switch */
@@
-595,11
+610,14
@@
struct PLAYER
unsigned int oldx;
unsigned int oldy;
unsigned int oldx;
unsigned int oldy;
+ unsigned int last_move_dir;
+
unsigned joy_n:1;
unsigned joy_e:1;
unsigned joy_s:1;
unsigned joy_w:1;
unsigned joy_n:1;
unsigned joy_e:1;
unsigned joy_s:1;
unsigned joy_w:1;
- unsigned joy_fire:1;
+ unsigned joy_snap:1;
+ unsigned joy_drop:1;
unsigned joy_stick:1;
unsigned joy_spin:1;
};
unsigned joy_stick:1;
unsigned joy_spin:1;
};
@@
-617,6
+635,11
@@
struct PLAYER
#define FILE_VERSION_EM_ACTUAL FILE_VERSION_EM_V6
#define FILE_VERSION_EM_ACTUAL FILE_VERSION_EM_V6
+struct GlobalInfo_EM
+{
+ Bitmap *screenbuffer;
+};
+
struct LevelInfo_EM
{
int file_version;
struct LevelInfo_EM
{
int file_version;
@@
-635,6
+658,13
@@
struct GraphicInfo_EM
int dst_offset_x, dst_offset_y;
int width, height;
int dst_offset_x, dst_offset_y;
int width, height;
+ Bitmap *crumbled_bitmap;
+ int crumbled_src_x, crumbled_src_y;
+ int crumbled_border_size;
+
+ boolean has_crumbled_graphics;
+ boolean preserve_background;
+
int unique_identifier; /* used to identify needed screen updates */
};
int unique_identifier; /* used to identify needed screen updates */
};