Changeset 5655 for code/branches
- Timestamp:
- Aug 17, 2009, 4:41:03 PM (15 years ago)
- Location:
- code/branches/resource2/src
- Files:
-
- 1 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/resource2/src/core/Core.cc
r5654 r5655 78 78 #include "TclBind.h" 79 79 #include "TclThreadManager.h" 80 #include "ToluaBindCore.h"81 80 #include "input/InputManager.h" 82 81 … … 267 266 setThreadAffinity(static_cast<unsigned int>(limitToCPU)); 268 267 #endif 269 // Add tolua interface270 LuaState::addToluaInterface(&tolua_Core_open, "Core");271 268 272 269 // Manage ini files and set the default settings file (usually orxonox.ini) -
code/branches/resource2/src/core/LuaState.cc
r5654 r5655 39 39 #include "Core.h" 40 40 #include "Resource.h" 41 #include "ToluaBindCore.h" 41 42 42 43 namespace orxonox … … 44 45 LuaState::ToluaInterfaceMap LuaState::toluaInterfaces_s; 45 46 std::vector<LuaState*> LuaState::instances_s; 47 48 // Do this after declaring toluaInterfaces_s and instances_s to avoid larger problems 49 DeclareToluaInterface(Core); 46 50 47 51 LuaState::LuaState() -
code/branches/resource2/src/core/LuaState.h
r5654 r5655 40 40 41 41 #include "util/ScopeGuard.h" 42 #include "ToluaInterface.h" 42 43 43 44 // tolua_begin -
code/branches/resource2/src/orxonox/Main.cc
r3370 r5655 48 48 #include "core/CommandLine.h" 49 49 #include "core/Game.h" 50 #include "core/LuaState.h" 51 #include "ToluaBindOrxonox.h" 50 52 51 53 SetCommandLineSwitch(console).information("Start in console mode (text IO only)"); … … 55 57 SetCommandLineSwitch(dedicated).information("Start in dedicated server mode"); 56 58 SetCommandLineSwitch(standalone).information("Start in standalone mode"); 59 60 DeclareToluaInterface(Orxonox); 57 61 58 62 /* -
code/branches/resource2/src/orxonox/gamestates/GSRoot.cc
r5654 r5655 33 33 #include "core/Game.h" 34 34 #include "core/GameMode.h" 35 #include "core/LuaState.h"36 35 #include "network/NetworkFunction.h" 37 #include "ToluaBindOrxonox.h"38 36 #include "tools/Timer.h" 39 37 #include "interfaces/TimeFactorListener.h" … … 53 51 this->ccSetTimeFactor_ = 0; 54 52 this->ccPause_ = 0; 55 56 // Tell LuaBind about all tolua interfaces57 LuaState::addToluaInterface(&tolua_Orxonox_open, "Orxonox");58 53 } 59 54
Note: See TracChangeset
for help on using the changeset viewer.