projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a3195af
)
replaced expressions using preprocessor definitions
author
Holger Schemel
<info@artsoft.org>
Fri, 24 Feb 2023 17:32:09 +0000
(18:32 +0100)
committer
Holger Schemel
<info@artsoft.org>
Fri, 24 Feb 2023 17:32:09 +0000
(18:32 +0100)
src/game_mm/mm_game.c
patch
|
blob
|
history
diff --git
a/src/game_mm/mm_game.c
b/src/game_mm/mm_game.c
index de372a864479b3d1c9c072f3db57f32e5e7f06e9..d5ad417d31f126874f754a19b97a39e53926f554 100644
(file)
--- a/
src/game_mm/mm_game.c
+++ b/
src/game_mm/mm_game.c
@@
-2055,11
+2055,9
@@
static boolean HitBlock(int element, int hit_mask)
if (element == EL_GATE_STONE || element == EL_GATE_WOOD)
{
int xs = XS / 2, ys = YS / 2;
if (element == EL_GATE_STONE || element == EL_GATE_WOOD)
{
int xs = XS / 2, ys = YS / 2;
- int hit_mask_diagonal1 = HIT_MASK_TOPRIGHT | HIT_MASK_BOTTOMLEFT;
- int hit_mask_diagonal2 = HIT_MASK_TOPLEFT | HIT_MASK_BOTTOMRIGHT;
- if ((hit_mask &
hit_mask_diagonal1) == hit_mask_diagonal
1 ||
- (hit_mask &
hit_mask_diagonal2) == hit_mask_diagonal
2)
+ if ((hit_mask &
HIT_MASK_DIAGONAL_1) == HIT_MASK_DIAGONAL_
1 ||
+ (hit_mask &
HIT_MASK_DIAGONAL_2) == HIT_MASK_DIAGONAL_
2)
{
laser.overloaded = (element == EL_GATE_STONE);
{
laser.overloaded = (element == EL_GATE_STONE);
@@
-2098,11
+2096,9
@@
static boolean HitBlock(int element, int hit_mask)
if (element == EL_BLOCK_STONE || element == EL_BLOCK_WOOD)
{
int xs = XS / 2, ys = YS / 2;
if (element == EL_BLOCK_STONE || element == EL_BLOCK_WOOD)
{
int xs = XS / 2, ys = YS / 2;
- int hit_mask_diagonal1 = HIT_MASK_TOPRIGHT | HIT_MASK_BOTTOMLEFT;
- int hit_mask_diagonal2 = HIT_MASK_TOPLEFT | HIT_MASK_BOTTOMRIGHT;
- if ((hit_mask &
hit_mask_diagonal1) == hit_mask_diagonal
1 ||
- (hit_mask &
hit_mask_diagonal2) == hit_mask_diagonal
2)
+ if ((hit_mask &
HIT_MASK_DIAGONAL_1) == HIT_MASK_DIAGONAL_
1 ||
+ (hit_mask &
HIT_MASK_DIAGONAL_2) == HIT_MASK_DIAGONAL_
2)
{
laser.overloaded = (element == EL_BLOCK_STONE);
{
laser.overloaded = (element == EL_BLOCK_STONE);