Changeset 10769 for code/branches/cpp11_v2/src/libraries/core/Game.h
- Timestamp:
- Nov 7, 2015, 10:23:42 AM (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2/src/libraries/core/Game.h
r10624 r10769 84 84 { // tolua_export 85 85 friend class Singleton<Game>; 86 typedef std::vector<shared_ptr<GameState> 87 typedef std::map<std::string, shared_ptr<GameState> 86 typedef std::vector<shared_ptr<GameState>> GameStateVector; 87 typedef std::map<std::string, shared_ptr<GameState>> GameStateMap; 88 88 typedef shared_ptr<GameStateTreeNode> GameStateTreeNodePtr; 89 89 … … 129 129 130 130 virtual shared_ptr<GameState> fabricateInternal(const GameStateInfo& info) = 0; 131 static std::map<std::string, shared_ptr<GameStateFactory> 131 static std::map<std::string, shared_ptr<GameStateFactory>>& getFactories(); 132 132 }; 133 133 template <class T> … … 150 150 void unloadGraphics(bool loadGraphicsManagerWithoutRenderer = true); 151 151 152 void parseStates(std::vector<std::pair<std::string, int> 152 void parseStates(std::vector<std::pair<std::string, int>>::const_iterator& it, shared_ptr<GameStateTreeNode> currentNode); 153 153 bool checkState(const std::string& name) const; 154 154 void loadState(const std::string& name);
Note: See TracChangeset
for help on using the changeset viewer.