Mercurial > hg > dmlib

changeset 2106:78a0f44aa8b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean out the resource path handling.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 08 May 2019 13:56:10 +0300
parents eebe338b3c39
children 8962901faf5d
files src/dmengine.h src/dmlib.h src/dmres.c src/dmsimple.c
diffstat 4 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/dmengine.h	Mon Apr 29 14:09:01 2019 +0300
+++ b/src/dmengine.h	Wed May 08 13:56:10 2019 +0300
@@ -264,7 +264,7 @@
     BOOL optVidNative;
 
     int optResFlags;
-    char *optDataPath, *optPackFilename;
+    char *optPackFilename;
 
     // Audio related
     SDL_AudioSpec optAfmt;
--- a/src/dmlib.h	Mon Apr 29 14:09:01 2019 +0300
+++ b/src/dmlib.h	Wed May 08 13:56:10 2019 +0300
@@ -138,8 +138,6 @@
 
 // Resource management defines
 #define DMRES_NAME_LEN  32
-#define DMRES_DATA_PACK	"data.pak"  // Name of the data-file
-#define DMRES_DATA_PATH	"data/"     // Sub-directory path
 #define DMRES_RES_FILE  "res.txt"   // Resource data file
 
 
--- a/src/dmres.c	Mon Apr 29 14:09:01 2019 +0300
+++ b/src/dmres.c	Wed May 08 13:56:10 2019 +0300
@@ -174,7 +174,8 @@
  */
 static int dm_stdio_fopen(DMResource *handle)
 {
-    char *rfilename = dm_strdup_printf("%s%s", DMRES_DATA_PATH, handle->filename);
+    char *dpath = handle->lib != NULL ? handle->lib->resPath : NULL;
+    char *rfilename = dm_strdup_printf("%s%s", dpath != NULL ? dpath : "", handle->filename);
     if (rfilename == NULL)
         return DMERR_MALLOC;
 
@@ -1086,7 +1087,7 @@
     // Basic data
     lib->mutex    = dmCreateMutex();
     lib->flags    = flags;
-    lib->resPath  = dm_strdup((path != NULL) ? path : DMRES_DATA_PATH);
+    lib->resPath  = dm_strdup(path);
 
 
 #ifdef DM_USE_PACKFS
@@ -1095,7 +1096,7 @@
         int ret;
         DMPackEntry *node;
 
-        lib->packFilename = dm_strdup((filename != NULL) ? filename : DMRES_DATA_PACK);
+        lib->packFilename = dm_strdup(filename);
 
         // Initialize PACK, open as read-only
         ret = dmPackOpen(lib->packFilename, &lib->packFile, TRUE);
--- a/src/dmsimple.c	Mon Apr 29 14:09:01 2019 +0300
+++ b/src/dmsimple.c	Wed May 08 13:56:10 2019 +0300
@@ -664,8 +664,9 @@
 
     // Initialize resource subsystem
     dmPrint(1, "Initializing resources subsystem.\n");
-    if ((err = dmResourcesInit(&engine.resources, engine.optPackFilename,
-        engine.optDataPath, engine.optResFlags, engineClassifier)) != DMERR_OK)
+    if ((err = dmResourcesInit(&engine.resources,
+        engine.optPackFilename, "data/",
+        engine.optResFlags, engineClassifier)) != DMERR_OK)
     {
         dmErrorMsg(
             "Could not initialize resource manager, #%d: %s.\n",