projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed test/debug code for EM graphics engine
[rocksndiamonds.git]
/
src
/
game_em
/
emerald.h
diff --git
a/src/game_em/emerald.h
b/src/game_em/emerald.h
index d83a182da26d8fce0cc41905b2c73e9e22e6be7d..4e2d8ab99a875eddc5a1c0e07be491f59192f33c 100644
(file)
--- a/
src/game_em/emerald.h
+++ b/
src/game_em/emerald.h
@@
-48,14
+48,10
@@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// constant definitions
// ----------------------------------------------------------------------------
// constant definitions
// ----------------------------------------------------------------------------
-/* define these to use additional elements */
-#define
EM_ENGINE_USE_ADDITIONAL_ELEMENTS
+#define CAVE_WIDTH MAX_PLAYFIELD_WIDTH
+#define
CAVE_HEIGHT MAX_PLAYFIELD_HEIGHT
-/* with border for steelwall, if needed (when converted from R'n'D level) */
-#define CAVE_WIDTH (MAX_PLAYFIELD_WIDTH + 2)
-#define CAVE_HEIGHT (MAX_PLAYFIELD_HEIGHT + 2)
-
-/* with border for Zborder elements (surrounding the visible playfield) */
+/* additional padding for Zborder elements and linked cave buffer columns */
#define CAVE_BUFFER_XOFFSET 4
#define CAVE_BUFFER_YOFFSET 2
#define CAVE_BUFFER_WIDTH (CAVE_WIDTH + 2 * CAVE_BUFFER_XOFFSET)
#define CAVE_BUFFER_XOFFSET 4
#define CAVE_BUFFER_YOFFSET 2
#define CAVE_BUFFER_WIDTH (CAVE_WIDTH + 2 * CAVE_BUFFER_XOFFSET)
@@
-75,8
+71,8
@@
enum
{
Xblank = 0,
{
Xblank = 0,
- X
acid_
splash_e,
- X
acid_
splash_w,
+ Xsplash_e,
+ Xsplash_w,
Xplant,
Yplant,
Xplant,
Yplant,
@@
-90,8
+86,7
@@
enum
Xacid_7,
Xacid_8,
Xacid_7,
Xacid_8,
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
- Xfake_acid_1,
+ Xfake_acid_1, /* newly added to EM engine */
Xfake_acid_2,
Xfake_acid_3,
Xfake_acid_4,
Xfake_acid_2,
Xfake_acid_3,
Xfake_acid_4,
@@
-99,7
+94,6
@@
enum
Xfake_acid_6,
Xfake_acid_7,
Xfake_acid_8,
Xfake_acid_6,
Xfake_acid_7,
Xfake_acid_8,
-#endif
Xgrass,
Ygrass_nB,
Xgrass,
Ygrass_nB,
@@
-399,7
+393,7
@@
enum
Xfake_grass,
Xfake_grassB,
Xfake_grass,
Xfake_grassB,
- Xfake_amoeba, /* dripper */
+ Xfake_amoeba,
/* dripper */
Xfake_amoebaB,
Xlenses,
Xfake_amoebaB,
Xlenses,
@@
-422,15
+416,13
@@
enum
Xsand_stonesand_4,
Xsand_stoneout_1,
Xsand_stoneout_2,
Xsand_stonesand_4,
Xsand_stoneout_1,
Xsand_stoneout_2,
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
- Xsand_stonesand_quickout_1,
+ Xsand_stonesand_quickout_1, /* newly added to EM engine */
Xsand_stonesand_quickout_2,
Xsand_stonesand_quickout_2,
-#endif
- Xslide
wall_ns,
/* growing wall */
- Yslide
wall
_ns_blank,
- Xslide
wall
_ew,
- Yslide
wall
_ew_blank,
+ Xslide
_ns,
/* growing wall */
+ Yslide_ns_blank,
+ Xslide_ew,
+ Yslide_ew_blank,
Xwind_n,
Xwind_e,
Xwind_n,
Xwind_e,
@@
-521,8
+513,7
@@
enum
Xalpha_arrow_w,
Xalpha_copyr,
Xalpha_arrow_w,
Xalpha_copyr,
-#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS
- Ykey_1_blank,
+ Ykey_1_blank, /* newly added to EM engine */
Ykey_2_blank,
Ykey_3_blank,
Ykey_4_blank,
Ykey_2_blank,
Ykey_3_blank,
Ykey_4_blank,
@@
-534,7
+525,6
@@
enum
Ymagnify_blank,
Ygrass_blank,
Ydirt_blank,
Ymagnify_blank,
Ygrass_blank,
Ydirt_blank,
-#endif
Xboom_bug, /* passed from explode to synchro (linked explosion);
transition to explode_normal */
Xboom_bug, /* passed from explode to synchro (linked explosion);
transition to explode_normal */
@@
-607,7
+597,7
@@
enum
SOUND_dirt, /* player digs into dirt */
SOUND_acid, /* acid splashes */
SOUND_ball, /* ball places something */
SOUND_dirt, /* player digs into dirt */
SOUND_acid, /* acid splashes */
SOUND_ball, /* ball places something */
- SOUND_slide
wall,
/* slide wall grows */
+ SOUND_slide
,
/* slide wall grows */
SOUND_wonder, /* wonderwall is active */
SOUND_door, /* player goes thru door (gate) */
SOUND_exit_open, /* exit opens */
SOUND_wonder, /* wonderwall is active */
SOUND_door, /* player goes thru door (gate) */
SOUND_exit_open, /* exit opens */