shithub: riscv

Download patch

ref: fdb1698791dc51dbf690fec4a1d1c7b6a4b52345
parent: c4ae1a74357c419b8106a2c0e51d941e2b415a61
author: cinap_lenrek <cinap_lenrek@felloff.net>
date: Wed Jul 29 10:51:00 EDT 2015

games/doom: implement filelength() (thanks quux)

this function is used when playing demos from external lumps. the game just
exits without this patch.
to test this, download a demo lump from somewhere, and play it with -playdemo %s
where %s is the file's name, without the .lmp extension:

(note that this one is a doom 2 demo, so it requires doom2.wad)
% hget http://doomedsda.us/lmps/945/3/30nm2939.zip | unzip -sv
extracting 30nm2939.LMP
extracting 30nm2939.txt
% mv 30nm2939.LMP 30nm2939.lmp	# checking for a lump filename is case sensitive
% games/doom -playdemo 30nm2939

the game exits when the demo ends. also, note that this demo will desync on
map06 (the crusher), because of an unrelated bug (that's another patch :>)

note: filelength() returns vlong, but file lengths for doom lumps are ints.
however, this might be used elsewhere (networking), so i'd leave it this way.

--- a/sys/src/games/doom/w_wad.c
+++ b/sys/src/games/doom/w_wad.c
@@ -64,19 +64,18 @@
     while (*s) { *s = toupper(*s); s++; }
 }
 
-int filelength (int handle) 
+vlong
+filelength(int fd) 
 {
-	USED(handle);
-	I_Error ("PORTME w_wad.c filelength");
-	return -1;
-/*
-    struct stat	fileinfo;
-    
-    if (fstat (handle,&fileinfo) == -1)
-	I_Error ("Error fstating");
+	vlong l;
+	Dir *d;
 
-    return fileinfo.st_size;
-*/
+	d = dirfstat(fd);
+	if(d == nil)
+		sysfatal("dirfstat: %r");
+	l = d->length;
+	free(d);
+	return l;	/* lump file lenghts in doom are ints */
 }