Improve terrain texture selection

Return-To-The-Roots · Jan 22, 2019 · 54b02ed · 54b02ed
1 parent 54ea1e5
commit 54b02ed
Show file tree

Hide file tree

Showing 7 changed files with 356 additions and 437 deletions.
diff --git a/CIO/CFile.cpp b/CIO/CFile.cpp
@@ -546,7 +546,9 @@ bobMAP* CFile::open_wld()
     CHECK_READ(libendian::read(myMap->name, 20, fp));
     CHECK_READ(libendian::le_read_us(&myMap->width_old, fp));
     CHECK_READ(libendian::le_read_us(&myMap->height_old, fp));
-    CHECK_READ(libendian::read(&myMap->type, 1, fp));
+    uint8_t mapType;
+    CHECK_READ(libendian::read(&mapType, 1, fp));
+    myMap->type = MapType(mapType);
     CHECK_READ(libendian::read(&myMap->player, 1, fp));
     CHECK_READ(libendian::read(myMap->author, 20, fp));
     for(unsigned short& i : myMap->HQx)
@@ -807,7 +809,8 @@ bool CFile::save_wld(void* data)
     // old height
     libendian::le_write_us(myMap->height_old, fp);
     // type
-    libendian::write(&myMap->type, 1, fp);
+    auto mapType = uint8_t(myMap->type);
+    libendian::write(&mapType, 1, fp);
     // players
     libendian::write(&myMap->player, 1, fp);
     // author

diff --git a/CMap.cpp b/CMap.cpp
@@ -61,7 +61,8 @@ CMap::~CMap()
     destructMap();
 }
 
-void CMap::constructMap(const std::string& filename, int width, int height, int type, int texture, int border, int border_texture)
+void CMap::constructMap(const std::string& filename, int width, int height, MapType type, TriangleTerrainType texture, int border,
+                        int border_texture)
 {
     map = nullptr;
     Surf_Map = nullptr;
@@ -211,7 +212,7 @@ void CMap::destructMap()
     delete map;
 }
 
-bobMAP* CMap::generateMap(int width, int height, int type, int texture, int border, int border_texture)
+bobMAP* CMap::generateMap(int width, int height, MapType type, TriangleTerrainType texture, int border, int border_texture)
 {
     bobMAP* myMap = new bobMAP();
 
@@ -899,7 +900,7 @@ void CMap::setKeyboardData(const SDL_KeyboardEvent& key)
             callback::EditorAnimalMenu(MAP_QUIT);
             callback::EditorPlayerMenu(MAP_QUIT);
 
-            map->type = 0;
+            map->type = MAP_GREENLAND;
             unloadMapPics();
             loadMapPics();
 
@@ -920,7 +921,7 @@ void CMap::setKeyboardData(const SDL_KeyboardEvent& key)
             callback::EditorAnimalMenu(MAP_QUIT);
             callback::EditorPlayerMenu(MAP_QUIT);
 
-            map->type = 1;
+            map->type = MAP_WASTELAND;
             unloadMapPics();
             loadMapPics();
 
@@ -941,7 +942,7 @@ void CMap::setKeyboardData(const SDL_KeyboardEvent& key)
             callback::EditorAnimalMenu(MAP_QUIT);
             callback::EditorPlayerMenu(MAP_QUIT);
 
-            map->type = 2;
+            map->type = MAP_WINTERLAND;
             unloadMapPics();
             loadMapPics();
 

diff --git a/CMap.h b/CMap.h
@@ -81,10 +81,10 @@ class CMap
 public:
     CMap(const std::string& filename);
     ~CMap();
-    void constructMap(const std::string& filename, int width = 32, int height = 32, int type = 0, int texture = TRIANGLE_TEXTURE_MEADOW1,
-                      int border = 4, int border_texture = TRIANGLE_TEXTURE_WATER);
+    void constructMap(const std::string& filename, int width = 32, int height = 32, MapType type = MAP_GREENLAND,
+                      TriangleTerrainType texture = TRIANGLE_TEXTURE_MEADOW1, int border = 4, int border_texture = TRIANGLE_TEXTURE_WATER);
     void destructMap();
-    bobMAP* generateMap(int width, int height, int type, int texture, int border, int border_texture);
+    bobMAP* generateMap(int width, int height, MapType type, TriangleTerrainType texture, int border, int border_texture);
     void loadMapPics();
     void unloadMapPics();