From 389eac4ee7922a73fef7d8c1dce5cb736405b255 Mon Sep 17 00:00:00 2001 From: Rtch90 Date: Fri, 16 Dec 2011 23:51:34 +0000 Subject: [PATCH] Fixed a few segmentation faults caused by assertion failures. --- src/Unuk/Player.cpp | 2 +- src/libUnuk/Map.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Unuk/Player.cpp b/src/Unuk/Player.cpp index bc5d34f..fbc9b3b 100644 --- a/src/Unuk/Player.cpp +++ b/src/Unuk/Player.cpp @@ -81,7 +81,7 @@ void Player::SetCamera(void) { void Player::Move() { Character::Move(); - if(map->GetMapTransitionName(tileX, tileY) != "n") { + if(map->GetMapTransitionName(tileX, tileY) != "null") { SetXY(map->GetMapTransitionX(tileX, tileY), map->GetMapTransitionY(tileX, tileY)); map->Load(map->GetMapTransitionName(tileX, tileY)); } diff --git a/src/libUnuk/Map.cpp b/src/libUnuk/Map.cpp index 5a3a187..b4b8047 100644 --- a/src/libUnuk/Map.cpp +++ b/src/libUnuk/Map.cpp @@ -92,7 +92,7 @@ void Map::Load(const string filename) { // // - dataElem = dataElem->NextSiblingElement("zlevel"); + dataElem = dataElem->NextSiblingElement("zLevel"); assert(dataElem != NULL); m_tile[x][y].SetZLevel(atoi(dataElem->GetText())); //