equal
deleted
inserted
replaced
1 |
1 |
2 #include "GameState.hh" |
2 #include "GameState.hh" |
3 #include "Engine.hh" |
3 #include "Engine.hh" |
4 #include "Config.hh" |
4 #include "Config.hh" |
5 |
5 |
6 GameState::GameState (void) : |
6 GameState::GameState (Terrain &terrain) : |
7 world(Vector(0, MAP_GRAVITY), Vector(MAP_WIDTH, MAP_HEIGHT)), local_player(NULL), event_handler(NULL) |
7 world(Vector(0, MAP_GRAVITY), Vector(terrain.getWidth(), terrain.getHeight()), terrain), |
|
8 terrain(terrain), |
|
9 local_player(NULL), event_handler(NULL) |
8 { |
10 { |
9 |
11 |
10 } |
12 } |
11 |
13 |
12 void GameState::setEventHandler (GameStateEventHandler *handler) { |
14 void GameState::setEventHandler (GameStateEventHandler *handler) { |
47 if (event_handler) |
49 if (event_handler) |
48 event_handler->on_player_left(player); |
50 event_handler->on_player_left(player); |
49 } |
51 } |
50 |
52 |
51 void GameState::draw(Graphics *g, PixelCoordinate camera, bool displayWeapon) { |
53 void GameState::draw(Graphics *g, PixelCoordinate camera, bool displayWeapon) { |
52 // Draw world/terrain |
54 // Draw terrain |
53 world.draw(g, camera); |
55 terrain.draw(g, camera); |
54 |
56 |
55 // Draw players |
57 // Draw players |
56 for (std::list<Player*>::iterator it = player_list.begin(); it != player_list.end(); it++) { |
58 for (std::list<Player*>::iterator it = player_list.begin(); it != player_list.end(); it++) { |
57 Player *p = *it; |
59 Player *p = *it; |
58 |
60 |