Changes in / [093c141:60017fc] in network-game

Files:

• client/Client/Client.vcxproj.filters (modified) (1 diff)
• client/Client/main.cpp (modified) (2 diffs)
• common/WorldMap.cpp (modified) (2 diffs)
• common/WorldMap.h (modified) (1 diff)
• data/map.txt (deleted)

client/Client/Client.vcxproj.filters

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

client/Client/main.cpp

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

common/WorldMap.cpp

@@ -1 +1 @@
 #include "WorldMap.h"
-
-#include <string>
-#include <iostream>
-#include <fstream>
-#include <sstream>
 
 using namespace std;
@@ -62 +57 @@
    return m;
 }
-
-WorldMap* WorldMap::loadMapFromFile(string filename)
-{
-   WorldMap* m = new WorldMap(12l, 12);
-
-   ifstream file(filename);
-
-   if (file.is_open())
-   {
-      string line;
-      int width, height;
-
-      // read the map dimensions
-      getline(file, line);
-      if (line.size() > 0)
-      {
-         istringstream iss(line);
-         string token;
-         getline(iss, token, 'x');
-         width = atoi(token.c_str());
-         getline(iss, token, 'x');
-         height = atoi(token.c_str());
-      }
-
-      cout << "width: " << width << endl;
-      cout << "height: " << height << endl;
-
-      // read the map contents
-      int row = 0;
-      while ( file.good() )
-      {
-         getline(file, line);
-         if (line.size() > 0)
-         {
-            cout << "line: " << line << endl;
-
-            istringstream iss(line);
-            string token;
-            int type;
-            TerrainType terrain;
-
-            for(int x=0; x<width; x++)
-            {
-               getline(iss, token, ',');
-               cout << "token: " << token << endl;
-               type = atoi(token.c_str());
-               cout << "type: " << type << endl;
-
-               switch(type) {
-               case 1:
-                  terrain = TERRAIN_GRASS;
-                  break;
-               case 2:
-                  terrain = TERRAIN_OCEAN;
-                  break;
-               case 3:
-                  terrain = TERRAIN_ROCK;
-                  break;
-               }
-
-               cout << "About to set element" << endl;
-               cout << "x: " << x << endl;
-               cout << "row: " << row << endl;
-               m->setElement(x, row, terrain);
-            }
-         }
-
-         row++;
-      }
-      file.close();
-   }
-   else
-      cout << "Could not open the file" << endl;
-
-   return m;
-}

common/WorldMap.h

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