projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changed some EM engine game element names
[rocksndiamonds.git]
/
src
/
game_em
/
emerald.h
diff --git
a/src/game_em/emerald.h
b/src/game_em/emerald.h
index 1afbfbfc58f62850d9856741dcbd39d937b4c223..37b75c66e4be259c95280bcb399c2eb87f05b814 100644
(file)
--- a/
src/game_em/emerald.h
+++ b/
src/game_em/emerald.h
@@
-48,9
+48,6
@@
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
#define CAVE_WIDTH MAX_PLAYFIELD_WIDTH
#define CAVE_HEIGHT MAX_PLAYFIELD_HEIGHT
@@
-63,9
+60,9
@@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/*
-----------------------------------------------------------------------------
definition of elements used in the Emerald Mine Club engine;
/*
-----------------------------------------------------------------------------
definition of elements used in the Emerald Mine Club engine;
- the element names have the following properties:
+ the element names
(mostly)
have the following properties:
- elements that start with 'X' can be stored in a level file
- elements that start with 'X' can be stored in a level file
- - elements that start with 'Y' indicate moving elements
+ - elements that start with 'Y' indicate moving
or active
elements
- elements that end with 'B' are the "backside" of moving elements
-----------------------------------------------------------------------------
*/
- elements that end with 'B' are the "backside" of moving elements
-----------------------------------------------------------------------------
*/
@@
-74,8
+71,8
@@
enum
{
Xblank = 0,
{
Xblank = 0,
- X
acid_
splash_e,
- X
acid_
splash_w,
+ Xsplash_e,
+ Xsplash_w,
Xplant,
Yplant,
Xplant,
Yplant,
@@
-89,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,
@@
-98,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,
@@
-375,16
+370,16
@@
enum
Ydrip_2_sB,
Xwonderwall,
Ydrip_2_sB,
Xwonderwall,
-
XwonderwallB
,
+
Ywonderwall
,
Xwheel,
Xwheel,
-
XwheelB
,
+
Ywheel
,
Xswitch,
Xswitch,
-
XswitchB
,
+
Yswitch
,
Xbumper,
Xbumper,
-
XbumperB
,
+
Ybumper
,
Xacid_nw,
Xacid_ne,
Xacid_nw,
Xacid_ne,
@@
-393,13
+388,13
@@
enum
Xacid_se,
Xfake_blank,
Xacid_se,
Xfake_blank,
-
Xfake_blankB
,
+
Yfake_blank
,
Xfake_grass,
Xfake_grass,
-
Xfake_grassB
,
+
Yfake_grass
,
- Xfake_amoeba, /* dripper */
-
Xfake_amoebaB
,
+ Xfake_amoeba,
/* dripper */
+
Yfake_amoeba
,
Xlenses,
Xlenses,
@@
-421,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,
@@
-520,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,
@@
-533,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 */
@@
-606,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 */