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

Remove old useless functions.

This commit is contained in:
otfallen 2012-09-02 19:31:50 +00:00
parent c9688551f3
commit d429e385bb
4 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/otclient/luafunctions.cpp
View File

@ -63,7 +63,6 @@ void OTClient::registerLuaFunctions()
g_lua.bindSingletonFunction("g_things", "findItemTypeByClientId", &ThingTypeManager::findItemTypeByClientId, &g_things); g_lua.bindSingletonFunction("g_things", "findItemTypeByClientId", &ThingTypeManager::findItemTypeByClientId, &g_things);
g_lua.bindSingletonFunction("g_things", "findThingTypeByAttr", &ThingTypeManager::findThingTypeByAttr, &g_things); g_lua.bindSingletonFunction("g_things", "findThingTypeByAttr", &ThingTypeManager::findThingTypeByAttr, &g_things);
g_lua.bindSingletonFunction("g_things", "findItemTypeByCategory", &ThingTypeManager::findItemTypeByCategory, &g_things); g_lua.bindSingletonFunction("g_things", "findItemTypeByCategory", &ThingTypeManager::findItemTypeByCategory, &g_things);
g_lua.bindSingletonFunction("g_things", "castThingToCreature", &ThingTypeManager::castThingToCreature, &g_things);
#if 0 #if 0
g_lua.registerSingletonClass("g_houses"); g_lua.registerSingletonClass("g_houses");

5
src/otclient/map.h
View File

@ -102,21 +102,18 @@ public:
tile = TilePtr(new Tile(pos)); tile = TilePtr(new Tile(pos));
return tile; return tile;
} }
const TilePtr& getOrCreate(const Position& pos) { const TilePtr& getOrCreate(const Position& pos) {
TilePtr& tile = m_tiles[getTileIndex(pos)]; TilePtr& tile = m_tiles[getTileIndex(pos)];
if(!tile) if(!tile)
tile = TilePtr(new Tile(pos)); tile = TilePtr(new Tile(pos));
return tile; return tile;
} }
const TilePtr& get(const Position& pos) { return m_tiles[getTileIndex(pos)]; } const TilePtr& get(const Position& pos) { return m_tiles[getTileIndex(pos)]; }
void remove(const Position& pos) { m_tiles[getTileIndex(pos)] = nullptr; } void remove(const Position& pos) { m_tiles[getTileIndex(pos)] = nullptr; }
uint getTileIndex(const Position& pos) { return ((pos.y % BLOCK_SIZE) * BLOCK_SIZE) + (pos.x % BLOCK_SIZE); } uint getTileIndex(const Position& pos) { return ((pos.y % BLOCK_SIZE) * BLOCK_SIZE) + (pos.x % BLOCK_SIZE); }
const std::array<TilePtr, BLOCK_SIZE*BLOCK_SIZE> getTiles() const { return m_tiles; } const std::array<TilePtr, BLOCK_SIZE*BLOCK_SIZE>& getTiles() const { return m_tiles; }
private: private:
std::array<TilePtr, BLOCK_SIZE*BLOCK_SIZE> m_tiles; std::array<TilePtr, BLOCK_SIZE*BLOCK_SIZE> m_tiles;

23
src/otclient/thingtypemanager.cpp
View File

@ -272,29 +272,6 @@ const ItemTypePtr& ThingTypeManager::getItemType(uint16 id)
return m_itemTypes[id]; return m_itemTypes[id];
} }
CreaturePtr ThingTypeManager::castThingToCreature(const ThingTypePtr& thing)
{
if(!thing)
return nullptr;
if(thing->getCategory() != ThingCategoryCreature)
stdext::throw_exception("Thing type is not a creature");
uint16 clientId = thing->getId();
CreaturePtr ret(new Creature);
CreatureTypePtr cType = g_creatures.getCreatureByLook(clientId);
if(!cType) {
// a creature can have a look item with whether client id or even server id
const ItemTypePtr& item = findItemTypeByClientId(clientId);
if(item && !(cType = g_creatures.getCreatureByLook(item->getServerId())))
stdext::throw_exception(stdext::format("failed to find creature with look type/item %hd", item->getServerId()));
}
ret->setName(cType->getName());
ret->setOutfit(cType->getOutfit());
return ret;
}
ThingTypeList ThingTypeManager::findThingTypeByAttr(ThingAttr attr, ThingCategory category) ThingTypeList ThingTypeManager::findThingTypeByAttr(ThingAttr attr, ThingCategory category)
{ {
ThingTypeList ret; ThingTypeList ret;

1
src/otclient/thingtypemanager.h
View File

@ -50,7 +50,6 @@ public:
const ItemTypePtr& getItemType(uint16 id); const ItemTypePtr& getItemType(uint16 id);
ThingType* rawGetThingType(uint16 id, ThingCategory category) { return m_thingTypes[category][id].get(); } ThingType* rawGetThingType(uint16 id, ThingCategory category) { return m_thingTypes[category][id].get(); }
ItemType* rawGetItemType(uint16 id) { return m_itemTypes[id].get(); } ItemType* rawGetItemType(uint16 id) { return m_itemTypes[id].get(); }
CreaturePtr castThingToCreature(const ThingTypePtr& thing);
ThingTypeList findThingTypeByAttr(ThingAttr attr, ThingCategory category); ThingTypeList findThingTypeByAttr(ThingAttr attr, ThingCategory category);
ItemTypeList findItemTypeByCategory(ItemCategory category); ItemTypeList findItemTypeByCategory(ItemCategory category);