5ea5107654
Address PR 24024 by marking it as not-for-lp64platforms.
66 lines
1.9 KiB
Text
66 lines
1.9 KiB
Text
$NetBSD: patch-ac,v 1.5 2010/02/22 21:58:47 wiz Exp $
|
|
|
|
--- linuxdoom-1.10/d_main.c.orig Mon Dec 22 20:32:03 1997
|
|
+++ linuxdoom-1.10/d_main.c Thu Feb 3 13:35:25 2000
|
|
@@ -577,7 +577,11 @@
|
|
char *doomwaddir;
|
|
doomwaddir = getenv("DOOMWADDIR");
|
|
if (!doomwaddir)
|
|
+#ifdef INSTALL_PREFIX
|
|
+ doomwaddir = INSTALL_PREFIX"/share/doom";
|
|
+#else
|
|
doomwaddir = ".";
|
|
+#endif
|
|
|
|
// Commercial.
|
|
doom2wad = malloc(strlen(doomwaddir)+1+9+1);
|
|
@@ -804,7 +808,32 @@
|
|
|
|
setbuf (stdout, NULL);
|
|
modifiedgame = false;
|
|
-
|
|
+
|
|
+ if (myargc > 1 && strcmp(myargv[1], "-h")==0)
|
|
+ {
|
|
+ printf(
|
|
+"Many options are not explained, and some are just plain broken.\n\
|
|
+Some more useful ones are:\n\
|
|
+ -2 -3 -4 Scale the window by 2, 3, or 4 times.\n\
|
|
+ -config FILE Load/save configuration from FILE.\n\
|
|
+ -episode N Set starting expisode to N.\n\
|
|
+ -grabmouse Grab the mouse to control movement.\n\
|
|
+ -volume N Set volume (default 8).\n\
|
|
+ -skill N Set starting skill level to N.\n\
|
|
+\n\
|
|
+Others are:\n\
|
|
+
|
|
+-altdeath -debugfile -file -nodraw -respawn -warp \n\
|
|
+-avg -devparm -geom -nomonsters -shdev -wart \n\
|
|
+-cdrom -disp -loadgame -playdemo -statcopy \n\
|
|
+-comdev -dup -maxdemo -port -timedemo \n\
|
|
+ -extratic -net -record -timer \n\
|
|
+-deathmatch -fast -noblit -regdev -turbo \n\
|
|
+
|
|
+");
|
|
+ exit(0);
|
|
+ }
|
|
+
|
|
nomonsters = M_CheckParm ("-nomonsters");
|
|
respawnparm = M_CheckParm ("-respawn");
|
|
fastparm = M_CheckParm ("-fast");
|
|
@@ -1013,6 +1042,15 @@
|
|
|
|
printf ("M_LoadDefaults: Load system defaults.\n");
|
|
M_LoadDefaults (); // load before initing other systems
|
|
+
|
|
+ /* Must be after M_LoadDefaults */
|
|
+ p = M_CheckParm ("-volume");
|
|
+ if (p && p < myargc-1)
|
|
+ {
|
|
+ int vol = atoi(myargv[p+1]);
|
|
+ S_SetSfxVolume(vol);
|
|
+ S_SetMusicVolume(vol);
|
|
+ }
|
|
|
|
printf ("Z_Init: Init zone memory allocation daemon. \n");
|
|
Z_Init ();
|