Browse Source

Check that monsters aren't placed in doors

pull/3747/head
obligaron 4 years ago committed by Anders Jenbo
parent
commit
f58a42ca97
  1. 4
      Source/diablo.cpp
  2. 2
      Source/monster.cpp

4
Source/diablo.cpp

@ -1915,10 +1915,10 @@ void LoadGameLevel(bool firstflag, lvl_entry lvldir)
if (firstflag || lvldir == ENTRY_LOAD || !myPlayer._pLvlVisited[currlevel] || gbIsMultiplayer) { if (firstflag || lvldir == ENTRY_LOAD || !myPlayer._pLvlVisited[currlevel] || gbIsMultiplayer) {
HoldThemeRooms(); HoldThemeRooms();
[[maybe_unused]] uint32_t mid1Seed = GetLCGEngineState(); [[maybe_unused]] uint32_t mid1Seed = GetLCGEngineState();
InitMonsters(); InitObjects();
[[maybe_unused]] uint32_t mid2Seed = GetLCGEngineState(); [[maybe_unused]] uint32_t mid2Seed = GetLCGEngineState();
IncProgress(); IncProgress();
InitObjects(); InitMonsters();
InitItems(); InitItems();
if (currlevel < 17) if (currlevel < 17)
CreateThemeRooms(); CreateThemeRooms();

2
Source/monster.cpp

@ -266,7 +266,7 @@ bool CanPlaceMonster(int xp, int yp)
return false; return false;
} }
return !IsTileSolid({ xp, yp }); return !IsTileOccupied({ xp, yp });
} }
void PlaceMonster(int i, int mtype, int x, int y) void PlaceMonster(int i, int mtype, int x, int y)

Loading…
Cancel
Save