projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed preprocessor constant for game element in MM engine
[rocksndiamonds.git]
/
src
/
game_mm
/
mm_game.c
diff --git
a/src/game_mm/mm_game.c
b/src/game_mm/mm_game.c
index 2713e32092363f71e80cc2db49f09fb78f627433..9629e20cd620b32b4704a33fec529397c11836c6 100644
(file)
--- a/
src/game_mm/mm_game.c
+++ b/
src/game_mm/mm_game.c
@@
-960,9
+960,9
@@
static void DeactivateLaserTargetElement(void)
if (Tile[x][y] == element)
Tile[x][y] = (element == EL_BOMB_ACTIVE ? EL_BOMB :
if (Tile[x][y] == element)
Tile[x][y] = (element == EL_BOMB_ACTIVE ? EL_BOMB :
- element == EL_MINE_ACTIVE ? EL_MINE : EL_
BALL_GRAY
);
+ element == EL_MINE_ACTIVE ? EL_MINE : EL_
GRAY_BALL
);
- if (Tile[x][y] == EL_
BALL_GRAY
)
+ if (Tile[x][y] == EL_
GRAY_BALL
)
MovDelay[x][y] = 0;
laser.dest_element_last = EL_EMPTY;
MovDelay[x][y] = 0;
laser.dest_element_last = EL_EMPTY;
@@
-1669,7
+1669,7
@@
boolean HitElement(int element, int hit_mask)
return TRUE;
}
return TRUE;
}
- if (element == EL_BOMB || element == EL_MINE || element == EL_
BALL_GRAY
)
+ if (element == EL_BOMB || element == EL_MINE || element == EL_
GRAY_BALL
)
{
PlayLevelSound_MM(ELX, ELY, element, MM_ACTION_HITTING);
{
PlayLevelSound_MM(ELX, ELY, element, MM_ACTION_HITTING);
@@
-2491,7
+2491,7
@@
static void OpenSurpriseBall(int x, int y)
BlitBitmap(drawto, bitmap_db_field, cSX + x * TILEX, cSY + y * TILEY,
TILEX, TILEY, x * TILEX, y * TILEY);
BlitBitmap(drawto, bitmap_db_field, cSX + x * TILEX, cSY + y * TILEY,
TILEX, TILEY, x * TILEX, y * TILEY);
- DrawElement_MM(x, y, EL_
BALL_GRAY
);
+ DrawElement_MM(x, y, EL_
GRAY_BALL
);
}
MovDelay[x][y] = 50 * delay;
}
MovDelay[x][y] = 50 * delay;
@@
-3406,7
+3406,7
@@
static void GameActions_MM_Ext(void)
element != EL_BOMB_ACTIVE &&
element != EL_MINE &&
element != EL_MINE_ACTIVE &&
element != EL_BOMB_ACTIVE &&
element != EL_MINE &&
element != EL_MINE_ACTIVE &&
- element != EL_
BALL_GRAY
&&
+ element != EL_
GRAY_BALL
&&
element != EL_GRAY_BALL_ACTIVE &&
element != EL_BLOCK_STONE &&
element != EL_BLOCK_WOOD &&
element != EL_GRAY_BALL_ACTIVE &&
element != EL_BLOCK_STONE &&
element != EL_BLOCK_WOOD &&
@@
-3512,7
+3512,7
@@
static void GameActions_MM_Ext(void)
DrawGraphic_MM(ELX, ELY, IMG_MM_FUSE);
}
DrawGraphic_MM(ELX, ELY, IMG_MM_FUSE);
}
- if (element == EL_
BALL_GRAY
&& CT > native_mm_level.time_ball)
+ if (element == EL_
GRAY_BALL
&& CT > native_mm_level.time_ball)
{
if (!Store2[ELX][ELY]) // check if content element not yet determined
{
{
if (!Store2[ELX][ELY]) // check if content element not yet determined
{