Rtch/Unuk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a few segmentation faults caused by assertion failures.

Browse Source
This commit is contained in:
Rtch90 2011-12-16 23:51:34 +00:00
parent e7bfbc3966
commit 389eac4ee7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Unuk/Player.cpp
View File

@ -81,7 +81,7 @@ void Player::SetCamera(void) {
void Player::Move() { void Player::Move() {
Character::Move(); Character::Move();
if(map->GetMapTransitionName(tileX, tileY) != "n") { if(map->GetMapTransitionName(tileX, tileY) != "null") {
SetXY(map->GetMapTransitionX(tileX, tileY), map->GetMapTransitionY(tileX, tileY)); SetXY(map->GetMapTransitionX(tileX, tileY), map->GetMapTransitionY(tileX, tileY));
map->Load(map->GetMapTransitionName(tileX, tileY)); map->Load(map->GetMapTransitionName(tileX, tileY));
} }

2
src/libUnuk/Map.cpp
View File

@ -92,7 +92,7 @@ void Map::Load(const string filename) {
// </solidEntity> // </solidEntity>
// <zlevel> // <zlevel>
dataElem = dataElem->NextSiblingElement("zlevel"); dataElem = dataElem->NextSiblingElement("zLevel");
assert(dataElem != NULL); assert(dataElem != NULL);
m_tile[x][y].SetZLevel(atoi(dataElem->GetText())); m_tile[x][y].SetZLevel(atoi(dataElem->GetText()));
// </zlevel> // </zlevel>