MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

apply bounds check function

Browse source
This commit is contained in:
qndel 2021-10-11 15:59:46 +02:00 • committed by Anders Jenbo
commit f8cda02456
5 changed files with 19 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/scrollrt.cpp
View file

@ -818,8 +818,7 @@ void DrawPlayerHelper(const Surface &out, Point tilePosition, Point targetBuffer
*/
void DrawDungeon(const Surface &out, Point tilePosition, Point targetBufferPosition)
{
assert(tilePosition.x >= 0 && tilePosition.x < MAXDUNX);
assert(tilePosition.y >= 0 && tilePosition.y < MAXDUNY);
assert(InDungeonBounds(tilePosition));
if (dRendered[tilePosition.x][tilePosition.y])
return;
@ -972,7 +971,7 @@ void DrawTileContent(const Surface &out, Point tilePosition, Point targetBufferP
for (int i = 0; i < rows; i++) {
for (int j = 0; j < columns; j++) {
if (tilePosition.x >= 0 && tilePosition.x < MAXDUNX && tilePosition.y >= 0 && tilePosition.y < MAXDUNY) {
if (InDungeonBounds(tilePosition)) {
if (tilePosition.x + 1 < MAXDUNX && tilePosition.y - 1 >= 0 && targetBufferPosition.x + TILE_WIDTH <= gnScreenWidth) {
// Render objects behind walls first to prevent sprites, that are moving
// between tiles, from poking through the walls as they exceed the tile bounds.