Changeset 093c141 in network-game for client

Timestamp:

Feb 18, 2013, 7:00:03 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

f401cac

Parents:

60017fc (diff), 384b7e0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:weretaco/network-game

Location:

client/Client

Files:

• Client.vcxproj.filters (modified) (1 diff)
• main.cpp (modified) (2 diffs)

client/Client/Client.vcxproj.filters

@@ -56 +56 @@
     </ClCompile>
     <ClCompile Include="..\..\common\WorldMap.cpp">
-      <Filter>Source Files\gui</Filter>
+      <Filter>Source Files\common</Filter>
     </ClCompile>
   </ItemGroup>

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);