Changeset 2106Tweet

Timestamp:

Nov 22, 2012, 12:22:35 AM (9 years ago)

Author:

sam

Message:

build: rename Map to LevelMap so that we can use Map for the hashmap.

Location:

trunk/src

Files:

• Makefile.am (modified) (1 diff)
• core.h (modified) (1 diff)
• lol/core/map.h (added)
• lolcore.vcxproj (modified) (1 diff)
• lolcore.vcxproj.filters (modified) (1 diff)
• map.cpp (modified) (6 diffs)
• map.h (modified) (2 diffs)

trunk/src/Makefile.am

@@ -19 +19 @@
     lol/unit.h lol/debug.h \
     lol/core/types.h lol/core/array.h lol/core/string.h lol/core/hash.h \
+    lol/core/map.h \
     lol/math/vector.h lol/math/half.h lol/math/real.h lol/math/remez.h \
     lol/math/math.h \

trunk/src/core.h

@@ -76 +76 @@
 // Base types
 #include <lol/debug.h>
+
 #include <lol/core/types.h>
 #include <lol/core/array.h>
 #include <lol/core/string.h>
 #include <lol/core/hash.h>
+#include <lol/core/map.h>
+
 #include <lol/math/math.h>
 #include <lol/math/half.h>
 #include <lol/math/real.h>
 #include <lol/math/vector.h>
+
 #include "numeric.h"
 #include "timer.h"

trunk/src/lolcore.vcxproj

@@ -585 +585 @@
     <ClInclude Include="lol\core\array.h" />
     <ClInclude Include="lol\core\hash.h" />
+    <ClInclude Include="lol\core\map.h" />
     <ClInclude Include="lol\core\string.h" />
     <ClInclude Include="lol\core\types.h" />

trunk/src/lolcore.vcxproj.filters

@@ -740 +740 @@
     </ClInclude>
     <ClInclude Include="hash.h">
+      <Filter>src\core</Filter>
+    </ClInclude>
+    <ClInclude Include="map.h">
       <Filter>src\core</Filter>
     </ClInclude>

trunk/src/map.cpp

@@ -26 +26 @@
 
 /*
- * Map implementation class
+ * LevelMap implementation class
  */
 
-class MapData
+class LevelMapData
 {
-    friend class Map;
+    friend class LevelMap;
 
     static int const MAX_TILESETS = 128;
@@ -45 +45 @@
 
 /*
- * Public Map class
+ * Public LevelMap class
  */
 
-Map::Map(char const *path)
-  : data(new MapData())
+LevelMap::LevelMap(char const *path)
+  : data(new LevelMapData())
 {
     data->ntilers = 0;
@@ -56 +56 @@
 
     char tmp[BUFSIZ];
-    int gids[MapData::MAX_TILESETS];
+    int gids[LevelMapData::MAX_TILESETS];
     uint32_t *tiles = NULL;
     int level = 0, orientation = 0, ntiles = 0;
@@ -152 +152 @@
 }
 
-Map::~Map()
+LevelMap::~LevelMap()
 {
     for (int i = 0; i < data->ntilers; i++)
@@ -161 +161 @@
 }
 
-void Map::Render(int x, int y, int z)
+void LevelMap::Render(int x, int y, int z)
 {
     for (int i = 0; i < data->m_layers.Count(); i++)
@@ -167 +167 @@
 }
 
-int Map::GetWidth()
+int LevelMap::GetWidth()
 {
     return data->width * 32;
 }
 
-int Map::GetHeight()
+int LevelMap::GetHeight()
 {
     return data->height * 32;

trunk/src/map.h

@@ -10 +10 @@
 
 //
-// The Map class
-// -------------
-// A Map object is a collection of Layers and other information (to be
+// The LevelMap class
+// ------------------
+// A LevelMap object is a collection of Layers and other information (to be
 // determined later).
 //
 
-#if !defined __LOL_MAP_H__
-#define __LOL_MAP_H__
+#if !defined __LOL_LEVELMAP_H__
+#define __LOL_LEVELMAP_H__
 
 namespace lol
 {
 
-class MapData;
+class LevelMapData;
 
-class Map
+class LevelMap
 {
 public:
-    Map(char const *path);
-    ~Map();
+    LevelMap(char const *path);
+    ~LevelMap();
 
     void Render(int x, int y, int z);
@@ -35 +35 @@
 
 private:
-    MapData *data;
+    LevelMapData *data;
 };