X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_mm%2Fmm_game.c;h=0aaaaddaa3e84da2e47e99eff4416dcb81300fec;hb=c831745a2a0a43f22bf26b8217714d43cb8c8cbc;hp=c5cfa1d562c738c32adbd5c5d6ec84cdc8d8c61b;hpb=b66bf285376f1a2c08ba8f7624fa48ffbcd898a9;p=rocksndiamonds.git diff --git a/src/game_mm/mm_game.c b/src/game_mm/mm_game.c index c5cfa1d5..0aaaadda 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); @@ -829,10 +828,12 @@ 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) + // check if laser is still inside visible playfield area (or inside level) + 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 +881,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_RECTANGLE; + else if (IS_RECTANGLE(element)) return MM_MASK_RECTANGLE; else return MM_MASK_CIRCLE; @@ -968,6 +971,7 @@ static int ScanPixel(void) } else { + // check if laser is still inside visible playfield area pixel = (cSX + px < REAL_SX || cSX + px >= REAL_SX + FULL_SXSIZE || cSY + py < REAL_SY || cSY + py >= REAL_SY + FULL_SYSIZE); } @@ -1059,16 +1063,27 @@ 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)) { + // check if laser is still inside visible playfield area + if (cSX + LX >= REAL_SX && cSX + LX < REAL_SX + FULL_SXSIZE && + cSY + LY >= REAL_SY && cSY + LY < REAL_SY + FULL_SYSIZE) + { + // go on with another step + LX += XS; + LY += YS; + + continue; + } + element = EL_EMPTY; laser.dest_element = element; @@ -2884,26 +2899,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 +2968,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]) && @@ -3088,29 +3105,25 @@ boolean ClickElement(int x, int y, int button) } else if (IS_MCDUFFIN(element)) { - if (!laser.fuse_off) - { - DrawLaser(0, DL_LASER_DISABLED); + boolean has_laser = (x == laser.start_edge.x && y == laser.start_edge.y); - /* - BackToFront(); - */ - } + if (has_laser && !laser.fuse_off) + DrawLaser(0, DL_LASER_DISABLED); element = get_rotated_element(element, BUTTON_ROTATION(button)); - laser.start_angle = get_element_angle(element); - - InitLaser(); Tile[x][y] = element; DrawField_MM(x, y); - /* - BackToFront(); - */ + if (has_laser) + { + laser.start_angle = get_element_angle(element); - if (!laser.fuse_off) - ScanLaser(); + InitLaser(); + + if (!laser.fuse_off) + ScanLaser(); + } element_clicked = TRUE; } @@ -3277,7 +3290,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; + } } } } @@ -3890,35 +3907,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]; @@ -3927,7 +3915,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]; } @@ -3944,13 +3932,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; }