From 221e58f8ad1dae264e71b82d1a291ae5ac9da0ce Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Tue, 19 May 2015 22:10:03 +0000
Subject: [PATCH] SW: Fix warning: type does not match original declaration
 [enabled by default]

git-svn-id: https://svn.eduke32.com/eduke32@5226 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/source/sw/src/copysect.c | 2 +-
 polymer/eduke32/source/sw/src/game.c     | 4 ++--
 polymer/eduke32/source/sw/src/jnstub.c   | 2 +-
 polymer/eduke32/source/sw/src/net.c      | 2 +-
 polymer/eduke32/source/sw/src/weapon.c   | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/polymer/eduke32/source/sw/src/copysect.c b/polymer/eduke32/source/sw/src/copysect.c
index 8963f8451..820953929 100644
--- a/polymer/eduke32/source/sw/src/copysect.c
+++ b/polymer/eduke32/source/sw/src/copysect.c
@@ -163,7 +163,7 @@ void CopySectorMatch(short match)
                         if (TEST(sector[dest_sp->sectnum].extra, SECTFX_SECTOR_OBJECT))
                         {
                             SECTOR_OBJECTp sop;
-                            extern short GlobSpeedSO;
+                            extern int GlobSpeedSO;
 
                             // find and add sprite to SO
                             sop = DetectSectorObject(&sector[sprite[src_move].sectnum]);
diff --git a/polymer/eduke32/source/sw/src/game.c b/polymer/eduke32/source/sw/src/game.c
index bf982ebcf..b40c12ab2 100644
--- a/polymer/eduke32/source/sw/src/game.c
+++ b/polymer/eduke32/source/sw/src/game.c
@@ -167,9 +167,9 @@ int DispFrameRate = FALSE;
 int DispMono = TRUE;
 int Fog = FALSE;
 int FogColor;
-int PreCaching = TRUE;
+SWBOOL PreCaching = TRUE;
 int GodMode = FALSE;
-int BotMode = FALSE;
+SWBOOL BotMode = FALSE;
 short Skill = 2;
 short BetaVersion = 900;
 short TotalKillable;
diff --git a/polymer/eduke32/source/sw/src/jnstub.c b/polymer/eduke32/source/sw/src/jnstub.c
index 975082807..8af638720 100644
--- a/polymer/eduke32/source/sw/src/jnstub.c
+++ b/polymer/eduke32/source/sw/src/jnstub.c
@@ -90,7 +90,7 @@ void LoadKVXFromScript(char *filename);
 
 // voxelarray format is:
 //      spritenumber, voxelnumber
-extern int aVoxelArray[MAXSPRITES];
+extern int aVoxelArray[MAXTILES];
 
 // Ken ALT highlighted array
 extern short highlightsector[MAXSECTORS];
diff --git a/polymer/eduke32/source/sw/src/net.c b/polymer/eduke32/source/sw/src/net.c
index 1cd4c2c76..4f98b58c1 100644
--- a/polymer/eduke32/source/sw/src/net.c
+++ b/polymer/eduke32/source/sw/src/net.c
@@ -89,7 +89,7 @@ unsigned int MoveThingsCount;
 
 //int myminlag[MAX_SW_PLAYERS];
 int mymaxlag, otherminlag, bufferjitter = 1;
-extern int8_t sync_first[MAXSYNCBYTES][60];
+extern char sync_first[MAXSYNCBYTES][60];
 extern int sync_found;
 
 //
diff --git a/polymer/eduke32/source/sw/src/weapon.c b/polymer/eduke32/source/sw/src/weapon.c
index 73465d972..4227f1237 100644
--- a/polymer/eduke32/source/sw/src/weapon.c
+++ b/polymer/eduke32/source/sw/src/weapon.c
@@ -14295,14 +14295,14 @@ InitSumoSkull(short SpriteNum)
     short max_missiles;
 
     extern STATE s_SkullExplode[];
-    extern STATE s_SkullWait[];
+    extern STATE s_SkullWait[5][1];
     extern STATEp sg_SkullWait[];
     extern ATTRIBUTE SkullAttrib;
 
 
     PlaySound(DIGI_SERPSUMMONHEADS, &sp->x, &sp->y, &sp->z, v3df_none);
 
-    new = SpawnSprite(STAT_ENEMY, SKULL_R0, &s_SkullWait[0], sp->sectnum, sp->x, sp->y, SPRITEp_MID(sp), sp->ang, 0);
+    new = SpawnSprite(STAT_ENEMY, SKULL_R0, &s_SkullWait[0][0], sp->sectnum, sp->x, sp->y, SPRITEp_MID(sp), sp->ang, 0);
 
     np = &sprite[new];
     nu = User[new];