Changes in client/Client/main.cpp [62ee2ce:384b7e0] in network-game


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • client/Client/main.cpp

    r62ee2ce r384b7e0  
    2929#include "../../common/Message.h"
    3030#include "../../common/Common.h"
     31#include "../../common/WorldMap.h"
    3132#include "../../common/Player.h"
    32 #include "../../common/WorldMap.h"
    3333
    3434#include "Window.h"
     
    160160   }
    161161
    162    WorldMap* gameMap = WorldMap::createDefaultMap();
     162   WorldMap* gameMap = WorldMap::loadMapFromFile("../../data/map.txt");
     163   //delete gameMap;
     164   //gameMap = WorldMap::createDefaultMap();
    163165
    164166   wndLogin = new Window(0, 0, SCREEN_W, SCREEN_H);
Note: See TracChangeset for help on using the changeset viewer.