Changeset 384b7e0 in network-game for client/Client/main.cpp

Timestamp:

Feb 12, 2013, 8:42:42 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

093c141

Parents:

62ee2ce

Message:

The client displays a small map upon login and lets the user move around

File:

• client/Client/main.cpp (modified) (2 diffs)

client/Client/main.cpp

@@ -29 +29 @@
 #include "../../common/Message.h"
 #include "../../common/Common.h"
+#include "../../common/WorldMap.h"
 #include "../../common/Player.h"
-#include "../../common/WorldMap.h"
 
 #include "Window.h"
@@ -160 +160 @@
    }
 
-   WorldMap* gameMap = WorldMap::createDefaultMap();
+   WorldMap* gameMap = WorldMap::loadMapFromFile("../../data/map.txt");
+   //delete gameMap;
+   //gameMap = WorldMap::createDefaultMap();
 
    wndLogin = new Window(0, 0, SCREEN_W, SCREEN_H);