Renamed some of Get() methods to Find(), read more

From now on, ideally any function with "get" in the name should always
return a valid value. A function with "find" in the name, however, does
the same thing, but may also return an invalid result such as an error
code.
This commit is contained in:
2016-04-03 02:17:02 +11:00
parent 3b24aae422
commit 957458d489
19 changed files with 63 additions and 63 deletions
+1 -1
View File
@@ -70,7 +70,7 @@ void CreatureManager::UnloadIf(std::function<bool(std::pair<const int, CreatureD
}
}
CreatureData* CreatureManager::Get(int uid) {
CreatureData* CreatureManager::Find(int uid) {
std::map<int, CreatureData>::iterator it = elementMap.find(uid);
if (it == elementMap.end()) {
+1 -1
View File
@@ -46,7 +46,7 @@ public:
void UnloadIf(std::function<bool(std::pair<const int, CreatureData const&>)> fn);
//accessors & mutators
CreatureData* Get(int uid);
CreatureData* Find(int uid);
int GetLoadedCount();
std::map<int, CreatureData>* GetContainer();
+4 -4
View File
@@ -31,7 +31,7 @@ static int create(lua_State* L) {
//create the actual creature
CreatureManager* mgr = static_cast<CreatureManager* const>(lua_touserdata(L, 1));
int index = mgr->Create(lua_tostring(L, 2), lua_tointeger(L, 3)); //3 should be the unique reference within LUA_REGISTRYINDEX
CreatureData* creature = mgr->Get(index);
CreatureData* creature = mgr->Find(index);
lua_pushlightuserdata(L, static_cast<void*>(creature));
lua_pushinteger(L, index);
return 2;
@@ -56,9 +56,9 @@ static int unloadIf(lua_State* L) {
return 0;
}
static int get(lua_State* L) {
static int find(lua_State* L) {
CreatureManager* mgr = static_cast<CreatureManager* const>(lua_touserdata(L, 1));
CreatureData* creature = mgr->Get(lua_tointeger(L, 2));
CreatureData* creature = mgr->Find(lua_tointeger(L, 2));
lua_pushlightuserdata(L, static_cast<void*>(creature));
return 1;
}
@@ -74,7 +74,7 @@ static const luaL_Reg creatureManagerLib[] = {
{"Unload", unload},
{"UnloadAll", unloadAll},
// {"UnloadIf", unloadIf},
{"Get", get},
{"Find", find},
{"GetLoadedCount", getLoadedCount},
{nullptr, nullptr}
};