- Timestamp:
- Dec 8, 2010, 1:49:39 PM (15 years ago)
- File:
-
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.h
r7725 r7727 21 21 * 22 22 * Author: 23 * Reto Grieder23 * Sandro 'smerkli' Merkli 24 24 * Co-authors: 25 * Reto Grieder (Original GSServer.h file this was adapted from) 25 26 * ... 26 27 * 27 28 */ 28 29 29 #ifndef _GS Server_H__30 #define _GS Server_H__30 #ifndef _GSMasterServer_H__ 31 #define _GSMasterServer_H__ 31 32 32 33 #include "OrxonoxPrereqs.h" … … 37 38 namespace orxonox 38 39 { 39 class _OrxonoxExport GS Server : public GameState40 class _OrxonoxExport GSMasterServer : public GameState 40 41 { 41 42 public: 42 GS Server(const GameStateInfo& info);43 ~GS Server();43 GSMasterServer(const GameStateInfo& info); 44 ~GSMasterServer(); 44 45 45 46 void activate(); … … 48 49 49 50 private: 50 Server* server_;51 51 52 }; 52 53 }
Note: See TracChangeset
for help on using the changeset viewer.