[BACK]Return to patch-ac CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / games / xdoom / patches

File: [cvs.NetBSD.org] / pkgsrc / games / xdoom / patches / patch-ac (download)

Revision 1.5, Mon Feb 22 21:58:47 2010 UTC (10 years, 9 months ago) by wiz
Branch: MAIN
CVS Tags: pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, pkgsrc-2016Q4-base, pkgsrc-2016Q4, pkgsrc-2016Q3-base, pkgsrc-2016Q3, pkgsrc-2016Q2-base, pkgsrc-2016Q2, pkgsrc-2016Q1-base, pkgsrc-2016Q1, pkgsrc-2015Q4-base, pkgsrc-2015Q4, pkgsrc-2015Q3-base, pkgsrc-2015Q3, pkgsrc-2015Q2-base, pkgsrc-2015Q2, pkgsrc-2015Q1-base, pkgsrc-2015Q1, pkgsrc-2014Q4-base, pkgsrc-2014Q4, pkgsrc-2014Q3-base, pkgsrc-2014Q3, pkgsrc-2014Q2-base, pkgsrc-2014Q2, pkgsrc-2014Q1-base, pkgsrc-2014Q1, pkgsrc-2013Q4-base, pkgsrc-2013Q4, pkgsrc-2013Q3-base, pkgsrc-2013Q3, pkgsrc-2013Q2-base, pkgsrc-2013Q2, pkgsrc-2013Q1-base, pkgsrc-2013Q1, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4, pkgsrc-2011Q3-base, pkgsrc-2011Q3, pkgsrc-2011Q2-base, pkgsrc-2011Q2, pkgsrc-2011Q1-base, pkgsrc-2011Q1, pkgsrc-2010Q4-base, pkgsrc-2010Q4, pkgsrc-2010Q3-base, pkgsrc-2010Q3, pkgsrc-2010Q2-base, pkgsrc-2010Q2, pkgsrc-2010Q1-base, pkgsrc-2010Q1, HEAD
Changes since 1.4: +0 -0 lines

Re-add xdoom, requested by drochner.
Address PR 24024 by marking it as not-for-lp64platforms.

$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 ();