Fixed DOOMWADDIR path construction in createPackagesResourceNamespace.

skyjake · Jan 28, 2011 · 62eb660 · 62eb660
1 parent b3c3e53
commit 62eb660
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/doomsday/engine/portable/src/p_materialmanager.c b/doomsday/engine/portable/src/p_materialmanager.c
@@ -1408,10 +1408,11 @@ static size_t printMaterials2(materialnamespaceid_t mnamespace, const char* like
     // Sort and print the index.
     qsort(foundMaterials, count, sizeof(*foundMaterials), compareMaterialBindByName);
 
-    { const materialbind_t** ptr;
+    { materialbind_t* const* ptr;
     for(ptr = foundMaterials; *ptr; ++ptr)
     {
-        printMaterialInfo(*ptr, (mnamespace == MN_ANY));
+        const materialbind_t* mb = *ptr;
+        printMaterialInfo(mb, (mnamespace == MN_ANY));
     }}
 
     free(foundMaterials);

diff --git a/doomsday/engine/portable/src/sys_reslocator.c b/doomsday/engine/portable/src/sys_reslocator.c
@@ -424,7 +424,7 @@ static void createPackagesResourceNamespace(void)
         char last = Str_RAt(path, 0); \
         ddstring_t* pathCopy = Str_New(); \
         if(last != DIR_SEP_CHAR && last != DIR_WRONG_SEP_CHAR) \
-            Str_Appendf(doomWadDir, "%s"DIR_SEP_STR, (path)); \
+            Str_Appendf(doomWadDir, "%s"DIR_SEP_STR, Str_Text(path)); \
         else \
             Str_Copy(pathCopy, (path)); \
         doomWadPaths = realloc(doomWadPaths, sizeof(*doomWadPaths) * ++doomWadPathsCount); \