Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/gameserver.cc')
-rw-r--r--src/core/gameserver.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/core/gameserver.cc b/src/core/gameserver.cc
index 09a0fff..963db6d 100644
--- a/src/core/gameserver.cc
+++ b/src/core/gameserver.cc
@@ -243,19 +243,15 @@ float GameServer::time() const
return ((float)(server_timestamp) / 1000.0f);
}
-Info *GameServer::info(unsigned int id)
+Info *GameServer::request_info(unsigned int id)
{
return Info::find(id);
}
-Info *GameServer::info(const std::string &type, const std::string &label)
+Inventory *GameServer::request_inventory(Entity *entity)
{
- // find the class
- InfoType *infotype = InfoType::find(type);
- if (!infotype)
- return 0;
+ return (entity ? entity->inventory() : 0);
- return Info::find(infotype, label);
}
void GameServer::abort()