equal
deleted
inserted
replaced
3 |
3 |
4 // forward-declare |
4 // forward-declare |
5 class Engine; |
5 class Engine; |
6 |
6 |
7 #include "GameState.hh" |
7 #include "GameState.hh" |
8 #include "Graphics.hh" |
8 #include "Graphics/Graphics.hh" |
9 #include "Network/Server.hh" |
9 #include "Network/Server.hh" |
10 #include "Network/Client.hh" |
10 #include "Network/Client.hh" |
11 |
11 |
12 #include "Logger.hh" |
12 #include "Logger.hh" |
13 |
13 |
18 private: |
18 private: |
19 // game state |
19 // game state |
20 Terrain *terrain; |
20 Terrain *terrain; |
21 GameState *game_state; |
21 GameState *game_state; |
22 |
22 |
23 /** Set if setupGraphics has been called */ |
|
24 const GraphicsConfig *graphics_config; |
|
25 |
|
26 // Graphics/Input |
23 // Graphics/Input |
27 Graphics *graphics; |
24 graphics::Graphics *graphics; |
28 |
25 |
29 // network server/client |
26 // network server/client |
30 NetworkServer *net_server; |
27 NetworkServer *net_server; |
31 NetworkClientConnect *net_client_connect; |
28 NetworkClientConnect *net_client_connect; |
32 // XXX: currently unused: NetworkClient *net_client; |
29 // XXX: currently unused: NetworkClient *net_client; |
54 void setupGame (const TerrainConfig &config); |
51 void setupGame (const TerrainConfig &config); |
55 |
52 |
56 /** |
53 /** |
57 * Enable graphics |
54 * Enable graphics |
58 */ |
55 */ |
59 void setupGraphics (const GraphicsConfig &config); |
56 void setupGraphics (const graphics::DisplayConfig &config); |
60 |
57 |
61 /** |
58 /** |
62 * Setup server, must call setupGame first |
59 * Setup server, must call setupGame first |
63 */ |
60 */ |
64 void setupNetworkServer (const std::string &listen_port); |
61 void setupNetworkServer (const std::string &listen_port); |