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

Code cleanup

This commit is contained in:
Ahmed Samy 2014-01-06 14:35:37 +02:00
parent 6db2458c1d
commit edf17a44ca
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/client/thingtypemanager.cpp
View File

@ -227,30 +227,29 @@ void ThingTypeManager::loadXml(const std::string& file)
}
}
void ThingTypeManager::parseItemType(uint16 id, TiXmlElement* elem)
void ThingTypeManager::parseItemType(uint16 serverId, TiXmlElement* elem)
{
uint16 serverId = id;
ItemTypePtr itemType = nullptr;
bool s;
int d;
if(g_game.getProtocolVersion() < 960) {
if(serverId > 20000 && serverId < 20100) {
serverId -= 20000;
itemType = ItemTypePtr(new ItemType);
itemType->setServerId(serverId);
addItemType(itemType);
} else
itemType = getItemType(serverId);
s = serverId > 20000 && serverId < 20100;
d = 20000;
} else {
if(serverId > 30000 && serverId < 30100) {
serverId -= 30000;
itemType = ItemTypePtr(new ItemType);
itemType->setServerId(serverId);
addItemType(itemType);
} else
itemType = getItemType(serverId);
s = serverId > 30000 && serverId < 30100;
d = 30000;
}
if(s) {
serverId -= d;
itemType = ItemTypePtr(new ItemType);
itemType->setServerId(serverId);
addItemType(itemType);
} else
itemType = getItemType(serverId);
itemType->setName(elem->Attribute("name"));
for(TiXmlElement* attrib = elem->FirstChildElement(); attrib; attrib = attrib->NextSiblingElement()) {
std::string key = attrib->Attribute("key");