diff --git a/Source/Contents/AdventureGuideMgr.cpp b/Source/Contents/AdventureGuideMgr.cpp index 00da59553..117a97471 100644 --- a/Source/Contents/AdventureGuideMgr.cpp +++ b/Source/Contents/AdventureGuideMgr.cpp @@ -120,16 +120,17 @@ int InsertEpisode(lua_State* state) { const int id = static_cast(lua_tonumber(state, -3)); const std::string name = lua_tostring(state, -2); const std::string text = lua_tostring(state, -1); - const AdventureGuideResult result = g_adventureGuideMgr->InsertGuideMenu(1, id, name, text); + CAdventureGuideMgr* const manager = g_adventureGuideMgr; + const AdventureGuideResult result = manager->InsertGuideMenu(1, id, name, text); if (!result.ok) { lua_pushboolean(state, 0); lua_pushstring(state, FormatString("InsertEpisode : %s", result.message.c_str())); - } else { - lua_pushboolean(state, 1); - lua_pushstring(state, "good"); + return 2; } + lua_pushboolean(state, 1); + lua_pushstring(state, "good"); return 2; } @@ -310,16 +311,17 @@ int InsertMonster(lua_State* state) { const int id = static_cast(lua_tonumber(state, -3)); const std::string name = lua_tostring(state, -2); const std::string text = lua_tostring(state, -1); - const AdventureGuideResult result = g_adventureGuideMgr->InsertGuideMenu(2, id, name, text); + CAdventureGuideMgr* const manager = g_adventureGuideMgr; + const AdventureGuideResult result = manager->InsertGuideMenu(2, id, name, text); if (!result.ok) { lua_pushboolean(state, 0); lua_pushstring(state, FormatString("InsertMonster : %s", result.message.c_str())); - } else { - lua_pushboolean(state, 1); - lua_pushstring(state, "good"); + return 2; } + lua_pushboolean(state, 1); + lua_pushstring(state, "good"); return 2; } @@ -347,16 +349,17 @@ int InsertMonsterContents(lua_State* state) { const std::string name = lua_tostring(state, -3); const int minLevel = static_cast(lua_tonumber(state, -2)); const int maxLevel = static_cast(lua_tonumber(state, -1)); - const AdventureGuideResult result = g_adventureGuideMgr->InsertMonsterContents(name, minLevel, maxLevel); + CAdventureGuideMgr* const manager = g_adventureGuideMgr; + const AdventureGuideResult result = manager->InsertMonsterContents(name, minLevel, maxLevel); if (!result.ok) { lua_pushboolean(state, 0); lua_pushstring(state, FormatString("InsertMonsterContents : %s", result.message.c_str())); - } else { - lua_pushboolean(state, 1); - lua_pushstring(state, "good"); + return 2; } + lua_pushboolean(state, 1); + lua_pushstring(state, "good"); return 2; } @@ -377,16 +380,17 @@ int InsertMonsterReward(lua_State* state) { const std::string name = lua_tostring(state, -2); const std::string text = lua_tostring(state, -1); - const AdventureGuideResult result = g_adventureGuideMgr->InsertMonsterReward(name, text); + CAdventureGuideMgr* const manager = g_adventureGuideMgr; + const AdventureGuideResult result = manager->InsertMonsterReward(name, text); if (!result.ok) { lua_pushboolean(state, 0); lua_pushstring(state, FormatString("InsertMonsterReward : %s", result.message.c_str())); - } else { - lua_pushboolean(state, 1); - lua_pushstring(state, "good"); + return 2; } + lua_pushboolean(state, 1); + lua_pushstring(state, "good"); return 2; } @@ -414,16 +418,17 @@ int InsertQuest(lua_State* state) { const int id = static_cast(lua_tonumber(state, -3)); const std::string name = lua_tostring(state, -2); const std::string text = lua_tostring(state, -1); - const AdventureGuideResult result = g_adventureGuideMgr->InsertGuideMenu(3, id, name, text); + CAdventureGuideMgr* const manager = g_adventureGuideMgr; + const AdventureGuideResult result = manager->InsertGuideMenu(3, id, name, text); if (!result.ok) { lua_pushboolean(state, 0); lua_pushstring(state, FormatString("InsertQuest : %s", result.message.c_str())); - } else { - lua_pushboolean(state, 1); - lua_pushstring(state, "good"); + return 2; } + lua_pushboolean(state, 1); + lua_pushstring(state, "good"); return 2; } @@ -592,16 +597,17 @@ int InsertDungeon(lua_State* state) { const int id = static_cast(lua_tonumber(state, -3)); const std::string name = lua_tostring(state, -2); const std::string text = lua_tostring(state, -1); - const AdventureGuideResult result = g_adventureGuideMgr->InsertGuideMenu(4, id, name, text); + CAdventureGuideMgr* const manager = g_adventureGuideMgr; + const AdventureGuideResult result = manager->InsertGuideMenu(4, id, name, text); if (!result.ok) { lua_pushboolean(state, 0); lua_pushstring(state, FormatString("InsertDungeon : %s", result.message.c_str())); - } else { - lua_pushboolean(state, 1); - lua_pushstring(state, "good"); + return 2; } + lua_pushboolean(state, 1); + lua_pushstring(state, "good"); return 2; } @@ -768,16 +774,17 @@ int InsertWeapon(lua_State* state) { const int id = static_cast(lua_tonumber(state, -3)); const std::string name = lua_tostring(state, -2); const std::string text = lua_tostring(state, -1); - const AdventureGuideResult result = g_adventureGuideMgr->InsertGuideMenu(5, id, name, text); + CAdventureGuideMgr* const manager = g_adventureGuideMgr; + const AdventureGuideResult result = manager->InsertGuideMenu(5, id, name, text); if (!result.ok) { lua_pushboolean(state, 0); lua_pushstring(state, FormatString("InsertWeapon : %s", result.message.c_str())); - } else { - lua_pushboolean(state, 1); - lua_pushstring(state, "good"); + return 2; } + lua_pushboolean(state, 1); + lua_pushstring(state, "good"); return 2; } @@ -954,16 +961,17 @@ int InsertArmor(lua_State* state) { const int id = static_cast(lua_tonumber(state, -3)); const std::string name = lua_tostring(state, -2); const std::string text = lua_tostring(state, -1); - const AdventureGuideResult result = g_adventureGuideMgr->InsertGuideMenu(6, id, name, text); + CAdventureGuideMgr* const manager = g_adventureGuideMgr; + const AdventureGuideResult result = manager->InsertGuideMenu(6, id, name, text); if (!result.ok) { lua_pushboolean(state, 0); lua_pushstring(state, FormatString("InsertArmor : %s", result.message.c_str())); - } else { - lua_pushboolean(state, 1); - lua_pushstring(state, "good"); + return 2; } + lua_pushboolean(state, 1); + lua_pushstring(state, "good"); return 2; } @@ -1271,8 +1279,14 @@ void CAdventureGuideMgr::GetEntryList(std::list