From 7b9f43b8bff4c9faa34ac106dc07bee36a7f26b6 Mon Sep 17 00:00:00 2001 From: jacksonmj Date: Fri, 23 May 2014 00:00:54 +0100 Subject: [PATCH] Fix some missing return values --- src/gui/game/GameController.cpp | 3 +-- src/lua/LuaScriptInterface.cpp | 3 ++- src/lua/TPTScriptInterface.cpp | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/gui/game/GameController.cpp b/src/gui/game/GameController.cpp index 9d6c6de38..d307e8538 100644 --- a/src/gui/game/GameController.cpp +++ b/src/gui/game/GameController.cpp @@ -1401,8 +1401,7 @@ std::string GameController::ElementResolve(int type, int ctype) else if (type >= 0 && type < PT_NUM && gameModel->GetSimulation()->elements) return std::string(gameModel->GetSimulation()->elements[type].Name); } - else - return ""; + return ""; } bool GameController::IsValidElement(int type) diff --git a/src/lua/LuaScriptInterface.cpp b/src/lua/LuaScriptInterface.cpp index e15d73e8e..78a6fee1c 100644 --- a/src/lua/LuaScriptInterface.cpp +++ b/src/lua/LuaScriptInterface.cpp @@ -1999,7 +1999,7 @@ int LuaScriptInterface::elements_loadDefault(lua_State * l) luacon_model->BuildMenus(); luacon_sim->init_can_move(); std::fill(luacon_ren->graphicscache, luacon_ren->graphicscache+PT_NUM, gcache_item()); - + return 0; } int LuaScriptInterface::elements_allocate(lua_State * l) @@ -2296,6 +2296,7 @@ int LuaScriptInterface::elements_property(lua_State * l) } else return luaL_error(l, "Invalid element property"); + return 0; } else { diff --git a/src/lua/TPTScriptInterface.cpp b/src/lua/TPTScriptInterface.cpp index 5c8454117..544747a66 100644 --- a/src/lua/TPTScriptInterface.cpp +++ b/src/lua/TPTScriptInterface.cpp @@ -190,6 +190,7 @@ AnyType TPTScriptInterface::eval(std::deque * words) case TypeString: return StringType(word); } + return StringType(word); } std::string TPTScriptInterface::FormatCommand(std::string command)