xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

doom: fix music for patch wads

Browse source 
revert last change, which used games/wadfs to expose genmidi and music lumps.
replacements from patch wads were never seen that way.  instead, write genmidi
and music lumps to /tmp and play them from there.
This commit is contained in:
qwx 2018-10-21 00:11:39 +02:00
parent b4eb667f02
commit f5c6a870bf
3 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rc/bin/dmus
View file

@ -1,6 +1,6 @@
#!/bin/rc #!/bin/rc
if(test -f /mnt/wad/genmidi) if(test -f /tmp/genmidi.*)
c=(games/dmid '|' games/opl3) c=(games/dmid -i /tmp/genmidi.* '|' games/opl3)
if not if not
c=(games/midi -c) c=(games/midi -c)
if(~ `{file -m $1} audio/mus) if(~ `{file -m $1} audio/mus)

5
sys/src/games/doom/d_main.c
View file

@ -635,11 +635,6 @@ void IdentifyVersion (void)
gamemode = indetermined; gamemode = indetermined;
return; return;
} }
if(gamemode != indetermined && rfork(RFPROC|RFFDG) == 0){
close(2);
execl("/bin/games/wadfs", "wadfs", wadfile, nil);
sysfatal("execl: %r");
}
strncpy(basedefault, wadfile, sizeof(basedefault)-5); strncpy(basedefault, wadfile, sizeof(basedefault)-5);
basedefault[sizeof(basedefault)-5] = '\0'; basedefault[sizeof(basedefault)-5] = '\0';
slash = strrchr(basedefault, '/'); slash = strrchr(basedefault, '/');

23
sys/src/games/doom/i_sound.c
View file

@ -422,6 +422,19 @@ void I_UpdateSoundParams(int handle, int vol, int sep, int pitch)
void I_InitMusic(void) void I_InitMusic(void)
{ {
int fd, n, sz;
char name[64];
uchar *gm;
n = W_GetNumForName("GENMIDI");
sz = W_LumpLength(n);
gm = (uchar *)W_CacheLumpNum(n, PU_STATIC);
snprint(name, sizeof(name), "/tmp/genmidi.%d", getpid());
if((fd = create(name, ORDWR|ORCLOSE, 0666)) < 0)
sysfatal("create: %r");
if(write(fd, gm, sz) != sz)
sysfatal("write: %r");
Z_Free(gm);
} }
void I_ShutdownMusic(void) void I_ShutdownMusic(void)
@ -462,7 +475,15 @@ void I_PlaySong(musicinfo_t *m, int loop)
case 0: case 0:
dup(mpfd[1], 1); dup(mpfd[1], 1);
for(n=3; n<20; n++) close(n); for(n=3; n<20; n++) close(n);
snprint(name, sizeof(name), "/mnt/wad/d_%s", m->name); close(0);
snprint(name, sizeof(name), "/tmp/doom.%d", getpid());
if(create(name, ORDWR|ORCLOSE, 0666) != 0)
sysfatal("create: %r");
n = W_LumpLength(m->lumpnum);
if(write(0, m->data, n) != n)
sysfatal("write: %r");
if(seek(0, 0, 0) != 0)
sysfatal("seek: %r");
if(bind("/fd/1", "/dev/audio", MREPL) < 0) if(bind("/fd/1", "/dev/audio", MREPL) < 0)
sysfatal("bind: %r"); sysfatal("bind: %r");
while(loop && fork() > 0){ while(loop && fork() > 0){