Core/Misc: Fixed deprecation warnings for c++20

(cherry picked from commit ba9bbbc9d0c3b80d8954ad6390d23ae3d0f804b2)

2 files changed, 7 insertions, 4 deletions

diff --git a/src/common/Collision/Maps/TileAssembler.cpp b/src/common/Collision/Maps/TileAssembler.cpp
index c8dc2d46620..27dc57c7c86 100644
--- a/src/common/Collision/Maps/TileAssembler.cpp
+++ b/src/common/Collision/Maps/TileAssembler.cpp
@@ -214,7 +214,6 @@ namespace VMAP
         }
         printf("Read coordinate mapping...\n");
         uint32 mapID, tileX, tileY, check;
-        G3D::Vector3 v1, v2;
         ModelSpawn spawn;
         while (!feof(dirf))
         {
@@ -222,8 +221,13 @@ namespace VMAP
             check = fread(&mapID, sizeof(uint32), 1, dirf);
             if (check == 0) // EoF...
                 break;
-            fread(&tileX, sizeof(uint32), 1, dirf);
-            fread(&tileY, sizeof(uint32), 1, dirf);
+            check = fread(&tileX, sizeof(uint32), 1, dirf);
+            if (check == 0) // EoF...
+                break;
+            check = fread(&tileY, sizeof(uint32), 1, dirf);
+            if (check == 0) // EoF...
+                break;
+
             if (!ModelSpawn::readFromFile(dirf, spawn))
                 break;
 
diff --git a/src/common/Collision/Maps/TileAssembler.h b/src/common/Collision/Maps/TileAssembler.h
index 010cb590407..bdad179ad06 100644
--- a/src/common/Collision/Maps/TileAssembler.h
+++ b/src/common/Collision/Maps/TileAssembler.h
@@ -94,7 +94,6 @@ namespace VMAP
         private:
             std::string iDestDir;
             std::string iSrcDir;
-            G3D::Table<std::string, unsigned int > iUniqueNameIds;
             MapData mapData;
             std::set<std::string> spawnedModelFiles;