Begin modernizing CFILE

Begin replacing custom string manipulation within CFILE with std::filesystem.
DescentDevelopers · Apr 28, 2024 · 65dbd67 · 65dbd67
1 parent 2102b5b
commit 65dbd67
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 94 deletions.
diff --git a/Descent3/descent.cpp b/Descent3/descent.cpp
@@ -1,5 +1,5 @@
 /*
-* Descent 3 
+* Descent 3
 * Copyright (C) 2024 Parallax Software
 *
 * This program is free software: you can redistribute it and/or modify
@@ -576,7 +576,7 @@ void Descent3() {
     // Save settings to registry
     SaveGameSettings();
   } catch (cfile_error *cfe) {
-    Error(TXT_D3ERROR1, (cfe->read_write == CFE_READING) ? TXT_READING : TXT_WRITING, cfe->file->name, cfe->msg);
+    Error(TXT_D3ERROR1, (cfe->read_write == CFE_READING) ? TXT_READING : TXT_WRITING, cfe->file->path.c_str(), cfe->msg);
   }
 }
 

diff --git a/Descent3/multi.cpp b/Descent3/multi.cpp
@@ -1,5 +1,5 @@
 /*
-* Descent 3 
+* Descent 3
 * Copyright (C) 2024 Parallax Software
 *
 * This program is free software: you can redistribute it and/or modify
@@ -3680,7 +3680,7 @@ void MultiDoLeaveGame(ubyte *data) {
   if (NetPlayers[slot].file_xfer_flags != NETFILE_NONE) {
     if (NetPlayers[slot].file_xfer_cfile) {
       char delfile[_MAX_PATH * 2];
-      strcpy(delfile, NetPlayers[slot].file_xfer_cfile->name);
+      strcpy(delfile, NetPlayers[slot].file_xfer_cfile->path.c_str());
       cfclose(NetPlayers[slot].file_xfer_cfile);
       NetPlayers[slot].file_xfer_cfile = NULL;
       if (NetPlayers[slot].file_xfer_flags == NETFILE_RECEIVING)
@@ -3720,7 +3720,7 @@ void MultiDoServerQuit(ubyte *data) {
     if (NetPlayers[i].file_xfer_flags != NETFILE_NONE) {
       if (NetPlayers[i].file_xfer_cfile) {
         char delfile[_MAX_PATH * 2];
-        strcpy(delfile, NetPlayers[i].file_xfer_cfile->name);
+        strcpy(delfile, NetPlayers[i].file_xfer_cfile->path.c_str());
         cfclose(NetPlayers[i].file_xfer_cfile);
         NetPlayers[i].file_xfer_cfile = NULL;
         if (NetPlayers[i].file_xfer_flags == NETFILE_RECEIVING)
@@ -3748,7 +3748,7 @@ void MultiDoDisconnect(ubyte *data) {
     if (NetPlayers[slot].file_xfer_flags != NETFILE_NONE) {
       if (NetPlayers[slot].file_xfer_cfile) {
         char delfile[_MAX_PATH * 2];
-        strcpy(delfile, NetPlayers[slot].file_xfer_cfile->name);
+        strcpy(delfile, NetPlayers[slot].file_xfer_cfile->path.c_str());
         cfclose(NetPlayers[slot].file_xfer_cfile);
         NetPlayers[slot].file_xfer_cfile = NULL;
         if (NetPlayers[slot].file_xfer_flags == NETFILE_RECEIVING)
@@ -7941,7 +7941,7 @@ void MultiDoFileCancelled(ubyte *data) {
   mprintf((0, "Got a cancelled packet from %d for %d\n", playernum, filewho));
   if (NetPlayers[filewho].file_xfer_cfile) {
     char delfile[_MAX_PATH * 2];
-    strcpy(delfile, NetPlayers[filewho].file_xfer_cfile->name);
+    strcpy(delfile, NetPlayers[filewho].file_xfer_cfile->path.c_str());
     cfclose(NetPlayers[filewho].file_xfer_cfile);
     NetPlayers[filewho].file_xfer_cfile = NULL;
     ddio_DeleteFile(delfile);