WebSVN – Kolibri OS – Diff – /programs/games/doom/trunk/w_wad.c

 #include "w_wad.h"
+#include
+extern char *main_file;
+#ifdef DLHEAP
+void* _cdecl dlmalloc(size_t);
+void  _cdecl dlfree(void*);
+void _cdecl mf_init();
+#define malloc dlmalloc
+#define free dlfree
+#define realloc dlrealloc
+#endif
+size_t FileSize(FILE *handle);
+int _stdcall read_file (char *name, void *buff,
+                        size_t offset, size_t count, size_t *reads);
 #include
 //
 // GLOBALS
 //
-// Location of each lump on disk.
-lumpinfo_t*		lumpinfo;
-int			numlumps;
-void**			lumpcache;
-int filelength (FILE *handle)
-{
-    unsigned long pos, size;
-    pos = ftell(handle);
-    fseek(handle, 0, SEEK_END);
-    size = ftell(handle);
+// Location of each lump on disk.
-    fseek(handle, pos, SEEK_SET);
+lumpinfo_t*             lumpinfo;
-    return (int)size;
+int                     numlumps;
 void**                  lumpcache;
 //
 // If filename starts with a tilde, the file is handled
 //  specially to allow map reloads.
 // But: the reload feature is a fragile hack...
-#ifdef __BEOS__
-#ifdef __GNUC__
-extern void *alloca(int);
-#else
-#include
-#endif
 #endif /* __BEOS__ */
-    int			length;
+    int                 length;
-    int			startlump;
+    int                 startlump;
-    filelump_t*		fileinfo;
+    filelump_t*         fileinfo;
-    filelump_t		singleinfo;
+    filelump_t          singleinfo;
-    int			storehandle;
+    int                 storehandle;
+    int err;
+    size_t bytes;
     // open the file and add to directory
+    {
-      printf (" couldn't open %s\n",filename);
+       printf (" couldn't open %s\n",filename);
-	return;
+       return;
+    }
-    printf (" adding %s\n",filename);
+    printf (" adding %s\n\r",filename);
     startlump = numlumps;
-    if (I_strncasecmp (filename+strlen(filename)-3 , "wad", 3 ) )
+    if (strnicmp (filename+strlen(filename)-3 , "wad", 3 ) )
+    {
-	// single lump file
+        // single lump file
-	fileinfo = &singleinfo;
+        fileinfo = &singleinfo;
-	singleinfo.filepos = 0;
+        singleinfo.filepos = 0;
-	singleinfo.size = LONG(filelength(handle));
+        singleinfo.size = FileSize(handle);
-	ExtractFileBase (filename, singleinfo.name);
+        ExtractFileBase (filename, singleinfo.name);
-	numlumps++;
+        numlumps++;
+    }
     else
-    {
 	 //WAD file
-	printf("f1 at %x,%u\n",&header,handle);
+         //WAD file
-	fread (&header, 1, sizeof(header), handle);
+        fread (&header, 1, sizeof(header), handle);
     printf("f2\n");
-	if (strncmp(header.identification,"IWAD",4))
+        if (strncmp(header.identification,"IWAD",4))
+        {
-	    printf("No IWAD id\n");
+            printf("No IWAD id\n");
-	    // Homebrew levels?
+            // Homebrew levels?
-	    if (strncmp(header.identification,"PWAD",4))
+            if (strncmp(header.identification,"PWAD",4))
+            {
-		I_Error ("Wad file %s doesn't have IWAD "
+                I_Error ("Wad file %s doesn't have IWAD "
-			 "or PWAD id\n", filename);
+                         "or PWAD id\n", filename);
+            }
-//	    printf("WAD magic OK\n");
+            printf("WAD magic OK\n");
-	    // ???modifiedgame = true;
             // ???modifiedgame = true;
-	printf("after checking hdr\n");
+        }
-	header.numlumps = LONG(header.numlumps);
+        header.numlumps = LONG(header.numlumps);
-    printf("%u lumps in WAD\n",header.numlumps);
-	header.infotableofs = LONG(header.infotableofs);
+        header.infotableofs = LONG(header.infotableofs);
-    printf("infor table at %x\n",header.infotableofs);
-	length = header.numlumps*sizeof(filelump_t);
+        length = header.numlumps*sizeof(filelump_t);
-    printf("length %u\n",length);
 	fileinfo = alloca(length);
-    printf("seeking to info table\n");
+        fileinfo = alloca(length);
-	fseek (handle, header.infotableofs, SEEK_SET);
     printf("f3\n");
-	fread (fileinfo, 1, length, handle);
+        fseek (handle, header.infotableofs, SEEK_SET);
-    printf("f4\n");
+        fread (fileinfo, 1, length, handle);
-	return;
+        return;
     if ( (handle = fopen (reloadname,"rb")) == NULL)
-	I_Error ("W_Reload: couldn't open %s",reloadname);
         I_Error ("W_Reload: couldn't open %s",reloadname);
-    printf("f5\n");
     fread (&header, 1, sizeof(header), handle);
     printf("f6\n");
     lumpcount = LONG(header.numlumps);
     header.infotableofs = LONG(header.infotableofs);
     length = lumpcount*sizeof(filelump_t);
-    fileinfo = malloc (length);
-    fseek (handle, header.infotableofs, SEEK_SET);
+    fileinfo = malloc (length);
-    printf("f7\n");
-    fread (fileinfo, 1, length, handle);
+    fseek (handle, header.infotableofs, SEEK_SET);
-    printf("f8\n");
+    fread (fileinfo, 1, length, handle);
+    }
     fclose (handle);
-}
+}
 //
 // W_InitMultipleFiles
 // Pass a null terminated list of files to use.
     // open all the files, load headers, and count lumps
     numlumps = 0;
     // will be realloced as lumps are added
-    lumpinfo = malloc(1);
+    lumpinfo = malloc(16384);
-  void*		dest )
+  void*         dest )
+{
-    int		c;
+    int         c;
-    lumpinfo_t*	l;
+    lumpinfo_t* l;
-    FILE	*handle;
+    FILE        *handle;
+    size_t bytes;
     if (lump >= numlumps)
-	I_Error ("W_ReadLump: %i >= numlumps",lump);
+        I_Error ("W_ReadLump: %i >= numlumps",lump);
-( int		lump,
+( int           lump,
-  int		tag )
+  int           tag )
+{
-    byte*	ptr;
+    byte*       ptr;
-    if ((unsigned)lump >= numlumps)
+    if ((unsigned)lump >= (unsigned)numlumps)
-	I_Error ("W_CacheLumpNum: %i >= numlumps",lump);
+        I_Error ("W_CacheLumpNum: %i >= numlumps",lump);
     if (!lumpcache[lump])
-		break;
+                break;
-	for ( ; j<8 ; j++)
+        for ( ; j<8 ; j++)
-	    name[j] = ' ';
+            name[j] = ' ';
-	printf ("%s ",name);
+        //printf ("%s ",name);
-	for (j=0 ; j
+        for (j=0 ; j
-	    fprintf (f,"    %c",info[i][j]);
+            fprintf (f,"    %c",info[i][j]);
-	printf ("\n");
+        //printf ("\n");
+    }
+    fclose (f);
+}
+#endif

Subversion Repositories Kolibri OS

(root)/programs/games/doom/trunk/w_wad.c – Rev 300 → 333