projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed compiler warning
[rocksndiamonds.git]
/
src
/
init.c
diff --git
a/src/init.c
b/src/init.c
index 93d77928411fe907bb5ee88b3822c400cb5217e2..2529a8baba97aa4f9b16bab81a2a764ae82ff1d9 100644
(file)
--- a/
src/init.c
+++ b/
src/init.c
@@
-1155,8
+1155,8
@@
static void InitElementGraphicInfo(void)
// look for special default action graphic (classic game specific)
if (IS_BD_ELEMENT(i) && element_info[EL_BD_DEFAULT].graphic[act] != -1)
default_action_graphic = element_info[EL_BD_DEFAULT].graphic[act];
// look for special default action graphic (classic game specific)
if (IS_BD_ELEMENT(i) && element_info[EL_BD_DEFAULT].graphic[act] != -1)
default_action_graphic = element_info[EL_BD_DEFAULT].graphic[act];
- if (IS_BD
_NATIVE_ELEMENT(i) && element_info[EL_BD_NATIVE
_DEFAULT].graphic[act] != -1)
- default_action_graphic = element_info[EL_BD
_NATIVE
_DEFAULT].graphic[act];
+ if (IS_BD
X_ELEMENT(i) && element_info[EL_BDX
_DEFAULT].graphic[act] != -1)
+ default_action_graphic = element_info[EL_BD
X
_DEFAULT].graphic[act];
if (IS_SP_ELEMENT(i) && element_info[EL_SP_DEFAULT].graphic[act] != -1)
default_action_graphic = element_info[EL_SP_DEFAULT].graphic[act];
if (IS_SB_ELEMENT(i) && element_info[EL_SB_DEFAULT].graphic[act] != -1)
if (IS_SP_ELEMENT(i) && element_info[EL_SP_DEFAULT].graphic[act] != -1)
default_action_graphic = element_info[EL_SP_DEFAULT].graphic[act];
if (IS_SB_ELEMENT(i) && element_info[EL_SB_DEFAULT].graphic[act] != -1)
@@
-1166,8
+1166,8
@@
static void InitElementGraphicInfo(void)
if (IS_BD_ELEMENT(i) && element_info[EL_BD_DEFAULT].crumbled[act] != -1)
default_action_crumbled = element_info[EL_BD_DEFAULT].crumbled[act];
if (IS_BD_ELEMENT(i) && element_info[EL_BD_DEFAULT].crumbled[act] != -1)
default_action_crumbled = element_info[EL_BD_DEFAULT].crumbled[act];
- if (IS_BD
_NATIVE_ELEMENT(i) && element_info[EL_BD_NATIVE
_DEFAULT].crumbled[act] != -1)
- default_action_crumbled = element_info[EL_BD
_NATIVE
_DEFAULT].crumbled[act];
+ if (IS_BD
X_ELEMENT(i) && element_info[EL_BDX
_DEFAULT].crumbled[act] != -1)
+ default_action_crumbled = element_info[EL_BD
X
_DEFAULT].crumbled[act];
if (IS_SP_ELEMENT(i) && element_info[EL_SP_DEFAULT].crumbled[act] != -1)
default_action_crumbled = element_info[EL_SP_DEFAULT].crumbled[act];
if (IS_SB_ELEMENT(i) && element_info[EL_SB_DEFAULT].crumbled[act] != -1)
if (IS_SP_ELEMENT(i) && element_info[EL_SP_DEFAULT].crumbled[act] != -1)
default_action_crumbled = element_info[EL_SP_DEFAULT].crumbled[act];
if (IS_SB_ELEMENT(i) && element_info[EL_SB_DEFAULT].crumbled[act] != -1)
@@
-2170,8
+2170,8
@@
static void InitElementSoundInfo(void)
// look for special default action sound (classic game specific)
if (IS_BD_ELEMENT(i) && element_info[EL_BD_DEFAULT].sound[act] != -1)
default_action_sound = element_info[EL_BD_DEFAULT].sound[act];
// look for special default action sound (classic game specific)
if (IS_BD_ELEMENT(i) && element_info[EL_BD_DEFAULT].sound[act] != -1)
default_action_sound = element_info[EL_BD_DEFAULT].sound[act];
- if (IS_BD
_NATIVE_ELEMENT(i) && element_info[EL_BD_NATIVE
_DEFAULT].sound[act] != -1)
- default_action_sound = element_info[EL_BD
_NATIVE
_DEFAULT].sound[act];
+ if (IS_BD
X_ELEMENT(i) && element_info[EL_BDX
_DEFAULT].sound[act] != -1)
+ default_action_sound = element_info[EL_BD
X
_DEFAULT].sound[act];
if (IS_SP_ELEMENT(i) && element_info[EL_SP_DEFAULT].sound[act] != -1)
default_action_sound = element_info[EL_SP_DEFAULT].sound[act];
if (IS_SB_ELEMENT(i) && element_info[EL_SB_DEFAULT].sound[act] != -1)
if (IS_SP_ELEMENT(i) && element_info[EL_SP_DEFAULT].sound[act] != -1)
default_action_sound = element_info[EL_SP_DEFAULT].sound[act];
if (IS_SB_ELEMENT(i) && element_info[EL_SB_DEFAULT].sound[act] != -1)
@@
-4305,16
+4305,17
@@
void InitElementPropertiesStatic(void)
EL_AMOEBA_DRY,
EL_AMOEBA_FULL,
EL_BD_AMOEBA,
EL_AMOEBA_DRY,
EL_AMOEBA_FULL,
EL_BD_AMOEBA,
- EL_BD_AMOEBA_2,
- EL_BD_SLIME,
- EL_BD_ACID,
- EL_BD_BITER,
- EL_BD_BITER_RIGHT,
- EL_BD_BITER_UP,
- EL_BD_BITER_LEFT,
- EL_BD_BITER_DOWN,
- EL_BD_BLADDER,
- EL_BD_NUT,
+ EL_BDX_AMOEBA_1,
+ EL_BDX_AMOEBA_2,
+ EL_BDX_SLIME,
+ EL_BDX_ACID,
+ EL_BDX_BITER,
+ EL_BDX_BITER_RIGHT,
+ EL_BDX_BITER_UP,
+ EL_BDX_BITER_LEFT,
+ EL_BDX_BITER_DOWN,
+ EL_BDX_BLADDER,
+ EL_BDX_NUT,
EL_EMC_MAGIC_BALL,
EL_EMC_ANDROID,
EL_MM_GRAY_BALL,
EL_EMC_MAGIC_BALL,
EL_EMC_ANDROID,
EL_MM_GRAY_BALL,
@@
-4610,8
+4611,8
@@
void InitElementPropertiesStatic(void)
static int ep_editor_cascade_active[] =
{
EL_INTERNAL_CASCADE_BD_ACTIVE,
static int ep_editor_cascade_active[] =
{
EL_INTERNAL_CASCADE_BD_ACTIVE,
- EL_INTERNAL_CASCADE_BD
_NATIVE
_ACTIVE,
- EL_INTERNAL_CASCADE_BD_EFFECTS_ACTIVE,
+ EL_INTERNAL_CASCADE_BD
X
_ACTIVE,
+ EL_INTERNAL_CASCADE_BD
X
_EFFECTS_ACTIVE,
EL_INTERNAL_CASCADE_EM_ACTIVE,
EL_INTERNAL_CASCADE_EMC_ACTIVE,
EL_INTERNAL_CASCADE_RND_ACTIVE,
EL_INTERNAL_CASCADE_EM_ACTIVE,
EL_INTERNAL_CASCADE_EMC_ACTIVE,
EL_INTERNAL_CASCADE_RND_ACTIVE,
@@
-4636,8
+4637,8
@@
void InitElementPropertiesStatic(void)
static int ep_editor_cascade_inactive[] =
{
EL_INTERNAL_CASCADE_BD,
static int ep_editor_cascade_inactive[] =
{
EL_INTERNAL_CASCADE_BD,
- EL_INTERNAL_CASCADE_BD
_NATIVE
,
- EL_INTERNAL_CASCADE_BD_EFFECTS,
+ EL_INTERNAL_CASCADE_BD
X
,
+ EL_INTERNAL_CASCADE_BD
X
_EFFECTS,
EL_INTERNAL_CASCADE_EM,
EL_INTERNAL_CASCADE_EMC,
EL_INTERNAL_CASCADE_RND,
EL_INTERNAL_CASCADE_EM,
EL_INTERNAL_CASCADE_EMC,
EL_INTERNAL_CASCADE_RND,