Enhance multiple base directory usage

CMakeLists.txt

@@ -83,6 +83,12 @@ if(FORCE_PORTABLE_INSTALL)
   set(CMAKE_INSTALL_LIBDIR ".")
   set(CMAKE_INSTALL_DATADIR ".")
   set(CMAKE_INSTALL_DOCDIR ".")
+
+  set(D3_DATADIR "${CMAKE_INSTALL_DATADIR}")
+else()
+  set(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATADIR}/Descent3")
+  # On system install files will go into /usr/share/Descent3
+  set(D3_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/Descent3")
 endif()
 
 if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)

Descent3/CMakeLists.txt

@@ -294,6 +294,12 @@ if(WIN32)
   )
 endif()
 
+configure_file(
+  ${CMAKE_SOURCE_DIR}/lib/d3_platform_path.h.in
+  ${CMAKE_BINARY_DIR}/lib/d3_platform_path.h
+  @ONLY
+)
+
 if(UNIX AND NOT APPLE)
   set(PLATFORM_LIBS m ${CMAKE_DL_LIBS})
 endif()

Descent3/audiotaunts.cpp

@@ -18,8 +18,8 @@
 
 #include <cstdlib>
 #include <cstring>
+#include <filesystem>
 
-#include "debug.h"
 #include "pserror.h"
 #include "audiotaunts.h"
 #include "cfile.h"
@@ -92,7 +92,7 @@ void taunt_SetDelayTime(float t) { Audio_taunt_delay_time = t; }
 //	taunt_PlayTauntFile
 //
 //	Given a path to an .osf file, it will play it
-bool taunt_PlayTauntFile(const char *filename) {
+bool taunt_PlayTauntFile(const std::filesystem::path &filename) {
   if (!Audio_taunts_enabled)
     return false;
 
@@ -113,7 +113,7 @@ bool taunt_PlayPlayerTaunt(int pnum, int index) {
   }
 
   if ((NetPlayers[pnum].flags & NPF_CONNECTED) && (NetPlayers[pnum].sequence == NETSEQ_PLAYING)) {
-    char fullpath[_MAX_PATH];
+    std::filesystem::path fullpath;
     char *file;
     switch (index) {
     case 0:
@@ -130,10 +130,10 @@ bool taunt_PlayPlayerTaunt(int pnum, int index) {
       break;
     }
 
-    ddio_MakePath(fullpath, LocalCustomSoundsDir, file, NULL);
+    fullpath = LocalCustomSoundsDir / file;
 
     if (!cfexist(fullpath)) {
-      LOG_WARNING.printf("TAUNT: file %s doesn't exist (pnum=%d)", fullpath, pnum);
+      LOG_WARNING.printf("TAUNT: file %s doesn't exist (pnum=%d)", fullpath.u8string().c_str(), pnum);
       return false;
     }
 

Descent3/audiotaunts.h

@@ -45,6 +45,8 @@
 #ifndef __AUDIO_TAUNT_H_
 #define __AUDIO_TAUNT_H_
 
+#include <filesystem>
+
 extern bool Audio_taunts_enabled;
 
 // Error codes:
@@ -82,7 +84,7 @@ bool taunt_ImportWave(const char *wave_filename, const char *outputfilename);
 //	taunt_PlayTauntFile
 //
 //	Given a path to an .osf file, it will play it
-bool taunt_PlayTauntFile(const char *filename);
+bool taunt_PlayTauntFile(const std::filesystem::path &filename);
 
 //	taunt_PlayPlayerTaunt
 //

Descent3/d3movie.cpp

@@ -74,12 +74,16 @@ void mve_SetRenderProperties(int16_t x, int16_t y, int16_t w, int16_t h, rendere
 // plays a movie using the current screen.
 int mve_PlayMovie(const std::filesystem::path &pMovieName, oeApplication *pApp) {
 #ifndef NO_MOVIES
-  // first, find that movie..
+  // first, find that movie.
   std::filesystem::path real_name = cf_LocatePath("movies" / pMovieName);
+  if (real_name.empty()) {
+    LOG_ERROR << "MOVIE: File " << pMovieName << " not found, skipping playback";
+    return MVELIB_FILE_ERROR;
+  }
   // open movie file.
   FILE *hFile = fopen(real_name.u8string().c_str(), "rb");
   if (hFile == nullptr) {
-    LOG_ERROR.printf("MOVIE: Unable to open %s", real_name.u8string().c_str());
+    LOG_ERROR << "MOVIE: Unable to open " << pMovieName;
     return MVELIB_FILE_ERROR;
   }
 

Descent3/demofile.cpp

@@ -269,6 +269,7 @@
 #include <filesystem>
 
 #include "cfile.h"
+#include "ddio.h"
 #include "objinfo.h"
 #include "ship.h"
 #include "ui.h"
@@ -357,30 +358,41 @@ void DemoToggleRecording() {
   //	hand coded 128 because long filenames were failing in cfopen(which called fopen, which failed on very
   // long filenames.  instead of printing a message out to the user, just don't allow filenames that long)
   if (DoEditDialog(TXT_DEMOFILENAME, szfile, 128)) {
-    if (stricmp(szfile + (strlen(szfile) - 4), ".dem") != 0) {
-      strcat(szfile, ".dem");
+    std::filesystem::path demo_directory = cf_GetWritableBaseDirectory() / "demo";
+
+    std::error_code ec;
+    std::filesystem::create_directories(demo_directory, ec);
+    if (ec) {
+      LOG_ERROR << "Failed to create " << demo_directory << " directory. Unable to create demo file!";
+      AddBlinkingHUDMessage(TXT_DEMOCANTCREATE);
+      Demo_fname.clear();
+      return;
     }
-    Demo_fname = cf_GetWritableBaseDirectory() / "demo" / szfile;
-    LOG_INFO.printf("Saving demo to file: %s", Demo_fname.u8string().c_str());
+
+    Demo_fname = demo_directory / szfile;
+    Demo_fname.replace_extension(".dem");
+
+    LOG_INFO << "Saving demo to file " << Demo_fname;
     // Try to create the file
     Demo_cfp = cfopen(Demo_fname, "wb");
-    if (Demo_cfp) {
-      // Setup the demo variables
-      if (!(Game_mode & GM_MULTI)) {
-        MultiBuildMatchTables();
-      }
-      // Male sure we write the player info the first frame
-      Demo_last_pinfo = timer_GetTime() - (DEMO_PINFO_UPDATE * 2);
-      Demo_flags = DF_RECORDING;
-      // Write the header
-      DemoWriteHeader();
-      DemoStartNewFrame();
-    } else {
+    if (!Demo_cfp) {
       // cfopen failed
+      LOG_ERROR << "Unable to create demo file!";
       AddBlinkingHUDMessage(TXT_DEMOCANTCREATE);
       Demo_fname.clear();
       return;
     }
+
+    // Set up the demo variables
+    if (!(Game_mode & GM_MULTI)) {
+      MultiBuildMatchTables();
+    }
+    // Male sure we write the player info the first frame
+    Demo_last_pinfo = timer_GetTime() - (DEMO_PINFO_UPDATE * 2);
+    Demo_flags = DF_RECORDING;
+    // Write the header
+    DemoWriteHeader();
+    DemoStartNewFrame();
   }
 }
 

Descent3/descent.cpp

@@ -707,5 +707,3 @@ void D3DebugResumeHandler() {
 }
 
 #endif
-
-void RenderBlankScreen();