swars: Remade open_file_from_wad()

Author: mefistotelis

src/swars.sx

@@ -183638,15 +183638,6 @@ ascB:	/* 0x15BF1F */
 aSMap03d_bB:	/* 0x15BF24 */
 		.string "%s/map%03d.b&b"
 
-qdata_keys_dat_2:
-		.string "qdata/keys.dat"
-
-aSyndicate02d02:	/* 0x15C035 */
-		.string "SYNDICATE %02d:%02d:%02d NC"
-aChurch02d02d02:	/* 0x15C051 */
-		.string "CHURCH %02d:%02d:%02d NC"
-aUnguided02d02d:	/* 0x15C06A */
-		.string "UNGUIDED %02d:%02d:%02d NC"
 aS_idx:	/* 0x15C085 */
 		.string "%s.idx"
 aS_wad:	/* 0x15C08C */

src/wadfile.c

@@ -29,22 +29,9 @@
 #include "swlog.h"
 /******************************************************************************/
 
-TbFileHandle open_file_from_wad(const char *filename, const char *wadfile)
-{
-    TbFileHandle ret;
-    asm volatile ("call ASM_open_file_from_wad\n"
-        : "=r" (ret) : "a" (filename), "d" (wadfile));
-    return ret;
-}
-
-int load_file_wad(const char *filename, const char *wadfile, void *outbuf)
+TbResult wadfile_format_entfile_name(char *entfile, const char *filename)
 {
-    char locfname[DISKPATH_SIZE];
-    char locstr[64];
-    struct WADIndexEntry fentry;
     const char *only_fname;
-    TbFileHandle fh;
-    long nread;
     int i;
 
     only_fname = strrchr(filename, '/');
@@ -55,29 +42,97 @@ int load_file_wad(const char *filename, const char *wadfile, void *outbuf)
 
     for (i = 0; only_fname[i] != '\0'; i++)
     {
-        locstr[i] = toupper(only_fname[i]);
+        // Does not make sense to format WAD entry name longer than size within index
+        if (i >= (int)sizeof(((struct WADIndexEntry *)0)->Filename)) {
+            entfile[i-1] = '\0';
+            return Lb_FAIL;
+        }
+        entfile[i] = toupper(only_fname[i]);
     }
-    locstr[i] = '\0';
+    entfile[i] = '\0';
+
+    return Lb_SUCCESS;
+}
+
+TbResult wadfile_find_index_entry(struct WADIndexEntry *fentry, const char *wadfile, const char *entfile)
+{
+    char locfname[DISKPATH_SIZE];
+    TbFileHandle fh;
+    int nread;
 
     sprintf(locfname, "%s.idx", wadfile);
     fh = LbFileOpen(locfname, Lb_FILE_MODE_READ_ONLY);
     if (fh == INVALID_FILE)
-        return -1;
+        return Lb_FAIL;
+
     do {
-        nread = LbFileRead(fh, &fentry, sizeof(struct WADIndexEntry));
-    } while ((strcmp(locstr, fentry.Filename) != 0) &&
+        nread = LbFileRead(fh, fentry, sizeof(struct WADIndexEntry));
+    } while ((strcmp(entfile, fentry->Filename) != 0) &&
       (nread == sizeof(struct WADIndexEntry)));
+
     LbFileClose(fh);
 
     if (nread != sizeof(struct WADIndexEntry))
+        return Lb_FAIL;
+
+    return Lb_SUCCESS;
+}
+
+TbFileHandle open_file_from_wad(const char *filename, const char *wadfile)
+{
+#if 0
+    TbFileHandle ret;
+    asm volatile ("call ASM_open_file_from_wad\n"
+        : "=r" (ret) : "a" (filename), "d" (wadfile));
+    return ret;
+#else
+    char locfname[DISKPATH_SIZE];
+    char locstr[64];
+    struct WADIndexEntry fentry;
+    TbFileHandle fh;
+    TbResult ret;
+
+    ret = wadfile_format_entfile_name(locstr, filename);
+    if (ret != Lb_SUCCESS)
+        return INVALID_FILE;
+
+    ret = wadfile_find_index_entry(&fentry, wadfile, locstr);
+    if (ret != Lb_SUCCESS)
+        return INVALID_FILE;
+
+    sprintf(locfname, "%s.wad", wadfile);
+    fh = LbFileOpen(locfname, Lb_FILE_MODE_READ_ONLY);
+    if (fh == INVALID_FILE)
+        return fh;
+
+    LbFileSeek(fh, fentry.Offset, Lb_FILE_SEEK_BEGINNING);
+    return fh;
+#endif
+}
+
+int load_file_wad(const char *filename, const char *wadfile, void *outbuf)
+{
+    char locfname[DISKPATH_SIZE];
+    char locstr[64];
+    struct WADIndexEntry fentry;
+    TbFileHandle fh;
+    TbResult ret;
+    long nread;
+
+    ret = wadfile_format_entfile_name(locstr, filename);
+    if (ret != Lb_SUCCESS)
+        return -1;
+
+    ret = wadfile_find_index_entry(&fentry, wadfile, locstr);
+    if (ret != Lb_SUCCESS)
         return -1;
 
     sprintf(locfname, "%s.wad", wadfile);
     fh = LbFileOpen(locfname, Lb_FILE_MODE_READ_ONLY);
     if (fh == INVALID_FILE)
         return -1;
 
-    LbFileSeek(fh, fentry.Offset, 0);
+    LbFileSeek(fh, fentry.Offset, Lb_FILE_SEEK_BEGINNING);
     nread = LbFileRead(fh, outbuf, fentry.Length);
     LbFileClose(fh);
     return nread;