Changeset 62ee2ce in network-game for common/WorldMap.cpp

Timestamp:

Feb 5, 2013, 7:02:32 PM (12 years ago)

Author:

dportnoy <dmp1488@…>

Branches:

master

Children:

384b7e0, 60017fc

Parents:

60b77d2

Message:

The client shows the map and converts between screen and map coordinates

File:

• common/WorldMap.cpp (moved) (moved from common/Map.cpp ) (4 diffs)

common/WorldMap.cpp

@@ -1 @@
-#include "Map.h"
+#include "WorldMap.h"
 
 using namespace std;
 
-Map::Map(int width, int height)
+WorldMap::WorldMap(int width, int height)
 {
    this->width = width;
@@ -20 +20 @@
 }
 
-Map::~Map()
+WorldMap::~WorldMap()
 {
    for (int x=0; x<width; x++)
@@ -28 +28 @@
 }
 
-void Map::setElement(int x, int y, TerrainType t)
+WorldMap::TerrainType WorldMap::getElement(int x, int y)
+{
+   return (*(*vctMap)[x])[y];
+}
+
+void WorldMap::setElement(int x, int y, TerrainType t)
 {
    (*(*vctMap)[x])[y] = t;
 }
 
-Map* Map::createDefaultMap()
+WorldMap* WorldMap::createDefaultMap()
 {
-   Map* m = new Map(20l, 20);
+   WorldMap* m = new WorldMap(12l, 12);
 
-   for(int x=0; x<20; x++)
+   for(int x=0; x<12; x++)
    {   
-      for(int y=0; y<20; y++)
+      for(int y=0; y<12; y++)
       {
-         if (x ==0 || y == 0 || x == 19 || y == 19)
+         if (x ==0 || y == 0 || x == 11 || y == 11)
             m->setElement(x, y, TERRAIN_OCEAN);
          else
@@ -48 +53 @@
    }
 
+   m->setElement(5, 5, TERRAIN_ROCK);
+
    return m;
 }