projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ad6c6f3
)
fixed scanning laser outside level, but inside visible playfield area
author
Holger Schemel
<info@artsoft.org>
Fri, 7 Apr 2023 10:53:26 +0000
(12:53 +0200)
committer
Holger Schemel
<info@artsoft.org>
Fri, 7 Apr 2023 10:53:26 +0000
(12:53 +0200)
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 c89a900830fa5f97adcf6228d5bd3982645a6e9c..09fa1d04a5a58fa162d416b330fc0d96f6b4f422 100644
(file)
--- a/
src/game_mm/mm_game.c
+++ b/
src/game_mm/mm_game.c
@@
-850,6
+850,7
@@
static void AddLaserEdge(int lx, int ly)
int full_sxsize = MAX(FULL_SXSIZE, lev_fieldx * TILEX);
int full_sysize = MAX(FULL_SYSIZE, lev_fieldy * TILEY);
int full_sxsize = MAX(FULL_SXSIZE, lev_fieldx * TILEX);
int full_sysize = MAX(FULL_SYSIZE, lev_fieldy * TILEY);
+ // 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)
{
if (cSX + lx < REAL_SX || cSX + lx >= REAL_SX + full_sxsize ||
cSY + ly < REAL_SY || cSY + ly >= REAL_SY + full_sysize)
{
@@
-989,6
+990,7
@@
static int ScanPixel(void)
}
else
{
}
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);
}
pixel = (cSX + px < REAL_SX || cSX + px >= REAL_SX + FULL_SXSIZE ||
cSY + py < REAL_SY || cSY + py >= REAL_SY + FULL_SYSIZE);
}
@@
-1090,6
+1092,17
@@
static void ScanLaser(void)
if (!IN_LEV_FIELD(ELX, ELY))
{
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;
element = EL_EMPTY;
laser.dest_element = element;