projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed bug with laser passing between two diagonally placed DF polarizers
[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 09fa1d04a5a58fa162d416b330fc0d96f6b4f422..0aaaaddaa3e84da2e47e99eff4416dcb81300fec 100644
(file)
--- a/
src/game_mm/mm_game.c
+++ b/
src/game_mm/mm_game.c
@@
-139,11
+139,10
@@
static DelayCounter overload_delay = { 0 };
#define MM_MASK_GRID_2 5
#define MM_MASK_GRID_3 6
#define MM_MASK_GRID_4 7
#define MM_MASK_GRID_2 5
#define MM_MASK_GRID_3 6
#define MM_MASK_GRID_4 7
-#define MM_MASK_GRID_CLOSED 8
-#define MM_MASK_RECTANGLE 9
-#define MM_MASK_CIRCLE 10
+#define MM_MASK_RECTANGLE 8
+#define MM_MASK_CIRCLE 9
-#define NUM_MM_MASKS 1
1
+#define NUM_MM_MASKS 1
0
// element masks for scanning pixels of MM elements
static const char mm_masks[NUM_MM_MASKS][16][16 + 1] =
// element masks for scanning pixels of MM elements
static const char mm_masks[NUM_MM_MASKS][16][16 + 1] =
@@
-292,24
+291,6
@@
static const char mm_masks[NUM_MM_MASKS][16][16 + 1] =
" XXX XXXX ",
" XX XXXXX ",
},
" XXX XXXX ",
" XX XXXXX ",
},
- {
- " XXXXXX XXXXXX ",
- "XXXXXXXXXXXXXXXX",
- "XXXXXXXXXXXXXXXX",
- "XXXXXXXXXXXXXXXX",
- "XXXXXXXXXXXXXXXX",
- "XXXXXXXXXXXXXXXX",
- "XXXXXXXXXXXXXXXX",
- " XXXXXXXXXXXXXX ",
- " XXXXXXXXXXXXXX ",
- "XXXXXXXXXXXXXXXX",
- "XXXXXXXXXXXXXXXX",
- "XXXXXXXXXXXXXXXX",
- "XXXXXXXXXXXXXXXX",
- "XXXXXXXXXXXXXXXX",
- "XXXXXXXXXXXXXXXX",
- " XXXXXX XXXXXX ",
- },
{
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
{
"XXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXX",
@@
-905,7
+886,7
@@
static int getMaskFromElement(int element)
else if (IS_GRID(element))
return MM_MASK_GRID_1 + get_element_phase(element);
else if (IS_DF_GRID(element))
else if (IS_GRID(element))
return MM_MASK_GRID_1 + get_element_phase(element);
else if (IS_DF_GRID(element))
- return MM_MASK_
GRID_CLOSED
;
+ return MM_MASK_
RECTANGLE
;
else if (IS_RECTANGLE(element))
return MM_MASK_RECTANGLE;
else
else if (IS_RECTANGLE(element))
return MM_MASK_RECTANGLE;
else