jprdonnelly/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2026-04-04 11:00:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation of Descent3Editor

Browse Source 
Convert some of the paths to use std::fs::path.
This commit is contained in:
Azamat H. Hackimov
2024-06-29 11:42:52 +03:00
parent 41ec941b50
commit c287a2df48
10 changed files with 136 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
editor/WorldObjectsGenericDialog.cpp
View File

@@ -19,6 +19,8 @@
// WorldObjectsGenericDialog.cpp : implementation file
//
#include <filesystem>
#include "mfc_compatibility.h"
#include "editor.h"
#include "WorldObjectsGenericDialog.h"
@@ -722,10 +724,8 @@ retry_name:
// Finally, save a local copy of the model/anim and alloc a tracklock
mprintf(0, "Making a copy of this model locally...\n");
char destname[100];
sprintf(destname, "%s\\%s", LocalModelsDir, Poly_models[Object_info[object_handle].render_handle].name);
if (stricmp(destname, filename)) // only copy if they are different
cf_CopyFile(destname, filename);
std::filesystem::path destname = LocalModelsDir / Poly_models[Object_info[object_handle].render_handle].name;
cf_CopyFile(destname, filename);
mng_AllocTrackLock(cur_name, PAGETYPE_GENERIC);
@@ -798,21 +798,19 @@ void CWorldObjectsGenericDialog::OnGenericCheckIn() {
else {
// Save this object anim/model to the network for all
char destname[100], srcname[100];
sprintf(srcname, "%s\\%s", LocalModelsDir, Poly_models[Object_info[m_current].render_handle].name);
sprintf(destname, "%s\\%s", NetModelsDir, Poly_models[Object_info[m_current].render_handle].name);
std::filesystem::path srcname = LocalModelsDir / Poly_models[Object_info[m_current].render_handle].name;
std::filesystem::path destname = NetModelsDir / Poly_models[Object_info[m_current].render_handle].name;
cf_CopyFile(destname, srcname);
if (Object_info[m_current].med_render_handle != -1) {
sprintf(srcname, "%s\\%s", LocalModelsDir, Poly_models[Object_info[m_current].med_render_handle].name);
sprintf(destname, "%s\\%s", NetModelsDir, Poly_models[Object_info[m_current].med_render_handle].name);
srcname = LocalModelsDir / Poly_models[Object_info[m_current].med_render_handle].name;
destname = NetModelsDir / Poly_models[Object_info[m_current].med_render_handle].name;
cf_CopyFile(destname, srcname);
}
if (Object_info[m_current].lo_render_handle != -1) {
sprintf(srcname, "%s\\%s", LocalModelsDir, Poly_models[Object_info[m_current].lo_render_handle].name);
sprintf(destname, "%s\\%s", NetModelsDir, Poly_models[Object_info[m_current].lo_render_handle].name);
srcname = LocalModelsDir / Poly_models[Object_info[m_current].lo_render_handle].name;
destname = NetModelsDir / Poly_models[Object_info[m_current].lo_render_handle].name;
cf_CopyFile(destname, srcname);
}
@@ -1048,7 +1046,7 @@ void CWorldObjectsGenericDialog::OnGenericChangeModel() {
}
// Finally, save a local copy of the model
sprintf(curname, "%s\\%s", LocalModelsDir, Poly_models[img_handle].name);
sprintf(curname, "%s\\%s", LocalModelsDir.u8string().c_str(), Poly_models[img_handle].name);
cf_CopyFile(curname, filename);
UpdateDialog();