Changeset 62ee2ce in network-game for common

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

Location:

common

Files:

• Common.h (modified) (1 diff)
• Player.h (modified) (1 diff)
• WorldMap.cpp (moved) (moved from common/Map.cpp ) (4 diffs)
• WorldMap.h (moved) (moved from common/Map.h ) (3 diffs)

common/Common.h

@@ -18 +18 @@
    int x;
    int y;
-} PLAYER_POS;
+} POSITION;
 
 #endif

common/Player.h

@@ -36 +36 @@
    string password;
    sockaddr_in addr;
-   PLAYER_POS pos;
+   POSITION pos;
 };
 

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

common/WorldMap.h

@@ -1 @@
-#ifndef _MAP_H
-#define _MAP_H
+#ifndef _WORLDMAP_H
+#define _WORLDMAP_H
 
 #include <vector>
@@ -6 +6 @@
 using namespace std;
 
-class Map {
+class WorldMap {
 public:
    enum TerrainType {
       TERRAIN_NONE,
       TERRAIN_GRASS,
-      TERRAIN_OCEAN
+      TERRAIN_OCEAN,
+      TERRAIN_ROCK
    };
 
@@ -17 +18 @@
    vector<vector<TerrainType>*>* vctMap;
 
-   Map(int width, int height);
+   WorldMap(int width, int height);
 
-   ~Map();
+   ~WorldMap();
 
+   TerrainType getElement(int x, int y);
    void setElement(int x, int y, TerrainType type);
 
-   static Map* createDefaultMap();
+   static WorldMap* createDefaultMap();
 };