From 598876e41182f64d792748656dd4dcd1f91621ef Mon Sep 17 00:00:00 2001
From: terminx <terminx@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Tue, 30 Sep 2014 04:06:57 +0000
Subject: [PATCH] Extra files for previous commits

git-svn-id: https://svn.eduke32.com/eduke32@4607 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/include/build.h  | 14 +++++++-------
 polymer/eduke32/build/include/editor.h |  2 +-
 polymer/eduke32/build/src/defs.c       |  6 +++---
 polymer/eduke32/build/src/mdsprite.c   |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/polymer/eduke32/build/include/build.h b/polymer/eduke32/build/include/build.h
index 37bd9bc6a..7df7071a4 100644
--- a/polymer/eduke32/build/include/build.h
+++ b/polymer/eduke32/build/include/build.h
@@ -1330,7 +1330,7 @@ extern int32_t gltexfiltermode;
 extern int32_t glredbluemode;
 extern int32_t glusetexcache, glusememcache;
 extern int32_t glmultisample, glnvmultisamplehint;
-extern int32_t glwidescreen, glprojectionhacks;
+extern int32_t glprojectionhacks;
 extern int32_t gltexmaxsize;
 void gltexapplyprops (void);
 void texcache_invalidate(void);
@@ -1406,8 +1406,8 @@ int32_t md_defineanimation(int32_t modelid, const char *framestart, const char *
                            int32_t fps, int32_t flags);
 int32_t md_defineskin(int32_t modelid, const char *skinfn, int32_t palnum, int32_t skinnum,
                       int32_t surfnum, float param, float specpower, float specfactor);
-int32_t md_definehud (int32_t modelid, int32_t tilex, double xadd, double yadd, double zadd,
-                      double angadd, int32_t flags, int32_t fov);
+int32_t md_definehud (int32_t modelid, int32_t tilex, float xadd, float yadd, float zadd,
+                      int32_t angadd, int32_t flags, int32_t fov);
 int32_t md_undefinetile(int32_t tile);
 int32_t md_undefinemodel(int32_t modelid);
 
@@ -1423,7 +1423,7 @@ int32_t loadoldboard(const char *filename, char fromwhere, vec3_t *dapos, int16_
 typedef struct _hashitem // size is 12/24 bits.
 {
     char *string;
-    int32_t key;
+    intptr_t key;
     struct _hashitem *next;
 } hashitem_t;
 
@@ -1435,9 +1435,9 @@ typedef struct
 
 void hash_init(hashtable_t *t);
 void hash_free(hashtable_t *t);
-int32_t  hash_findcase(const hashtable_t *t, const char *s);
-int32_t  hash_find(const hashtable_t *t, const char *s);
-void hash_add(hashtable_t *t, const char *s, int32_t key, int32_t replace);
+intptr_t  hash_findcase(const hashtable_t *t, const char *s);
+intptr_t  hash_find(const hashtable_t *t, const char *s);
+void hash_add(hashtable_t *t, const char *s, intptr_t key, int32_t replace);
 void hash_delete(hashtable_t *t, const char *s);
 
 #ifdef POLYMER
diff --git a/polymer/eduke32/build/include/editor.h b/polymer/eduke32/build/include/editor.h
index 2bbc9bdca..1a3b37026 100644
--- a/polymer/eduke32/build/include/editor.h
+++ b/polymer/eduke32/build/include/editor.h
@@ -73,7 +73,7 @@ extern char somethingintab;
 extern char names[MAXTILES][25];
 extern uint8_t buildkeys[NUMBUILDKEYS];
 
-extern double vid_gamma_3d, vid_contrast_3d, vid_brightness_3d;
+extern float vid_gamma_3d, vid_contrast_3d, vid_brightness_3d;
 extern double msens;
 
 extern vec3_t startpos;
diff --git a/polymer/eduke32/build/src/defs.c b/polymer/eduke32/build/src/defs.c
index 503538bda..f9716985e 100644
--- a/polymer/eduke32/build/src/defs.c
+++ b/polymer/eduke32/build/src/defs.c
@@ -1243,8 +1243,8 @@ static int32_t defsparser(scriptfile *script)
                     char happy=1;
                     int32_t tilex = 0;
 #endif
-                    int32_t ftilenume = -1, ltilenume = -1, flags = 0, fov = -1;
-                    double xadd = 0.0, yadd = 0.0, zadd = 0.0, angadd = 0.0;
+                    int32_t ftilenume = -1, ltilenume = -1, flags = 0, fov = -1, angadd = 0;
+                    double xadd = 0.0, yadd = 0.0, zadd = 0.0;
 
                     static const tokenlist modelhudtokens[] =
                     {
@@ -1280,7 +1280,7 @@ static int32_t defsparser(scriptfile *script)
                         case T_ZADD:
                             scriptfile_getdouble(script,&zadd); break;
                         case T_ANGADD:
-                            scriptfile_getdouble(script,&angadd); break;
+                            scriptfile_getsymbol(script,&angadd); break;
                         case T_FOV:
                             scriptfile_getsymbol(script,&fov); break;
                         case T_HIDE:
diff --git a/polymer/eduke32/build/src/mdsprite.c b/polymer/eduke32/build/src/mdsprite.c
index 3cb3e1ed7..b4aaab023 100644
--- a/polymer/eduke32/build/src/mdsprite.c
+++ b/polymer/eduke32/build/src/mdsprite.c
@@ -522,7 +522,7 @@ int32_t md_defineskin(int32_t modelid, const char *skinfn, int32_t palnum, int32
     return 0;
 }
 
-int32_t md_definehud(int32_t modelid, int32_t tilex, double xadd, double yadd, double zadd, double angadd, int32_t flags, int32_t fov)
+int32_t md_definehud(int32_t modelid, int32_t tilex, float xadd, float yadd, float zadd, int32_t angadd, int32_t flags, int32_t fov)
 {
     if (!mdinited) mdinit();