gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/edubart/otclient

This commit is contained in:
Sam 2013-10-20 17:15:30 +02:00
parent 241b54262a 63ce68b449
commit 8230bf2af4
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/client/creatures.cpp
View File

@ -266,9 +266,8 @@ void CreatureManager::saveSpawns(const std::string& fileName)
root->LinkEndChild(elem); root->LinkEndChild(elem);
} }
std::string savePath = g_resources.getRealPath(fileName); if(!doc.SaveFile("data"+fileName))
if(!doc.SaveFile(savePath)) stdext::throw_exception(stdext::format("failed to save spawns XML %s: %s", fileName, doc.ErrorDesc()));
stdext::throw_exception(stdext::format("failed to save spawns XML %s: %s", savePath, doc.ErrorDesc()));
} catch(std::exception& e) { } catch(std::exception& e) {
g_logger.error(stdext::format("Failed to save '%s': %s", fileName, e.what())); g_logger.error(stdext::format("Failed to save '%s': %s", fileName, e.what()));
} }

5
src/client/houses.cpp
View File

@ -178,9 +178,8 @@ void HouseManager::save(const std::string& fileName)
root->LinkEndChild(elem); root->LinkEndChild(elem);
} }
std::string savePath = g_resources.getRealPath(fileName); if(!doc.SaveFile("data"+fileName))
if(!doc.SaveFile(savePath)) stdext::throw_exception(stdext::format("failed to save houses XML %s: %s", fileName, doc.ErrorDesc()));
stdext::throw_exception(stdext::format("failed to save houses XML %s: %s", savePath, doc.ErrorDesc()));
} catch(std::exception& e) { } catch(std::exception& e) {
g_logger.error(stdext::format("Failed to save '%s': %s", fileName, e.what())); g_logger.error(stdext::format("Failed to save '%s': %s", fileName, e.what()));
} }

2
src/client/mapio.cpp
View File

@ -137,6 +137,8 @@ void Map::loadOtbm(const std::string& fileName)
if((_flags & TILESTATE_REFRESH) == TILESTATE_REFRESH) if((_flags & TILESTATE_REFRESH) == TILESTATE_REFRESH)
flags |= TILESTATE_REFRESH; flags |= TILESTATE_REFRESH;
if((_flags & TILESTATE_HOUSE) == TILESTATE_HOUSE)
flags |= TILESTATE_HOUSE;
break; break;
} }
case OTBM_ATTR_ITEM: { case OTBM_ATTR_ITEM: {

2
src/client/tile.h
View File

@ -119,7 +119,7 @@ public:
void setHouseId(uint32 hid) { m_houseId = hid; } void setHouseId(uint32 hid) { m_houseId = hid; }
uint32 getHouseId() { return m_houseId; } uint32 getHouseId() { return m_houseId; }
bool isHouseTile() const { return (m_flags & TILESTATE_HOUSE) == TILESTATE_HOUSE; } bool isHouseTile() const { return m_houseId != 0 && (m_flags & TILESTATE_HOUSE) == TILESTATE_HOUSE; }
TilePtr asTile() { return static_self_cast<Tile>(); } TilePtr asTile() { return static_self_cast<Tile>(); }