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

Disregard progressbar

This commit is contained in:
Allan Ference 2013-08-09 17:35:56 +02:00
parent 914fe249ab
commit 1ea2b380ca
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/map.h
View File

@ -144,8 +144,8 @@ public:
bool loadOtcm(const std::string& fileName); bool loadOtcm(const std::string& fileName);
void saveOtcm(const std::string& fileName); void saveOtcm(const std::string& fileName);
void loadOtbm(const std::string& fileName, const UIWidgetPtr& pbar = 0); void loadOtbm(const std::string& fileName);
void saveOtbm(const std::string& fileName, const UIWidgetPtr& pbar = 0); void saveOtbm(const std::string& fileName);
// otbm attributes (description, size, etc.) // otbm attributes (description, size, etc.)
void setHouseFile(const std::string& file) { m_attribs.set(OTBM_ATTR_HOUSE_FILE, file); } void setHouseFile(const std::string& file) { m_attribs.set(OTBM_ATTR_HOUSE_FILE, file); }

8
src/client/mapio.cpp
View File

@ -32,7 +32,7 @@
#include <framework/xml/tinyxml.h> #include <framework/xml/tinyxml.h>
#include <framework/ui/uiwidget.h> #include <framework/ui/uiwidget.h>
void Map::loadOtbm(const std::string& fileName, const UIWidgetPtr& pbar) void Map::loadOtbm(const std::string& fileName)
{ {
FileStreamPtr fin = g_resources.openFile(fileName); FileStreamPtr fin = g_resources.openFile(fileName);
if(!fin) if(!fin)
@ -94,7 +94,6 @@ void Map::loadOtbm(const std::string& fileName, const UIWidgetPtr& pbar)
for(const BinaryTreePtr& nodeMapData : node->getChildren()) { for(const BinaryTreePtr& nodeMapData : node->getChildren()) {
uint8 mapDataType = nodeMapData->getU8(); uint8 mapDataType = nodeMapData->getU8();
if(mapDataType == OTBM_TILE_AREA) { if(mapDataType == OTBM_TILE_AREA) {
Position basePos; Position basePos;
basePos.x = nodeMapData->getU16(); basePos.x = nodeMapData->getU16();
basePos.y = nodeMapData->getU16(); basePos.y = nodeMapData->getU16();
@ -121,7 +120,7 @@ void Map::loadOtbm(const std::string& fileName, const UIWidgetPtr& pbar)
while(nodeTile->canRead()) { while(nodeTile->canRead()) {
uint8 tileAttr = nodeTile->getU8(); uint8 tileAttr = nodeTile->getU8();
switch (tileAttr) { switch(tileAttr) {
case OTBM_ATTR_TILE_FLAGS: { case OTBM_ATTR_TILE_FLAGS: {
uint32 _flags = nodeTile->getU32(); uint32 _flags = nodeTile->getU32();
if((_flags & TILESTATE_PROTECTIONZONE) == TILESTATE_PROTECTIONZONE) if((_flags & TILESTATE_PROTECTIONZONE) == TILESTATE_PROTECTIONZONE)
@ -180,7 +179,6 @@ void Map::loadOtbm(const std::string& fileName, const UIWidgetPtr& pbar)
if(house) if(house)
tile->setHouseId(house->getId()); tile->setHouseId(house->getId());
tile->setFlags((tileflags_t)flags); tile->setFlags((tileflags_t)flags);
//if(!(++pbarvalue % 8192) && pbar);
} }
} }
} else if(mapDataType == OTBM_TOWNS) { } else if(mapDataType == OTBM_TOWNS) {
@ -224,7 +222,7 @@ void Map::loadOtbm(const std::string& fileName, const UIWidgetPtr& pbar)
fin->close(); fin->close();
} }
void Map::saveOtbm(const std::string& fileName, const UIWidgetPtr&/* pbar*/) void Map::saveOtbm(const std::string& fileName)
{ {
FileStreamPtr fin = g_resources.createFile(fileName); FileStreamPtr fin = g_resources.createFile(fileName);
if(!fin) if(!fin)