From 7182f0a7f23ed53c4108a1c490b111cbda53d701 Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Fri, 22 Nov 2013 19:26:44 +0000
Subject: [PATCH] A couple of trivial changes.

git-svn-id: https://svn.eduke32.com/eduke32@4171 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/include/build.h     |  6 ++----
 polymer/eduke32/build/src/engine.c        |  4 ++--
 polymer/eduke32/build/src/mdsprite.c      |  2 +-
 polymer/eduke32/build/src/polymost.c      | 19 ++++++++-----------
 polymer/eduke32/package/sdk/samples/a.m32 |  2 +-
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/polymer/eduke32/build/include/build.h b/polymer/eduke32/build/include/build.h
index 5df9cf9d1..4e4b7c6fe 100644
--- a/polymer/eduke32/build/include/build.h
+++ b/polymer/eduke32/build/include/build.h
@@ -764,8 +764,8 @@ typedef struct {
     // XXX: currently always 0.
     int32_t yoffs;
 
-    int8_t lognumtiles;  // 1<<bits: number of tiles in multi-sky
-    int8_t tileofs[MAXPSKYTILES];  // for 0 <= j < (1<<bits): tile offset relative to basetile
+    int8_t lognumtiles;  // 1<<lognumtiles: number of tiles in multi-sky
+    int8_t tileofs[MAXPSKYTILES];  // for 0 <= j < (1<<lognumtiles): tile offset relative to basetile
 } psky_t;
 
 // Index of map-global (legacy) multi-sky:
@@ -1394,8 +1394,6 @@ void hash_delete(hashtable_t *t, const char *s);
 # endif
 #endif
 
-extern void initialize_engine_globals(void);
-
 static inline void push_nofog(void)
 {
 #ifdef USE_OPENGL
diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c
index d3bacccf4..03d2177e1 100644
--- a/polymer/eduke32/build/src/engine.c
+++ b/polymer/eduke32/build/src/engine.c
@@ -7236,8 +7236,6 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
 
     int32_t ouryxaspect, ourxyaspect;
 
-    UNREFERENCED_PARAMETER(uniqid);
-
     if (g_rotatespriteNoWidescreen)
     {
         dastat |= 1024;
@@ -7251,6 +7249,8 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
         polymost_dorotatesprite(sx,sy,z,a,picnum,dashade,dapalnum,dastat,daalpha,cx1,cy1,cx2,cy2,uniqid);
         return;
     }
+#else
+    UNREFERENCED_PARAMETER(uniqid);
 #endif
     //============================================================================= //POLYMOST ENDS
 
diff --git a/polymer/eduke32/build/src/mdsprite.c b/polymer/eduke32/build/src/mdsprite.c
index cf62b6c60..230cdb5e4 100644
--- a/polymer/eduke32/build/src/mdsprite.c
+++ b/polymer/eduke32/build/src/mdsprite.c
@@ -2349,7 +2349,7 @@ static int32_t md3draw(md3model_t *m, const spritetype *tspr)
             indexhandle = m->vindexes;
 
         //PLAG: delayed polygon-level sorted rendering
-        if (m->usesalpha && !(tspr->cstat & 1024))
+        if (m->usesalpha && !(tspr->cstat & CSTAT_SPRITE_MDHACK))
         {
             for (i=s->numtris-1; i>=0; i--)
             {
diff --git a/polymer/eduke32/build/src/polymost.c b/polymer/eduke32/build/src/polymost.c
index 8e52b7f11..50e6c95dd 100644
--- a/polymer/eduke32/build/src/polymost.c
+++ b/polymer/eduke32/build/src/polymost.c
@@ -4169,7 +4169,7 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
             x1 = hudmem[(dastat&4)>>2][picnum].xadd;
             y1 = hudmem[(dastat&4)>>2][picnum].yadd;
             z1 = hudmem[(dastat&4)>>2][picnum].zadd;
-            
+
 #ifdef POLYMER
             if (pr_overridehud) {
                 x1 = pr_hudxadd;
@@ -4177,7 +4177,6 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
                 z1 = pr_hudzadd;
             }
 #endif
-
             if (!(hudmem[(dastat&4)>>2][picnum].flags&2)) //"NOBOB" is specified in DEF
             {
                 double fx = ((double)sx)*(1.0/65536.0);
@@ -4305,21 +4304,19 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
 
                 spriteext[tspr.owner].roll = a;
                 spriteext[tspr.owner].zoff = z;
-                
+
                 fov = hudmem[(dastat&4)>>2][picnum].fov;
-                
-                if (fov == -1) {
+
+                if (fov == -1)
                     fov = pr_fov;
-                }
-                
-                if (pr_overridehud) {
+
+                if (pr_overridehud)
                     fov = pr_hudfov;
-                }
-                
+
                 polymer_setaspect(fov);
 
                 polymer_drawsprite(MAXSPRITESONSCREEN);
-                
+
                 polymer_setaspect(pr_fov);
 
                 spriteext[tspr.owner].zoff = 0;
diff --git a/polymer/eduke32/package/sdk/samples/a.m32 b/polymer/eduke32/package/sdk/samples/a.m32
index 5dcf9c13d..3973f06d7 100644
--- a/polymer/eduke32/package/sdk/samples/a.m32
+++ b/polymer/eduke32/package/sdk/samples/a.m32
@@ -228,7 +228,7 @@ defstate fiddlewithlights
         case 1:
         {
             set k pr_parallaxscale
-            ftoi k PSCALESTEPS  // must convert to scaled integer, maps 0..1 to 0..PARALLAXSTEPS
+            ftoi k PSCALESTEPS  // must convert to scaled integer, maps 0..1 to 0..PSCALESTEPS
             set minval MINPARALLAXSCALE, mul minval PSCALESTEPS
             set maxval MAXPARALLAXSCALE, mul maxval PSCALESTEPS
             add k j, clamp k minval maxval