X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_mm%2Fmm_game.c;h=be1bfad64051591d5fc725f781c1064269ef04b6;hb=07a0f43d96ff82b3254cfe4c6fcec5fe769d6e20;hp=0aaaaddaa3e84da2e47e99eff4416dcb81300fec;hpb=c831745a2a0a43f22bf26b8217714d43cb8c8cbc;p=rocksndiamonds.git diff --git a/src/game_mm/mm_game.c b/src/game_mm/mm_game.c index 0aaaadda..be1bfad6 100644 --- a/src/game_mm/mm_game.c +++ b/src/game_mm/mm_game.c @@ -1073,9 +1073,13 @@ static void ScanLaser(void) 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) + // laser next step position + int x = cSX + LX + XS; + int y = cSY + LY + YS; + + // check if next step of laser is still inside visible playfield area + if (x >= REAL_SX && x < REAL_SX + FULL_SXSIZE && + y >= REAL_SY && y < REAL_SY + FULL_SYSIZE) { // go on with another step LX += XS; @@ -1688,6 +1692,7 @@ static boolean HitElement(int element, int hit_mask) IS_POLAR_CROSS(element) || IS_DF_MIRROR(element) || IS_DF_MIRROR_AUTO(element) || + IS_DF_MIRROR_FIXED(element) || element == EL_PRISM || element == EL_REFRACTOR) { @@ -1706,7 +1711,8 @@ static boolean HitElement(int element, int hit_mask) if (IS_MIRROR(element) || IS_MIRROR_FIXED(element) || IS_DF_MIRROR(element) || - IS_DF_MIRROR_AUTO(element)) + IS_DF_MIRROR_AUTO(element) || + IS_DF_MIRROR_FIXED(element)) laser.current_angle = get_mirrored_angle(laser.current_angle, get_element_angle(element));