X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_mm%2Fmm_game.c;h=c89a900830fa5f97adcf6228d5bd3982645a6e9c;hb=ad6c6f3b18cab93a4e4ce5a9dc7e462cef9ce405;hp=6162d7a0d16fa9f767d4a2fdd218326ed26a8a9d;hpb=d9854779a9f8bfcf09cfab5905c257da10c61e5f;p=rocksndiamonds.git diff --git a/src/game_mm/mm_game.c b/src/game_mm/mm_game.c index 6162d7a0..c89a9008 100644 --- a/src/game_mm/mm_game.c +++ b/src/game_mm/mm_game.c @@ -97,7 +97,6 @@ static void RaiseScoreElement_MM(int); static void RemoveMovingField_MM(int, int); static void InitMovingField_MM(int, int, int); static void ContinueMoving_MM(int, int); -static void Moving2Blocked_MM(int, int, int *, int *); static void AddLaserEdge(int, int); static void ScanLaser(void); @@ -140,10 +139,11 @@ 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_RECTANGLE 8 -#define MM_MASK_CIRCLE 9 +#define MM_MASK_GRID_CLOSED 8 +#define MM_MASK_RECTANGLE 9 +#define MM_MASK_CIRCLE 10 -#define NUM_MM_MASKS 10 +#define NUM_MM_MASKS 11 // element masks for scanning pixels of MM elements static const char mm_masks[NUM_MM_MASKS][16][16 + 1] = @@ -292,6 +292,24 @@ static const char mm_masks[NUM_MM_MASKS][16][16 + 1] = " XXX XXXX ", " XX XXXXX ", }, + { + " XXXXXX XXXXXX ", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + " XXXXXXXXXXXXXX ", + " XXXXXXXXXXXXXX ", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + "XXXXXXXXXXXXXXXX", + " XXXXXX XXXXXX ", + }, { "XXXXXXXXXXXXXXXX", "XXXXXXXXXXXXXXXX", @@ -829,10 +847,11 @@ static void GameOver_MM(int game_over_cause) static void AddLaserEdge(int lx, int ly) { - int clx = dSX + lx; - int cly = dSY + ly; + int full_sxsize = MAX(FULL_SXSIZE, lev_fieldx * TILEX); + int full_sysize = MAX(FULL_SYSIZE, lev_fieldy * TILEY); - if (clx < -2 || cly < -2 || clx >= SXSIZE + 2 || cly >= SYSIZE + 2) + if (cSX + lx < REAL_SX || cSX + lx >= REAL_SX + full_sxsize || + cSY + ly < REAL_SY || cSY + ly >= REAL_SY + full_sysize) { Warn("AddLaserEdge: out of bounds: %d, %d", lx, ly); @@ -880,11 +899,13 @@ static boolean StepBehind(void) static int getMaskFromElement(int element) { - if (IS_GRID(element)) - return MM_MASK_GRID_1 + get_element_phase(element); - else if (IS_MCDUFFIN(element)) + if (IS_MCDUFFIN(element)) return MM_MASK_MCDUFFIN_RIGHT + get_element_phase(element); - else if (IS_RECTANGLE(element) || 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; + else if (IS_RECTANGLE(element)) return MM_MASK_RECTANGLE; else return MM_MASK_CIRCLE; @@ -1059,15 +1080,15 @@ static void ScanLaser(void) #endif // hit something -- check out what it was - ELX = (LX + XS) / TILEX; - ELY = (LY + YS) / TILEY; + ELX = (LX + XS + TILEX) / TILEX - 1; // ...+TILEX...-1 to get correct + ELY = (LY + YS + TILEY) / TILEY - 1; // negative values! #if 0 Debug("game:mm:ScanLaser", "hit_mask (1) == '%x' (%d, %d) (%d, %d)", hit_mask, LX, LY, ELX, ELY); #endif - if (!IN_LEV_FIELD(ELX, ELY) || !IN_PIX_FIELD(LX, LY)) + if (!IN_LEV_FIELD(ELX, ELY)) { element = EL_EMPTY; laser.dest_element = element; @@ -2884,26 +2905,28 @@ static void TurnRound(int x, int y) int x, y; } move_xy[] = { - { 0, 0 }, - {-1, 0 }, - {+1, 0 }, - { 0, 0 }, - { 0, -1 }, - { 0, 0 }, { 0, 0 }, { 0, 0 }, - { 0, +1 } + { 0, 0 }, + { -1, 0 }, + { +1, 0 }, + { 0, 0 }, + { 0, -1 }, + { 0, 0 }, { 0, 0 }, { 0, 0 }, + { 0, +1 } }; static struct { int left, right, back; } turn[] = { - { 0, 0, 0 }, + { 0, 0, 0 }, { MV_DOWN, MV_UP, MV_RIGHT }, - { MV_UP, MV_DOWN, MV_LEFT }, - { 0, 0, 0 }, - { MV_LEFT, MV_RIGHT, MV_DOWN }, - { 0,0,0 }, { 0,0,0 }, { 0,0,0 }, - { MV_RIGHT, MV_LEFT, MV_UP } + { MV_UP, MV_DOWN, MV_LEFT }, + { 0, 0, 0 }, + { MV_LEFT, MV_RIGHT, MV_DOWN }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { 0, 0, 0 }, + { MV_RIGHT, MV_LEFT, MV_UP } }; int element = Tile[x][y]; @@ -2951,7 +2974,7 @@ static void StartMoving_MM(int x, int y) // now make next step - Moving2Blocked_MM(x, y, &newx, &newy); // get next screen position + Moving2Blocked(x, y, &newx, &newy); // get next screen position if (element == EL_PACMAN && IN_LEV_FIELD(newx, newy) && IS_EATABLE4PACMAN(Tile[newx][newy]) && @@ -3273,7 +3296,11 @@ static void AutoRotateMirrors(void) IS_GRID_WOOD_AUTO(element) || IS_GRID_STEEL_AUTO(element) || element == EL_REFRACTOR) + { RotateMirror(x, y, MB_RIGHTBUTTON); + + laser.redraw = TRUE; + } } } } @@ -3886,35 +3913,6 @@ static void InitMovingField_MM(int x, int y, int direction) Tile[newx][newy] = EL_BLOCKED; } -static void Moving2Blocked_MM(int x, int y, int *goes_to_x, int *goes_to_y) -{ - int direction = MovDir[x][y]; - int newx = x + (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0); - int newy = y + (direction == MV_UP ? -1 : direction == MV_DOWN ? +1 : 0); - - *goes_to_x = newx; - *goes_to_y = newy; -} - -static void Blocked2Moving_MM(int x, int y, - int *comes_from_x, int *comes_from_y) -{ - int oldx = x, oldy = y; - int direction = MovDir[x][y]; - - if (direction == MV_LEFT) - oldx++; - else if (direction == MV_RIGHT) - oldx--; - else if (direction == MV_UP) - oldy++; - else if (direction == MV_DOWN) - oldy--; - - *comes_from_x = oldx; - *comes_from_y = oldy; -} - static int MovingOrBlocked2Element_MM(int x, int y) { int element = Tile[x][y]; @@ -3923,7 +3921,7 @@ static int MovingOrBlocked2Element_MM(int x, int y) { int oldx, oldy; - Blocked2Moving_MM(x, y, &oldx, &oldy); + Blocked2Moving(x, y, &oldx, &oldy); return Tile[oldx][oldy]; } @@ -3940,13 +3938,13 @@ static void RemoveMovingField_MM(int x, int y) if (IS_MOVING(x, y)) { - Moving2Blocked_MM(x, y, &newx, &newy); + Moving2Blocked(x, y, &newx, &newy); if (Tile[newx][newy] != EL_BLOCKED) return; } else if (Tile[x][y] == EL_BLOCKED) { - Blocked2Moving_MM(x, y, &oldx, &oldy); + Blocked2Moving(x, y, &oldx, &oldy); if (!IS_MOVING(oldx, oldy)) return; }