projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020321-1-src
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index 5dbf9df02a21b95923757ebeff666a09bc1c15a7..2acc4c9453c5fa649aa42c2fb4f8c1a8078bf1f8 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-693,7
+693,7
@@
void InitGame()
/* dynamically adjust element properties according to game engine version */
{
/* dynamically adjust element properties according to game engine version */
{
- static int ep_
slippery
[] =
+ static int ep_
em_slippery_wall
[] =
{
EL_BETON,
EL_MAUERWERK,
{
EL_BETON,
EL_MAUERWERK,
@@
-702,14
+702,30
@@
void InitGame()
EL_MAUER_Y,
EL_MAUER_XY
};
EL_MAUER_Y,
EL_MAUER_XY
};
- static int ep_slippery_num = sizeof(ep_slippery)/sizeof(int);
+#if 1
+ static int ep_em_slippery_wall_num = SIZEOF_ARRAY_INT(ep_em_slippery_wall);
+#else
+ static int ep_em_slippery_wall_num =
+ sizeof(ep_em_slippery_wall) / sizeof(int);
+#endif
- for (i=0; i<ep_slippery_num; i++)
+ /*
+ printf("level %d: game.version == %06d\n", level_nr, level.game_version);
+ printf(" file_version == %06d\n", level.file_version);
+ */
+
+ for (i=0; i<ep_em_slippery_wall_num; i++)
{
{
+#if 1
+ if (level.em_slippery_gems) /* special EM style gems behaviour */
+#else
if (game.version >= GAME_VERSION_2_0)
if (game.version >= GAME_VERSION_2_0)
- Elementeigenschaften2[ep_slippery[i]] |= EP_BIT_SLIPPERY_GEMS;
+#endif
+ Elementeigenschaften2[ep_em_slippery_wall[i]] |=
+ EP_BIT_EM_SLIPPERY_WALL;
else
else
- Elementeigenschaften2[ep_slippery[i]] &= ~EP_BIT_SLIPPERY_GEMS;
+ Elementeigenschaften2[ep_em_slippery_wall[i]] &=
+ ~EP_BIT_EM_SLIPPERY_WALL;
}
}
}
}
@@
-2626,7
+2642,7
@@
void StartMoving(int x, int y)
#endif
#else
else if ((IS_SLIPPERY(Feld[x][y+1]) ||
#endif
#else
else if ((IS_SLIPPERY(Feld[x][y+1]) ||
- (IS_
SLIPPERY_GEMS
(Feld[x][y+1]) && IS_GEM(element))) &&
+ (IS_
EM_SLIPPERY_WALL
(Feld[x][y+1]) && IS_GEM(element))) &&
!IS_FALLING(x, y+1) && !JustStopped[x][y+1] &&
element != EL_DX_SUPABOMB && element != EL_SP_DISK_ORANGE)
#endif
!IS_FALLING(x, y+1) && !JustStopped[x][y+1] &&
element != EL_DX_SUPABOMB && element != EL_SP_DISK_ORANGE)
#endif