fix: warnings deprecated (#47)

opentibiabr · Sep 8, 2023 · 111f459 · 111f459
1 parent 17e42a5
commit 111f459
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 18 deletions.
diff --git a/.github/workflows/analysis-sonarcloud.yml b/.github/workflows/analysis-sonarcloud.yml
@@ -6,13 +6,15 @@ on:
     types: [opened, synchronize, reopened]
     paths:
       - 'src/**'
+      - 'source/**'
       - 'cmake/**'
       - 'CMakeLists.txt'
       - 'CMakePresets.json'
       - 'vcpkg.json'
   push:
     paths:
       - 'src/**'
+      - 'source/**'
       - 'cmake/**'
       - 'CMakeLists.txt'
       - 'CMakePresets.json'

diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
@@ -7,13 +7,15 @@ on:
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
       - 'src/**'
+      - 'source/**'
       - 'cmake/**'
       - 'CMakeLists.txt'
       - 'CMakePresets.json'
       - 'vcpkg.json'
   push:
     paths:
       - 'src/**'
+      - 'source/**'
       - 'cmake/**'
       - 'CMakeLists.txt'
       - 'CMakePresets.json'

diff --git a/.github/workflows/build-windows-cmake.yml b/.github/workflows/build-windows-cmake.yml
@@ -7,13 +7,15 @@ on:
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
       - 'src/**'
+      - 'source/**'
       - 'cmake/**'
       - 'CMakeLists.txt'
       - 'CMakePresets.json'
       - 'vcpkg.json'
   push:
     paths:
       - 'src/**'
+      - 'source/**'
       - 'cmake/**'
       - 'CMakeLists.txt'
       - 'CMakePresets.json'

diff --git a/.github/workflows/build-windows-solution.yml b/.github/workflows/build-windows-solution.yml
@@ -7,17 +7,21 @@ on:
     types: [opened, synchronize, reopened, ready_for_review]
     paths:
       - 'src/**'
+      - 'source/**'
       - 'cmake/**'
       - 'CMakeLists.txt'
       - 'CMakePresets.json'
       - 'vcpkg.json'
+      - 'vcproj/**'
   push:
     paths:
       - 'src/**'
+      - 'source/**'
       - 'cmake/**'
       - 'CMakeLists.txt'
       - 'CMakePresets.json'
       - 'vcpkg.json'
+      - 'vcproj/**'
     branches:
       - main
 

diff --git a/source/common_windows.cpp b/source/common_windows.cpp
@@ -134,7 +134,7 @@ MapPropertiesWindow::MapPropertiesWindow(wxWindow* parent, MapTab* view, Editor&
 		spawn_filename_ctrl =
 			newd wxTextCtrl(this, wxID_ANY, wxstr(map.getSpawnFilename())), 1, wxEXPAND
 		);
-	
+
 	grid_sizer->Add(
 		newd wxStaticText(this, wxID_ANY, "External npc file")
 		);
@@ -626,24 +626,24 @@ void ExportMiniMapWindow::OnClickOK(wxCommandEvent& WXUNUSED(event))
 				for(int floor = 0; floor < MAP_LAYERS; ++floor) {
 					g_gui.SetLoadScale(int(floor*(100.f/16.f)), int((floor+1)*(100.f/16.f)));
 					FileName file(file_name_text_field->GetValue() + "_" + i2ws(floor) + ".bmp");
-					file.Normalize(wxPATH_NORM_ALL, directory.GetFullPath());
-					editor.exportMiniMap(file, floor, true);
+                    file.Normalize(wxPATH_NORM_ABSOLUTE | wxPATH_NORM_TILDE | wxPATH_NORM_DOTS, directory.GetFullPath());
+                    editor.exportMiniMap(file, floor, true);
 				}
 				break;
 			}
 
 			case 1: { // Ground floor
 				FileName file(file_name_text_field->GetValue() + "_" + i2ws(GROUND_LAYER) + ".bmp");
-				file.Normalize(wxPATH_NORM_ALL, directory.GetFullPath());
-				editor.exportMiniMap(file, GROUND_LAYER, true);
+                file.Normalize(wxPATH_NORM_ABSOLUTE | wxPATH_NORM_TILDE | wxPATH_NORM_DOTS, directory.GetFullPath());
+                editor.exportMiniMap(file, GROUND_LAYER, true);
 				break;
 			}
 
 			case 2: { // Specific floors
 				int floor = floor_number->GetValue();
 				FileName file(file_name_text_field->GetValue() + "_" + i2ws(floor) + ".bmp");
-				file.Normalize(wxPATH_NORM_ALL, directory.GetFullPath());
-				editor.exportMiniMap(file, floor, true);
+                file.Normalize(wxPATH_NORM_ABSOLUTE | wxPATH_NORM_TILDE | wxPATH_NORM_DOTS, directory.GetFullPath());
+                editor.exportMiniMap(file, floor, true);
 				break;
 			}
 

diff --git a/source/filehandle.cpp b/source/filehandle.cpp
@@ -294,17 +294,21 @@ bool DiskNodeFileReadHandle::renewCache()
 
 BinaryNode* DiskNodeFileReadHandle::getRootNode()
 {
-	assert(root_node == nullptr); // You should never do this twice
-	uint8_t first;
-	fread(&first, 1, 1, file);
-	if(first == NODE_START) {
-		root_node = getNode(nullptr);
-		root_node->load();
-		return root_node;
-	} else {
-		error_code = FILE_SYNTAX_ERROR;
-		return nullptr;
-	}
+    assert(root_node == nullptr); // You should never do this twice
+    uint8_t first;
+    size_t numRead = fread(&first, 1, 1, file);
+    if(numRead != 1) {
+        error_code = FILE_READ_ERROR;
+        return nullptr;
+    }
+    if(first == NODE_START) {
+        root_node = getNode(nullptr);
+        root_node->load();
+        return root_node;
+    } else {
+        error_code = FILE_SYNTAX_ERROR;
+        return nullptr;
+    }
 }
 
 //=============================================================================