diff -rNU2 battalionSource/Makefile battalionSource_patched/Makefile --- battalionSource/Makefile Fri Jan 17 03:31:58 1997 +++ battalionSource_patched/Makefile Tue Sep 23 21:51:21 1997 @@ -24,5 +24,5 @@ # see a warning message please let me know about it) # ------------------------------------------------------------ -CC = CC +CC = cc @@ -38,7 +38,7 @@ # # ------------------------------------------------------------ -#GLIB = -lMesaGL -lMesaGLU +GLIB = -lMesaGL -lMesaGLU -lglide2x -ltexus # or -GLIB = -lGL -lGLU +#GLIB = -lGL -lGLU @@ -52,9 +52,9 @@ # # ------------------------------------------------------------ -OS = -DSGIVERSION +#OS = -DSGIVERSION # or #OS = -DSUNVERSION # or -#OS = -DLINUXVERSION +OS = -DLINUXVERSION # or #OS = -DHPVERSION @@ -78,6 +78,6 @@ # # ------------------------------------------------------------ -AUDIOLIB = -laudio -laudiofile -AUDIODEF = -DSGIAUDIO +#AUDIOLIB = -laudio -laudiofile +#AUDIODEF = -DSGIAUDIO @@ -92,5 +92,5 @@ # STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS # ------------------------------------------------------------ -CFLAGS = -O -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./. +OPT = -O6 -m486 -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./. @@ -102,5 +102,5 @@ # you should now be able to type 'make' and everything should be fine ... -#------------------------------------------------------------------- +CFLAGS= $(OPT) $(LIBFLAG) $(OS) $(WHICHLIB) $(AUDIODEF) TARGET = battalion @@ -110,7 +110,4 @@ all: $(TARGET) - -$(OBJ): $(?:.o=.c) - $(CC) $(CFLAGS) $(LIBFLAG) $(OS) $(WHICHLIB) $(AUDIODEF) -c $? $(TARGET): $(OBJ) diff -rNU2 battalionSource/README.patch battalionSource_patched/README.patch --- battalionSource/README.patch Thu Jan 1 10:00:00 1970 +++ battalionSource_patched/README.patch Tue Sep 23 21:51:21 1997 @@ -0,0 +1,20 @@ + +I have made a two small additions to battalion: + +Two new commandline options: + + "-grab" will grab the pointer on startup. + "-warp" will warp the pointer to the game window on startup. + +I made these changes because I have a 3dfx voodoo card. These are great 3d +cards and even better because of their price and Linux support. + +Unfortunatly they only work in fullscreen mode, and the current drivers do not +grab the pointer for themselves. If the pointer ends up outside the window then +it can be very difficult to control or quit the program. + +If you use both of these options at once, there is no chance of you losing +control ;) + +Damien Miller +23 Sep 1997 Binary files battalionSource/battalion and battalionSource_patched/battalion differ diff -rNU2 battalionSource/battalion.c battalionSource_patched/battalion.c --- battalionSource/battalion.c Fri Jan 17 03:31:59 1997 +++ battalionSource_patched/battalion.c Tue Sep 23 22:08:43 1997 @@ -2625,5 +2625,5 @@ #ifdef MESAVERSION - tkInitPosition(-1, -1, 352, 275); + tkInitPosition(-1, -1, 640, 480); #else tkInitPosition(-1, -1, 640, 500); @@ -2733,5 +2733,5 @@ glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - glDrawBuffer(GL_BACK); + glDrawBuffer(GL_BACK); /**************************/ @@ -5640,4 +5640,6 @@ fprintf (stderr, " -a)lone fight alone\n"); + fprintf (stderr, " -g)rab grab pointer at startup\n"); + fprintf (stderr, " -w)arp warp pointer at startup\n"); fprintf (stderr, " -b)ackdrop hide the overlays\n"); fprintf (stderr, " -d)etail n set level-of-detail from 0 (low) to 2 (high)\n"); @@ -5689,4 +5691,15 @@ (strcmp(argv[argument], "-a") == 0)) alone = 1; + + else if ((strcmp(argv[argument], "-grab") == 0) || + (strcmp(argv[argument], "-g") == 0)) + { + pointerGrab = 1; + grabPointer(); + } + + else if ((strcmp(argv[argument], "-warp") == 0) || + (strcmp(argv[argument], "-w") == 0)) + warpPointer(); else if ((strcmp(argv[argument], "-detail") == 0) || diff -rNU2 battalionSource/battalion.h battalionSource_patched/battalion.h --- battalionSource/battalion.h Fri Jan 17 03:31:59 1997 +++ battalionSource_patched/battalion.h Tue Sep 23 21:51:21 1997 @@ -588,4 +588,5 @@ void unGrabPointer(); void grabPointer(); +void warpPointer(); #else diff -rNU2 battalionSource/tk.c battalionSource_patched/tk.c --- battalionSource/tk.c Fri Jan 17 03:31:59 1997 +++ battalionSource_patched/tk.c Tue Sep 23 21:51:21 1997 @@ -893,4 +893,9 @@ } +void warpPointer() +{ + XWarpPointer(display, 0, window, 0, 0, 0, 0, 1, 1); +} + /******************************************************************************/