Reduce warnings

git-svn-id: https://svn.eduke32.com/eduke32@1118 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/eduke32/build/src/engine.c

@@ -880,10 +880,13 @@ skipitaddwall:
 //
 static void maskwallscan(int x1, int x2, short *uwal, short *dwal, int *swal, int *lwal)
 {
-    int i, x,/* startx,*/ xnice, ynice, fpalookup;
+    int x,/* startx,*/ xnice, ynice, fpalookup;
     intptr_t startx, p;
-    int y1ve[4], y2ve[4], u4, d4, dax, z,/* p,*/ tsizx, tsizy;
+    int y1ve[4], y2ve[4], /* p,*/ tsizx, tsizy;
+#ifndef ENGINE_USING_A_C
     char bad;
+	int i, u4, d4, dax, z;
+#endif
 
     tsizx = tilesizx[globalpicnum];
     tsizy = tilesizy[globalpicnum];
@@ -1905,9 +1908,12 @@ static void florscan(int x1, int x2, int sectnum)
 //
 static void wallscan(int x1, int x2, short *uwal, short *dwal, int *swal, int *lwal)
 {
-    int i, x, xnice, ynice, fpalookup;
-    int y1ve[4], y2ve[4], u4, d4, z, tsizx, tsizy;
+    int x, xnice, ynice, fpalookup;
+    int y1ve[4], y2ve[4], tsizx, tsizy;
+#ifndef ENGINE_USING_A_C
     char bad;
+	int i, u4, d4, z;
+#endif
 
     if (x2 >= xdim) x2 = xdim-1;
 
@@ -4631,12 +4637,16 @@ static int clippoly4(int cx1, int cy1, int cx2, int cy2)
 //JBF 20031206: Thanks to Ken's hunting, s/(rx1|ry1|rx2|ry2)/n\1/ in this function
 static void dorotatesprite(int sx, int sy, int z, short a, short picnum, signed char dashade, char dapalnum, char dastat, int cx1, int cy1, int cx2, int cy2, int uniqid)
 {
-    int cosang, sinang, v, nextv, dax1, dax2, oy, bx, by, ny1, ny2;
+    int cosang, sinang, v, nextv, dax1, dax2, oy, bx, by;
     int i, x, y, x1, y1, x2, y2, gx1, gy1 ;
     intptr_t p, bufplc, palookupoffs;
-    int xsiz, ysiz, xoff, yoff, npoints, yplc, yinc, lx, rx, xx, xend;
-    int xv, yv, xv2, yv2, qlinemode=0, y1ve[4], y2ve[4], u4, d4;
+    int xsiz, ysiz, xoff, yoff, npoints, yplc, yinc, lx, rx;
+    int xv, yv, xv2, yv2;
+#ifndef ENGINE_USING_A_C
     char bad;
+	int ny1, ny2, xx, xend;
+	int qlinemode=0, y1ve[4], y2ve[4], u4, d4;
+#endif
 
     UNREFERENCED_PARAMETER(uniqid);
     //============================================================================= //POLYMOST BEGINS

polymer/eduke32/source/gamedef.c

@@ -5428,7 +5428,7 @@ void copydefaultcons(void)
         fs = kfilelength(fpi);
 
         kread(fpi,&hittype[0],fs);
-        fwrite(&hittype[0],fs,1,fpo);
+        if (fwrite(&hittype[0],fs,1,fpo)==0)initprintf("Failed to restore default CONs.\n");
 
         kclose(fpi);
         fclose(fpo);

polymer/eduke32/source/jaudiolib/_multivc.h

@@ -156,15 +156,10 @@ typedef struct
     char right;
 } Pan;
 
-typedef signed short MONO16;
-typedef signed char  MONO8;
-
 typedef struct
 {
     MONO16 left;
     MONO16 right;
-//   unsigned short left;
-//   unsigned short right;
 } STEREO16;
 
 typedef struct
@@ -175,8 +170,6 @@ typedef struct
 
 typedef struct
 {
-//   MONO8 left;
-//   MONO8 right;
     char left;
     char right;
 } STEREO8;
@@ -206,9 +199,6 @@ typedef struct
     unsigned int size;
 } data_header;
 
-typedef MONO8  VOLUME8[ 256 ];
-typedef MONO16 VOLUME16[ 256 ];
-
 typedef char HARSH_CLIP_TABLE_8[ MV_NumVoices * 256 ];
 
 #if defined(_WIN32)

polymer/eduke32/source/jaudiolib/multivoc.c

@@ -761,17 +761,17 @@ static playbackstatus MV_GetNextVOCBlock(VoiceNode *voice)
 
         if (voice->LoopEnd != NULL)
         {
-            if (blocklength > (unsigned int)voice->LoopEnd)
+            if (blocklength > (uintptr_t)voice->LoopEnd)
             {
-                blocklength = (unsigned int)voice->LoopEnd;
+                blocklength = (uintptr_t)voice->LoopEnd;
             }
             else
             {
                 voice->LoopEnd = (char *)blocklength;
             }
 
-            voice->LoopStart = voice->sound + (unsigned int)voice->LoopStart;
-            voice->LoopEnd   = voice->sound + (unsigned int)voice->LoopEnd;
+            voice->LoopStart = voice->sound + (uintptr_t)voice->LoopStart;
+            voice->LoopEnd   = voice->sound + (uintptr_t)voice->LoopEnd;
             voice->LoopSize  = voice->LoopEnd - voice->LoopStart;
         }
 
@@ -2830,7 +2830,7 @@ int MV_Init(int soundcard, int MixRate, int Voices, int numchannels, int sampleb
         MV_Shutdown();
     }
 
-    initprintf("Initializing MultiVoc...\n");
+    initprintf("Initializing MultiVoc... \n");
 
     MV_SetErrorCode(MV_Ok);
 

polymer/eduke32/source/jaudiolib/multivoc.h

@@ -58,6 +58,12 @@ enum MV_Errors
    MV_NullRecordFunction
    };
 
+typedef signed short MONO16;
+typedef signed char  MONO8;
+
+typedef MONO8  VOLUME8[ 256 ];
+typedef MONO16 VOLUME16[ 256 ];
+
 char *MV_ErrorString( int ErrorNumber );
 int   MV_VoicePlaying( int handle );
 int   MV_KillAllVoices( void );

polymer/eduke32/source/jaudiolib/mvreverb-c.c

@@ -1,5 +1,5 @@
 #include "multivoc.h"
-#include "_multivc.h"
+// #include "_multivc.h"
 
 void MV_16BitReverb(char *src, char *dest, VOLUME16 *volume, int count)
 {