-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

diff --git a/buildnum/buildnum.c b/buildnum/buildnum.c
index 867744ab46270169d822a75ae2d10b3908deeca0..18e0d6172968101713405b4edf25fed000840730 100644 (file)
--- 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 9bbf28af19e864cb8a3761a660b2e259ab23dea7..8ec24a4ee823310f3a1a334dd4d0171c1593c7d5 100644 (file)
--- 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 7a042874f45cdb453f6ffd182c0d2207cd6d0551..5c73c036c92cd4accd2f10aede6560ba84b40c4d 100644 (file)
--- 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 a6f6e42381dead199d49606e5ec07f997b19fa7b..e73961ce4ac2d2208db8d067d3f552f078cde9e5 100644 (file)
--- 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 edca9f90b45a33ebfd52b33c7a7e744cac9614ba..ee6fe6abe1e4905db3e3192874597be7329bca3f 100644 (file)
--- 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 9ee7f9bbfe5aa072cfff5548097a8961b9d93265..6bb2dfbe195126a391d1f5d9959b152867af1cb4 100644 (file)
--- 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 994084da86f5c4ced9396e935591a42f93b58a55..868d74d07e85e14f766a3563243fda4b28c45f22 100644 (file)
--- 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)