From c5b3416006c0d50e7c2d5f0a267ab85a40315bee Mon Sep 17 00:00:00 2001
From: knghtbrd <knghtbrd@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Mon, 17 Dec 2001 08:25:27 +0000
Subject: [PATCH] -safe now does something approximately close to correct.  Not
 a full fix for what it does and doesn't do, but this will suffice for now. 
 Added the -nomouse flag to GLX.  Debugging is a bitch without it, really. 
 Also made a few minor changes for gcc v3 building.  I'm not through with
 makefile yet, though.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1260 d7cf8633-e32d-0410-b094-e92efae38249
---
 buildnum/buildnum.c |  3 ++-
 buildnumber.c       |  2 +-
 common.c            |  2 +-
 makefile            | 10 +++-------
 model_alias.c       | 16 ----------------
 r_part.c            |  2 +-
 vid_glx.c           |  2 ++
 7 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/buildnum/buildnum.c b/buildnum/buildnum.c
index 867744ab..18e0d617 100644
--- a/buildnum/buildnum.c
+++ b/buildnum/buildnum.c
@@ -96,4 +96,5 @@ int main(int argc, char **argv)
 	}
 
 	return 0;
-}
\ No newline at end of file
+}
+
diff --git a/buildnumber.c b/buildnumber.c
index 9bbf28af..8ec24a4e 100644
--- a/buildnumber.c
+++ b/buildnumber.c
@@ -1,4 +1,4 @@
 
-#define BUILDNUMBER 253
+#define BUILDNUMBER 256
 
 int buildnumber = BUILDNUMBER;
diff --git a/common.c b/common.c
index 7a042874..5c73c036 100644
--- a/common.c
+++ b/common.c
@@ -35,7 +35,7 @@ static char     *largv[MAX_NUM_ARGVS + NUM_SAFE_ARGVS + 1];
 static char     *argvdummy = " ";
 
 static char     *safeargvs[NUM_SAFE_ARGVS] =
-	{"-stdvid", "-nolan", "-nosound", "-nocdaudio", "-nojoy", "-nomouse", "-dibonly"};
+	{"-stdvid", "-nolan", "-nosound", "-nocdaudio", "-nojoy", "-nomouse", "-window"};
 
 cvar_t registered = {0, "registered","0"};
 cvar_t cmdline = {0, "cmdline","0"};
diff --git a/makefile b/makefile
index a6f6e423..e73961ce 100644
--- a/makefile
+++ b/makefile
@@ -40,13 +40,8 @@ LDFLAGS= -L/usr/X11R6/lib -lm -lX11 -lXext -lXIE -lXxf86dga -lXxf86vm -lGL -ldl
 all: buildnum darkplaces-glx
 #all: darkplaces-glx darkplaces-3dfx
 
-buildnum/buildnum:
-	cd buildnum
-	make
-	cd ..
-
-buildnum: buildnum/buildnum
-	buildnum/buildnum buildnumber.c
+buildnum:
+	make -C buildnum
 
 .c.o:
 	gcc $(CFLAGS) -c $*.c
@@ -59,6 +54,7 @@ darkplaces-3dfx: $(OBJECTS) in_svgalib.o vid_3dfxsvga.o
 
 
 clean:
+	-make -C buildnum clean
 	-rm -f darkplaces-glx darkplaces-3dfx
 	-rm -f vid_glx.o in_svgalib.o vid_3dfxsvga.o $(OBJECTS) *.d
 
diff --git a/model_alias.c b/model_alias.c
index edca9f90..ee6fe6ab 100644
--- a/model_alias.c
+++ b/model_alias.c
@@ -224,22 +224,6 @@ static rtexture_t *GL_SkinSplit(byte *in, byte *out, int width, int height, unsi
 		return NULL;
 }
 
-static int GL_SkinCheck(byte *in, int width, int height, unsigned short bits)
-{
-	int i, pixels, passed;
-	byte pixeltest[16];
-	for (i = 0;i < 16;i++)
-		pixeltest[i] = (bits & (1 << i)) != 0;
-	pixels = width*height;
-	passed = 0;
-	while(pixels--)
-	{
-		if (pixeltest[*in >> 4] && *in != 0 && *in != 255)
-			return true;
-		in++;
-	}
-	return false;
-}
 
 static void Mod_LoadSkin (maliashdr_t *mheader, char *basename, byte *skindata, byte *skintemp, int width, int height, rtexture_t **skintex)
 {
diff --git a/r_part.c b/r_part.c
index 9ee7f9bb..6bb2dfbe 100644
--- a/r_part.c
+++ b/r_part.c
@@ -1435,7 +1435,7 @@ void R_DrawParticles (void)
 			continue;
 
 		// LordHavoc: check if it's in a visible leaf
-		leaf = leaf = Mod_PointInLeaf(p->org, cl.worldmodel);
+		leaf = Mod_PointInLeaf(p->org, cl.worldmodel);
 		if (leaf->visframe != r_framecount)
 			continue;
 
diff --git a/vid_glx.c b/vid_glx.c
index 994084da..868d74d0 100644
--- a/vid_glx.c
+++ b/vid_glx.c
@@ -817,6 +817,8 @@ void Sys_SendKeyEvents(void)
 
 void IN_Init(void)
 {
+	if (COM_CheckParm ("-nomouse"))
+		mouse_avail = false;
 }
 
 void IN_Shutdown(void)
-- 
2.39.2