From 03b98ea54cef627b514d0d23c0c43a67836b9127 Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sat, 14 Jun 2008 09:25:22 +0000
Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@804
 1a8010ca-5511-0410-912e-c29ae57300e0

---
 polymer/build/Makefile          |  8 ++------
 polymer/eduke32/Makefile        | 10 +++-------
 polymer/eduke32/source/game.c   | 10 ++++++++--
 polymer/eduke32/source/player.c |  4 ++--
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/polymer/build/Makefile b/polymer/build/Makefile
index 5420530a8..b55bb2c18 100644
--- a/polymer/build/Makefile
+++ b/polymer/build/Makefile
@@ -26,7 +26,7 @@ BUILD32_ON_64 ?= 0
 #  RELEASE - 1 = no debugging
 #  EFENCE  - 1 = compile with Electric Fence for malloc() debugging
 RELEASE?=1
-LEVEL3?=0
+OPTLEVEL?=2
 EFENCE?=0
 
 # SDK locations - adjust to match your setup
@@ -47,11 +47,7 @@ asm=nasm
 # debugging and release
 ifneq (0,$(RELEASE))
   # debugging disabled
-  ifeq (1,$(LEVEL3))
-    debug=-fomit-frame-pointer -O3
-  else
-    debug=-fomit-frame-pointer -O2
-  endif
+  debug=-fomit-frame-pointer -O$(OPTLEVEL)
 else
   # debugging enabled
   debug=-ggdb -O0 -DDEBUGGINGAIDS -DNOSDLPARACHUTE
diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile
index dc25dff04..206578292 100644
--- a/polymer/eduke32/Makefile
+++ b/polymer/eduke32/Makefile
@@ -17,7 +17,7 @@ BUILD32_ON_64 = 0
 RELEASE?=1
 NOSOUND?=0
 USE_OPENAL?=1
-LEVEL3?=0
+OPTLEVEL?=2
 
 # build locations
 
@@ -31,11 +31,7 @@ o=o
 
 ifneq (0,$(RELEASE))
   # debugging disabled
-  ifeq (1,$(LEVEL3))
-    debug=-fomit-frame-pointer -O3
-  else
-    debug=-fomit-frame-pointer -O2
-  endif
+  debug=-fomit-frame-pointer -O$(OPTLEVEL)
 else
   # debugging enabled
   debug=-ggdb -O0 -DDEBUGGINGAIDS
@@ -228,7 +224,7 @@ enginelib editorlib:
 	$(MAKE) -C $(EROOT)/ "OBJ=$(CURDIR)/$(EOBJ)" \
 		SUPERBUILD=$(SUPERBUILD) POLYMOST=$(POLYMOST) \
 		USE_OPENGL=$(USE_OPENGL) BUILD32_ON_64=$(BUILD32_ON_64) \
-		NOASM=$(NOASM) RELEASE=$(RELEASE) LEVEL3=$(LEVEL3) $@
+		NOASM=$(NOASM) RELEASE=$(RELEASE) OPTLEVEL=$(OPTLEVEL) $@
 	
 $(EOBJ)/$(ENGINELIB): enginelib
 $(EOBJ)/$(EDITORLIB): editorlib
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index fa323b8b2..0a153a83a 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -54,7 +54,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <windows.h>
 #include <shellapi.h>
 extern int getversionfromwebsite(char *buffer);
-#define BUILDDATE 20080401
+#define BUILDDATE 20080612
 #define UPDATEINTERVAL 604800 // 1w
 #endif
 
@@ -7925,7 +7925,13 @@ static void nonsharedkeys(void)
     {
         CONTROL_ClearButton(gamefunc_Toggle_Crosshair);
         ud.crosshair = (ud.crosshair==3)?0:ud.crosshair+1;
-        FTA(ud.crosshair?20:21,g_player[screenpeek].ps);
+        if (ud.crosshair)
+        {
+            int size[] = { 100, 50, 25 };
+            Bsprintf(fta_quotes[122],"%s [%d%%]",fta_quotes[20],size[ud.crosshair-1]);
+            FTA(122,g_player[screenpeek].ps);
+        }
+        else FTA(21,g_player[screenpeek].ps);
     }
 
     if (ud.overhead_on && BUTTON(gamefunc_Map_Follow_Mode))
diff --git a/polymer/eduke32/source/player.c b/polymer/eduke32/source/player.c
index 8e7fb0ffc..118e1205b 100644
--- a/polymer/eduke32/source/player.c
+++ b/polymer/eduke32/source/player.c
@@ -1897,7 +1897,7 @@ static int animatefist(int gs,int snum)
 
 static int animateknee(int gs,int snum)
 {
-    short knee_y[] = {0,-8,-16,-32,-64,-84,-108,-108,-108,-72,-32,-8};
+    static signed char knee_y[] = {0,-8,-16,-32,-64,-84,-108,-108,-108,-72,-32,-8};
     int looking_arc, pal;
 
     if (g_player[snum].ps->knee_incs > 11 || g_player[snum].ps->knee_incs == 0 || sprite[g_player[snum].ps->i].extra <= 0) return 0;
@@ -1922,7 +1922,7 @@ static int animateknee(int gs,int snum)
 
 static int animateknuckles(int gs,int snum)
 {
-    short knuckle_frames[] = {0,1,2,2,3,3,3,2,2,1,0};
+    static char knuckle_frames[] = {0,1,2,2,3,3,3,2,2,1,0};
     int looking_arc, pal;
 
     if (g_player[snum].ps->knuckle_incs == 0 || sprite[g_player[snum].ps->i].extra <= 0) return 0;