Changeset 093c141 in network-game for common/WorldMap.h

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

File:

• common/WorldMap.h (modified) (1 diff)

common/WorldMap.h

@@ -26 +26 @@
 
    static WorldMap* createDefaultMap();
+   static WorldMap* loadMapFromFile(string filename);
 };