DescentDevelopers · Arcnor · Apr 23, 2024 · Apr 19, 2024 · Apr 19, 2024 · Apr 19, 2024
diff --git a/2dlib/CMakeLists.txt b/2dlib/CMakeLists.txt
@@ -10,4 +10,6 @@ set(CPPS
   viewport.cpp)
 
 add_library(2dlib STATIC ${HEADERS} ${CPPS})
-
+target_link_libraries(2dlib PRIVATE
+  cfile
+)
diff --git a/2dlib/font.cpp b/2dlib/font.cpp
@@ -120,7 +120,7 @@
 #include "renderer.h"
 #include "gr.h"
 #include "mono.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "bitmap.h"
 #include "mem.h"
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -104,7 +104,12 @@ if(LOGGER)
   add_definitions(-DLOGGER)
 endif()
 
-include_directories("lib" "Descent3" ${PLATFORM_INCLUDES})
+include_directories(
+  "cfile"   # TODO: Remove after untying all modules
+  "lib"     # TODO: Remove after untying all modules
+  "Descent3"
+  ${PLATFORM_INCLUDES}
+)
 
 # file(GLOB_RECURSE INCS "*.h")
 

diff --git a/Descent3/BriefingParse.cpp b/Descent3/BriefingParse.cpp
@@ -65,7 +65,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include "CFILE.H"
+#include "cfile.h"
 #include "pserror.h"
 #include "game.h"
 #include "mem.h"
