From b7287e85e4bc8acb2b95271ece9dd8a5b93873cd Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 1 Jan 2023 00:26:53 +0100 Subject: Core/Misc: Fixed deprecation warnings for c++20 (cherry picked from commit ba9bbbc9d0c3b80d8954ad6390d23ae3d0f804b2) --- src/common/Collision/Maps/TileAssembler.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/common/Collision/Maps/TileAssembler.cpp') 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; -- cgit v1.2.3