From 6cd11d04681c57a74dd71d31da682759686ea45b Mon Sep 17 00:00:00 2001
From: helixhorned <helixhorned@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 25 Mar 2012 22:01:03 +0000
Subject: [PATCH] Accumulated trivia.

- engine.c: move some variables into a lower block
- premap.c: clearbufbyte --> Bmemset

git-svn-id: https://svn.eduke32.com/eduke32@2532 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/build/src/defs.c   | 2 +-
 polymer/eduke32/build/src/engine.c | 7 +++++--
 polymer/eduke32/source/premap.c    | 6 +++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/polymer/eduke32/build/src/defs.c b/polymer/eduke32/build/src/defs.c
index 11f3caf7d..5b5742b83 100644
--- a/polymer/eduke32/build/src/defs.c
+++ b/polymer/eduke32/build/src/defs.c
@@ -1645,7 +1645,7 @@ static int32_t defsparser(scriptfile *script)
                 kclose(fd);
                 kpgetdim(filebuf, filesize, &xsiz, &ysiz);
 
-                if (xsiz != PR_HIGHPALOOKUP_DIM *PR_HIGHPALOOKUP_DIM || ysiz != PR_HIGHPALOOKUP_DIM)
+                if (xsiz != PR_HIGHPALOOKUP_DIM*PR_HIGHPALOOKUP_DIM || ysiz != PR_HIGHPALOOKUP_DIM)
                 {
                     initprintf("Error: image dimensions of '%s' must be %dx%d.\n",
                                fn, PR_HIGHPALOOKUP_DIM*PR_HIGHPALOOKUP_DIM, PR_HIGHPALOOKUP_DIM);
diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c
index 8bc5d5003..2ddfc599b 100644
--- a/polymer/eduke32/build/src/engine.c
+++ b/polymer/eduke32/build/src/engine.c
@@ -6861,8 +6861,8 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
 #endif
     {
         char bad;
-        int32_t ny1, ny2, xx, xend;
-        int32_t qlinemode=0, y1ve[4], y2ve[4], u4, d4;
+        int32_t xx, xend;
+        int32_t y1ve[4], y2ve[4], u4, d4;
 
         if (((a&1023) == 0) && (ysiz <= 256))  //vlineasm4 has 256 high limit!
         {
@@ -6966,6 +6966,9 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
 #ifndef ENGINE_USING_A_C
         else
         {
+            int32_t ny1, ny2;
+            int32_t qlinemode = 0;
+
             if (dastat&64)
             {
                 if ((xv2&0x0000ffff) == 0)
diff --git a/polymer/eduke32/source/premap.c b/polymer/eduke32/source/premap.c
index 242666e76..1a3c7db0c 100644
--- a/polymer/eduke32/source/premap.c
+++ b/polymer/eduke32/source/premap.c
@@ -1107,9 +1107,9 @@ static inline void prelevel(char g)
     uint8_t tagbitmap[65536>>3];
     Bmemset(tagbitmap, 0, sizeof(tagbitmap));
 
-    clearbufbyte(show2dsector,sizeof(show2dsector),0L);
-    clearbufbyte(show2dwall,sizeof(show2dwall),0L);
-    clearbufbyte(show2dsprite,sizeof(show2dsprite),0L);
+    Bmemset(show2dsector, 0, sizeof(show2dsector));
+    Bmemset(show2dsprite, 0, sizeof(show2dsprite));
+    Bmemset(show2dwall, 0, sizeof(show2dwall));
 
     Bmemset(ror_protectedsectors, 0, MAXSECTORS);