@@ -242,7 +242,7 @@ int ReadFullLine(char **data, CFILE *ifile) {
     // read in a byte
     c = cfgetc(ifile);
 
-    if ((c == EOF) || (!(ifile->flags & CF_TEXT) && (c == 0)) || ((ifile->flags & CF_TEXT) && (c == '\n'))) {
+    if ((c == EOF) || (!(ifile->flags & CFF_TEXT) && (c == 0)) || ((ifile->flags & CFF_TEXT) && (c == '\n'))) {
       // we've hit the end of the line
       done = true;
     } else {

diff --git a/Descent3/ConfigItem.cpp b/Descent3/ConfigItem.cpp
@@ -95,7 +95,7 @@
 #include "ddio.h"
 #include "gamefont.h"
 #include "multi_ui.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "mem.h"
 #include "game.h"
 #include "stringtable.h"

diff --git a/Descent3/DllWrappers.cpp b/Descent3/DllWrappers.cpp
@@ -19,7 +19,7 @@
 #include "DllWrappers.h"
 #include "pserror.h"
 #include "pstring.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "gamefont.h"
 #include "grdefs.h"
 #include "descent.h"

diff --git a/Descent3/DllWrappers.h b/Descent3/DllWrappers.h
@@ -20,7 +20,7 @@
 #define DLLWRAPPERS_H_
 
 #include "pserror.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "gamefont.h"
 #include "grdefs.h"
 #include "descent.h"

diff --git a/Descent3/Inventory.h b/Descent3/Inventory.h
@@ -182,7 +182,7 @@
 #define __INVENTORY_H__
 
 #include "pstypes.h"
-#include "CFILE.H"
+#include "cfile.h"
 
 struct object;
 

diff --git a/Descent3/LoadLevel.cpp b/Descent3/LoadLevel.cpp
@@ -1248,7 +1248,7 @@
 
 #include "LoadLevel.h"
 
-#include "CFILE.H"
+#include "cfile.h"
 
 #include "descent.h"
 #include "object.h"

diff --git a/Descent3/LoadLevel.h b/Descent3/LoadLevel.h
@@ -443,7 +443,7 @@
  * $NoKeywords: $
  */
 
-#include "CFILE.H"
+#include "cfile.h"
 #include "room.h"
 
 // Chunk types

diff --git a/Descent3/Mission.cpp b/Descent3/Mission.cpp
@@ -640,7 +640,7 @@
 #include "3d.h"
 #include "LoadLevel.h"
 #include "pserror.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "gamefont.h"
 #include "grdefs.h"
 #include "descent.h"

diff --git a/Descent3/OsirisLoadandBind.cpp b/Descent3/OsirisLoadandBind.cpp
@@ -402,7 +402,7 @@
 #include "osiris_dll.h"
 #include "pserror.h"
 #include "mono.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "ddio.h"
 #include "manage.h"
 #include <stdlib.h>
@@ -917,11 +917,11 @@ int _get_full_path_to_module(char *module_name, char *fullpath, char *basename)
 
   int exist = cfexist(modfilename);
   switch (exist) {
-  case CF_ON_DISK:
+  case CFES_ON_DISK:
     ddio_MakePath(fullpath, LocalScriptDir, modfilename, NULL);
     return -1;
     break;
-  case CF_IN_LIBRARY: {
+  case CFES_IN_LIBRARY: {
     ASSERT(OSIRIS_Extracted_script_dir);
     if (!OSIRIS_Extracted_script_dir)
       return -2;

diff --git a/Descent3/PilotPicsAPI.cpp b/Descent3/PilotPicsAPI.cpp
@@ -63,7 +63,7 @@
 #include "bitmap.h"
 #include "player.h"
 #include "pilot.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "mono.h"
 #include "ddio.h"
 #include "manage.h"

diff --git a/Descent3/TelCom.cpp b/Descent3/TelCom.cpp
@@ -501,7 +501,7 @@
 #include "ddio.h"
 #include "descent.h"
 #include "game.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "application.h"
 #include "TelCom.h"
 #include "TelComEffects.h"

diff --git a/Descent3/TelComAutoMap.cpp b/Descent3/TelComAutoMap.cpp
@@ -151,7 +151,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "CFILE.H"
+#include "cfile.h"
 #include "pserror.h"
 #include "ddio.h"
 #include "bitmap.h"

diff --git a/Descent3/TelComCargo.cpp b/Descent3/TelComCargo.cpp
@@ -82,7 +82,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "CFILE.H"
+#include "cfile.h"
 #include "pserror.h"
 #include "ddio.h"
 #include "bitmap.h"

diff --git a/Descent3/TelComGoals.cpp b/Descent3/TelComGoals.cpp
@@ -85,7 +85,7 @@
 #include <string.h>
 #include <ctype.h>
 
-#include "CFILE.H"
+#include "cfile.h"
 #include "pserror.h"
 #include "ddio.h"
 #include "bitmap.h"

diff --git a/Descent3/aiambient.cpp b/Descent3/aiambient.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
@@ -16,10 +16,10 @@
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <stdlib.h>
 #include "aiambient.h"
 #include "string.h"
 #include "objinfo.h"
-#include <stdlib.h>
 #include "game.h"
 #include "psrand.h"
 

diff --git a/Descent3/aiambient.h b/Descent3/aiambient.h
@@ -19,7 +19,7 @@
 #ifndef _AIAMBIENT_H_
 #define _AIAMBIENT_H_
 
-#include "CFILE.H"
+#include "cfile.h"
 
 #define MAX_AL_TYPES 6
 #define MAX_ALS_PER_TYPE 130

diff --git a/Descent3/ambient.cpp b/Descent3/ambient.cpp
@@ -156,7 +156,6 @@ void InitAmbientSounds() {
 }
 
 #include "ddio.h"
-#include "CFILE.H"
 #include "soundload.h"
 #include "descent.h"
 #include "mem.h"

diff --git a/Descent3/audiotaunts.cpp b/Descent3/audiotaunts.cpp
@@ -24,7 +24,7 @@
 #include "pserror.h"
 #include "pstypes.h"
 #include "audiotaunts.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "audio_encode.h"
 #include "byteswap.h"
 #include "mem.h"

diff --git a/Descent3/bsp.h b/Descent3/bsp.h
@@ -43,7 +43,7 @@
 
 #include "list.h"
 #include "vecmat.h"
-#include "CFILE.H"
+#include "cfile.h"
 
 #define BSP_IN_FRONT 1
 #define BSP_BEHIND 2

diff --git a/Descent3/buddymenu.cpp b/Descent3/buddymenu.cpp
@@ -59,7 +59,7 @@
 #include "ddio.h"
 #include "descent.h"
 #include "game.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "application.h"
 #include <stdlib.h>
 #include <string.h>

diff --git a/Descent3/config.cpp b/Descent3/config.cpp
@@ -296,7 +296,7 @@
 #include "cinematics.h"
 #include "hlsoundlib.h"
 #include "terrain.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "mem.h"
 #include "lighting.h"
 #include "PHYSICS.H"

diff --git a/Descent3/d3serial.cpp b/Descent3/d3serial.cpp
@@ -83,7 +83,7 @@
 #include "descent.h"
 #include <time.h>
 #include "mono.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "program.h"
 
 #include <fcntl.h>

diff --git a/Descent3/dedicated_server.cpp b/Descent3/dedicated_server.cpp
@@ -112,8 +112,8 @@ typedef int socklen_t;
 #include "pstypes.h"
 #include "pserror.h"
 #include "pstring.h"
-#include "CFILE.H"
-#include "InfFile.h"
+#include "cfile.h"
+#include "inffile.h"
 #include "dedicated_server.h"
 #include "multi.h"
 #include "args.h"

diff --git a/Descent3/demofile.cpp b/Descent3/demofile.cpp
@@ -266,7 +266,7 @@
  */
 
 #include <stdio.h>
-#include "CFILE.H"
+#include "cfile.h"
 #include "objinfo.h"
 #include "ship.h"
 #include "ui.h"

diff --git a/Descent3/descent.cpp b/Descent3/descent.cpp
@@ -385,7 +385,7 @@
 #include "pserror.h"
 #include "grdefs.h"
 #include "mono.h"
-#include "CFILE.H"
+#include "cfile.h"
 
 #include "init.h"
 #include "game.h"

diff --git a/Descent3/game.cpp b/Descent3/game.cpp
@@ -676,7 +676,7 @@
 #include "cinematics.h"
 #include "SmallViews.h"
 #include "Mission.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "gameloop.h"
 #include "cockpit.h"
 #include "game2dll.h"

diff --git a/Descent3/gamesave.cpp b/Descent3/gamesave.cpp
@@ -266,7 +266,7 @@
 #include "gamesave.h"
 #include "descent.h"
 #include "newui.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "Mission.h"
 #include "gamesequence.h"
 #include "gameevent.h"

diff --git a/Descent3/gamesave.h b/Descent3/gamesave.h
@@ -85,7 +85,7 @@
 #define GAMESAVE_H
 
 #include "pstypes.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "object.h"
 #include "objinfo.h"
 

diff --git a/Descent3/help.cpp b/Descent3/help.cpp
@@ -132,7 +132,7 @@
 #include "ddio.h"
 #include "descent.h"
 #include "game.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "application.h"
 #include <stdlib.h>
 #include <string.h>

diff --git a/Descent3/hotspotmap.cpp b/Descent3/hotspotmap.cpp
@@ -105,7 +105,7 @@
 #include "ddio.h"
 #include "descent.h"
 #include "game.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "application.h"
 #include <stdlib.h>
 #include <string.h>

diff --git a/Descent3/levelgoal.h b/Descent3/levelgoal.h
@@ -20,7 +20,7 @@
 #define _LEVELGOAL_H_
 
 #include "object.h"
-#include "CFILE.H"
+#include "cfile.h"
 #if defined(MACOSX)
 #include <malloc/malloc.h>
 #else

diff --git a/Descent3/lnxmain.cpp b/Descent3/lnxmain.cpp
@@ -35,6 +35,7 @@
 #include <dirent.h>
 #define _GNU_SOURCE
 #include <fnmatch.h>
+#include "hogfile.h"
 #endif
 
 #include "SDL.h"
@@ -330,8 +331,6 @@ void StartDedicatedServer();
 
 static void hogfileRefresh(const char *x) { printf(" - %s\n", x); } // hogfileRefresh
 
-int CreateNewHogFile(const char *hogname, int nfiles, const char **filenames, void (*UpdateFunction)(char *));
-
 // hack of the century.
 static void buildNewHogFromFileList(char *fileName) {
   setbuf(stdout, NULL);
@@ -422,7 +421,7 @@ static void buildNewHogFromFileList(char *fileName) {
     }   // for
   } while (swapped);
 
-  CreateNewHogFile("new.hog", i, (const char **)files, (void (*)(char *))hogfileRefresh);
+  NewHogFile("new.hog", i, (const char **)files, (void (*)(char *))hogfileRefresh);
 } // buildNewHogFileFromList
 
 #endif

diff --git a/Descent3/loadstate.cpp b/Descent3/loadstate.cpp
@@ -181,7 +181,7 @@
 
 #include "gamesave.h"
 #include "descent.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "Mission.h"
 #include "gamesequence.h"
 #include "gameevent.h"

diff --git a/Descent3/localization.cpp b/Descent3/localization.cpp
@@ -91,7 +91,7 @@
 #include "game.h"
 #include "descent.h"
 #include "mono.h"
-#include "CFILE.H"
+#include "cfile.h"
 #include "localization.h"
 #include "mem.h"
 #include "ddio.h"

diff --git a/Descent3/matcen.h b/Descent3/matcen.h
@@ -19,7 +19,7 @@
 #ifndef _MATCEN_H_
 #define _MATCEN_H_
 
-#include "CFILE.H"
+#include "cfile.h"
 #include "vecmat.h"
 #include "matcen_external.h"