8 files changed, 58 insertions, 53 deletions

diff --git a/apps/plugins/sdl/progs/duke3d/Game/src/audiolib/mvreverb.c b/apps/plugins/sdl/progs/duke3d/Game/src/audiolib/mvreverb.c
index 4c82f6eec0..cd6311801d 100644
--- a/apps/plugins/sdl/progs/duke3d/Game/src/audiolib/mvreverb.c
+++ b/apps/plugins/sdl/progs/duke3d/Game/src/audiolib/mvreverb.c
@@ -17,7 +17,7 @@ static	int FB_SRC_A, FB_SRC_B, IIR_DEST_A0, IIR_DEST_A1, ACC_SRC_A0, ACC_SRC_A1,
                 ACC_SRC_B1, IIR_SRC_A0, IIR_SRC_A1, IIR_DEST_B0, IIR_DEST_B1, ACC_SRC_C0,
                 ACC_SRC_C1, ACC_SRC_D0, ACC_SRC_D1, IIR_SRC_B1, IIR_SRC_B0, MIX_DEST_A0,
                 MIX_DEST_A1, MIX_DEST_B0, MIX_DEST_B1;
-        
+
 //static        long IIR_ALPHA, ACC_COEF_A, ACC_COEF_B, ACC_COEF_C, ACC_COEF_D, IIR_COEF, FB_ALPHA, FB_X,
 //              IN_COEF_L, IN_COEF_R;
 
@@ -51,7 +51,7 @@ static inline int cnv_offset(int src)
 
 // extern __stdcall OutputDebugStringA(char *);
 
-static inline void check_buffer()
+static inline void check_buffer(void)
 {
         int new_delay = cnv_offset(MV_ReverbDelay);
 
@@ -99,7 +99,7 @@ static inline long g_buffer(int iOff, long *ptr)                          // get
         }
 
         iOff=(iOff*4)+CurrAddr;
-        while(iOff>correctDelay-1)      
+        while(iOff>correctDelay-1)
         {
                 iOff=iOff-correctDelay;
         }
@@ -141,11 +141,11 @@ static inline void s_buffer1(int iOff,long iVal, long *ptr)                // se
         }
 
         iOff=(iOff*4)+CurrAddr+1;
-        while(iOff>correctDelay-1)      
+        while(iOff>correctDelay-1)
         {
                 iOff=iOff-correctDelay;
         }
-        while(iOff<0)                   
+        while(iOff<0)
         {
                 iOff=correctDelay-(0-iOff);
         }
@@ -155,12 +155,12 @@ static inline void s_buffer1(int iOff,long iVal, long *ptr)                // se
 static inline long MixREVERBLeft(long INPUT_SAMPLE_L, long INPUT_SAMPLE_R, long *ptr)
 {
         long ACC0,ACC1,FB_A0,FB_A1,FB_B0,FB_B1;
-        
+
         const long IIR_INPUT_A0 = (fp_mul(g_buffer(IIR_SRC_A0, ptr), IIR_COEF, FRACBITS) + fp_mul(INPUT_SAMPLE_L, IN_COEF_L, FRACBITS));
         const long IIR_INPUT_A1 = (fp_mul(g_buffer(IIR_SRC_A1, ptr), IIR_COEF, FRACBITS) + fp_mul(INPUT_SAMPLE_R, IN_COEF_R, FRACBITS));
         const long IIR_INPUT_B0 = (fp_mul(g_buffer(IIR_SRC_B0, ptr), IIR_COEF, FRACBITS) + fp_mul(INPUT_SAMPLE_L, IN_COEF_L, FRACBITS));
         const long IIR_INPUT_B1 = (fp_mul(g_buffer(IIR_SRC_B1, ptr), IIR_COEF, FRACBITS) + fp_mul(INPUT_SAMPLE_R, IN_COEF_R, FRACBITS));
-        
+
         const long one = (1 << FRACBITS);
         const long IIR_A0 = fp_mul(IIR_INPUT_A0, IIR_ALPHA, FRACBITS) + fp_mul(g_buffer(IIR_DEST_A0, ptr), (one - IIR_ALPHA), FRACBITS);
         const long IIR_A1 = fp_mul(IIR_INPUT_A1, IIR_ALPHA, FRACBITS) + fp_mul(g_buffer(IIR_DEST_A1, ptr), (one - IIR_ALPHA), FRACBITS);
@@ -171,7 +171,7 @@ static inline long MixREVERBLeft(long INPUT_SAMPLE_L, long INPUT_SAMPLE_R, long
         s_buffer1(IIR_DEST_A1, IIR_A1, ptr);
         s_buffer1(IIR_DEST_B0, IIR_B0, ptr);
         s_buffer1(IIR_DEST_B1, IIR_B1, ptr);
-        
+
         ACC0 = (fp_mul(g_buffer(ACC_SRC_A0, ptr), ACC_COEF_A, FRACBITS) +
                 fp_mul(g_buffer(ACC_SRC_B0, ptr), ACC_COEF_B, FRACBITS) +
                 fp_mul(g_buffer(ACC_SRC_C0, ptr), ACC_COEF_C, FRACBITS) +
@@ -180,24 +180,24 @@ static inline long MixREVERBLeft(long INPUT_SAMPLE_L, long INPUT_SAMPLE_R, long
                 fp_mul(g_buffer(ACC_SRC_B1, ptr), ACC_COEF_B, FRACBITS) +
                 fp_mul(g_buffer(ACC_SRC_C1, ptr), ACC_COEF_C, FRACBITS) +
                 fp_mul(g_buffer(ACC_SRC_D1, ptr), ACC_COEF_D, FRACBITS));
-        
+
         FB_A0 = g_buffer(MIX_DEST_A0 - FB_SRC_A, ptr);
         FB_A1 = g_buffer(MIX_DEST_A1 - FB_SRC_A, ptr);
         FB_B0 = g_buffer(MIX_DEST_B0 - FB_SRC_B, ptr);
         FB_B1 = g_buffer(MIX_DEST_B1 - FB_SRC_B, ptr);
-        
+
         s_buffer(MIX_DEST_A0, ACC0 - fp_mul(FB_A0 , FB_ALPHA, FRACBITS), ptr);
         s_buffer(MIX_DEST_A1, ACC1 - fp_mul(FB_A1 , FB_ALPHA, FRACBITS), ptr);
 
         s_buffer(MIX_DEST_B0, fp_mul(FB_ALPHA , ACC0, FRACBITS) - fp_mul(FB_A0, (FB_ALPHA - one), FRACBITS) - fp_mul(FB_B0, FB_X, FRACBITS), ptr);
         s_buffer(MIX_DEST_B1, fp_mul(FB_ALPHA , ACC1, FRACBITS) - fp_mul(FB_A1, (FB_ALPHA - one), FRACBITS) - fp_mul(FB_B1, FB_X, FRACBITS), ptr);
-        
+
         iRVBLeft  = (g_buffer(MIX_DEST_A0, ptr)+g_buffer(MIX_DEST_B0, ptr)) / 3;
         iRVBRight = (g_buffer(MIX_DEST_A1, ptr)+g_buffer(MIX_DEST_B1, ptr)) / 3;
-        
+
         CurrAddr++;
         if(CurrAddr>delay-1) CurrAddr=0;
-        
+
         return (long)iRVBLeft;
 }
 
@@ -228,7 +228,7 @@ void MV_FPReverb(int volume)
 //      OutputDebugStringA(err);
 
         long scale = (volume << FRACBITS) / MV_MaxVolume;
-        
+
         if (MV_Channels == 1)
         {
                 for (i = 0; i < count; i++)
@@ -308,7 +308,7 @@ void MV_16BitReverbFast( const char *src, char *dest, int count, int shift )
 
         short *pdest = (short *)dest;
         const short *psrc = (const short *)src;
-        
+
         for (i = 0; i < count; i++) {
             pdest[i] = readLE16(psrc + i) >> shift;
         }
@@ -319,11 +319,11 @@ void MV_8BitReverbFast( const signed char *src, signed char *dest, int count, in
         int i;
 
         unsigned char sh = 0x80 - (0x80 >> shift);
-        
+
         for (i = 0; i < count; i++) {
                 unsigned char a = ((unsigned char) src[i]) >> shift;
                 unsigned char c = (((unsigned char) src[i]) ^ 0x80) >> 7;
-                
+
                 dest[i] = (signed char) (a + sh + c);
         }
 }
diff --git a/apps/plugins/sdl/progs/duke3d/Game/src/console.c b/apps/plugins/sdl/progs/duke3d/Game/src/console.c
index 229bb3b564..c4a465eda3 100644
--- a/apps/plugins/sdl/progs/duke3d/Game/src/console.c
+++ b/apps/plugins/sdl/progs/duke3d/Game/src/console.c
@@ -23,8 +23,8 @@ typedef struct console_element
 
 // Private member functions
 void CONSOLE_InsertUsedCommand(const char * szUsedCommand);
-void CONSOLE_ClearUsedCommandList();
-void CONSOLE_RecalculateDirtyBuffer();
+void CONSOLE_ClearUsedCommandList(void);
+void CONSOLE_RecalculateDirtyBuffer(void);
 
 // console argument tracker
 int argc;
@@ -50,7 +50,7 @@ int nConsole_Active = 0;
 
 void CVAR_RegisterDefaultCvarBindings(void);
 // Initialize the console
-void CONSOLE_Init()
+void CONSOLE_Init(void)
 {
     CONSOLE_Reset();
 
@@ -63,7 +63,7 @@ void CONSOLE_Init()
     CONSOLE_Printf("Type \'HELP\' for help with console Commands.");
 }
 
-void CONSOLE_Reset()
+void CONSOLE_Reset(void)
 {
     CONSOLEELEMENT *pElement;
     CONSOLEELEMENT *pDelElement;
@@ -144,7 +144,7 @@ void CONSOLE_HandleInput()
                                 {
                                         ud.pause_on = 0;
                                 }
-                        }                       
+                        }
                 }
                 else
         // Bug fix: make sure the frag bar displays after console
@@ -153,7 +153,7 @@ void CONSOLE_HandleInput()
         {
             if ( ud.multimode > 1 && ud.coop != 1 )
             {
-                displayfragbar(); 
+                displayfragbar();
             }
                         if(numplayers<2)
                                 ud.pause_on = 0;
@@ -169,7 +169,7 @@ void CONSOLE_HandleInput()
         return;
     }
 
-    switch(KB_GetLastScanCode()) 
+    switch(KB_GetLastScanCode())
     {
     case sc_Space:
         {
@@ -221,7 +221,7 @@ void CONSOLE_HandleInput()
     case sc_kpad_Enter:
     case sc_Enter:
         {
-            //If console_buffer[0] strlen() != 0            
+            //If console_buffer[0] strlen() != 0
             //1. Push the dirty_buffer unto the console_buffer
             //2. parse the text
             rb->kbd_input(dirty_buffer, sizeof(dirty_buffer));
@@ -278,7 +278,7 @@ void CONSOLE_HandleInput()
                 if(p_console_current_view->next != NULL)
                 {
                     p_console_current_view = p_console_current_view->next;
-                } 
+                }
                 else
                 {
                     break;
@@ -351,10 +351,10 @@ void CONSOLE_HandleInput()
     }
 
 
-    KB_ClearLastScanCode(); 
+    KB_ClearLastScanCode();
 }
 
-void CONSOLE_Render()
+void CONSOLE_Render(void)
 {
     if(g_CV_classic)
     {
@@ -371,7 +371,7 @@ void CONSOLE_Render()
         int iYOffset = 3; //offset for the console text
         CONSOLEELEMENT *pElement;
 
-        y1 = 0; 
+        y1 = 0;
         y2 = (ydim / 2) - ((ydim / 2)/12);
 
         // Draw console background
@@ -418,9 +418,9 @@ void CONSOLE_Render()
         minitext(283, iCurHeight, BUILD_NUMBER, 17,10+16);
 
         // Draw the cursor //Change the color every second
-        minitext(iCurWidth, iCurHeight,"_",(time(NULL)%2)+1,10+16);        
+        minitext(iCurWidth, iCurHeight,"_",(time(NULL)%2)+1,10+16);
     }
-    else 
+    else
     if(g_CV_num_console_lines > 0)
     {
         int i, iYOffset = 3; //offset for the console text
@@ -517,7 +517,7 @@ void CONSOLE_InsertUsedCommand(const char * szUsedCommand)
     }
 }
 
-void CONSOLE_ClearUsedCommandList()
+void CONSOLE_ClearUsedCommandList(void)
 {
     CONSOLEELEMENT *pElement;
     CONSOLEELEMENT *pDelElement;
@@ -537,7 +537,7 @@ void CONSOLE_ClearUsedCommandList()
 }
 
 
-void CONSOLE_RecalculateDirtyBuffer()
+void CONSOLE_RecalculateDirtyBuffer(void)
 {
         int len;
         int l;
@@ -605,7 +605,7 @@ void CONSOLE_Printf(const char  *newmsg, ...)
 }
 
 // Get the current number of args for this keyword
-int CONSOLE_GetArgc()
+int CONSOLE_GetArgc(void)
 {
     return argc;
 }
@@ -617,9 +617,9 @@ char * CONSOLE_GetArgv(unsigned int var)
 }
 
 // Is our console showing?
-int CONSOLE_IsActive()
+int CONSOLE_IsActive(void)
 {
-        
+
     return nConsole_Active;
 }
 
@@ -627,4 +627,4 @@ int CONSOLE_IsActive()
 void CONSOLE_SetActive(int i)
 {
         nConsole_Active = (i == 0) ? 0 : 1;
-}
\ No newline at end of file
+}
diff --git a/apps/plugins/sdl/progs/duke3d/Game/src/console.h b/apps/plugins/sdl/progs/duke3d/Game/src/console.h
index 58c0e34b25..955c41d885 100644
--- a/apps/plugins/sdl/progs/duke3d/Game/src/console.h
+++ b/apps/plugins/sdl/progs/duke3d/Game/src/console.h
@@ -3,17 +3,17 @@
 
 
 // Public member functions
-void     CONSOLE_Init();
-void     CONSOLE_Reset();
-void     CONSOLE_Term();
-void     CONSOLE_ParseStartupScript();
-void     CONSOLE_HandleInput();
-void     CONSOLE_Render();
+void     CONSOLE_Init(void);
+void     CONSOLE_Reset(void);
+void     CONSOLE_Term(void);
+void     CONSOLE_ParseStartupScript(void);
+void     CONSOLE_HandleInput(void);
+void     CONSOLE_Render(void);
 void     CONSOLE_ParseCommand(char * command);
 void     CONSOLE_Printf(const char  *newmsg, ...);
-int      CONSOLE_GetArgc();
+int      CONSOLE_GetArgc(void);
 char *    CONSOLE_GetArgv(unsigned int var);
-int      CONSOLE_IsActive();
-void     CONSOLE_SetActive(int i); 
+int      CONSOLE_IsActive(void);
+void     CONSOLE_SetActive(int i);
 
 #endif
diff --git a/apps/plugins/sdl/progs/duke3d/Game/src/cvar_defs.h b/apps/plugins/sdl/progs/duke3d/Game/src/cvar_defs.h
index 1e6319c807..55102d791c 100644
--- a/apps/plugins/sdl/progs/duke3d/Game/src/cvar_defs.h
+++ b/apps/plugins/sdl/progs/duke3d/Game/src/cvar_defs.h
@@ -3,8 +3,8 @@
 
 #include <inttypes.h>
 
-void CVARDEFS_Init();
-void CVARDEFS_Render();
+void CVARDEFS_Init(void);
+void CVARDEFS_Render(void);
 //
 // Function declarations
 //
diff --git a/apps/plugins/sdl/progs/duke3d/Game/src/cvars.h b/apps/plugins/sdl/progs/duke3d/Game/src/cvars.h
index 206e16a9c4..91077c8656 100644
--- a/apps/plugins/sdl/progs/duke3d/Game/src/cvars.h
+++ b/apps/plugins/sdl/progs/duke3d/Game/src/cvars.h
@@ -18,8 +18,8 @@ typedef struct t_cvar_binding
 
 
 void            CVAR_RegisterCvar(const char * varname, const char * varhelp, void* variable, function_t function);
-int             CVAR_GetNumCvarBindings();
+int             CVAR_GetNumCvarBindings(void);
 cvar_binding*   CVAR_GetCvarBinding(unsigned int nBinding);
-void            CVAR_Render();
+void            CVAR_Render(void);
 
-#endif
\ No newline at end of file
+#endif
diff --git a/apps/plugins/sdl/progs/duke3d/Game/src/global.h b/apps/plugins/sdl/progs/duke3d/Game/src/global.h
index a9a00002f0..e8aaca0d3a 100644
--- a/apps/plugins/sdl/progs/duke3d/Game/src/global.h
+++ b/apps/plugins/sdl/progs/duke3d/Game/src/global.h
@@ -31,6 +31,7 @@ void Shutdown(void);
 #endif
 
 #ifdef ROCKBOX
+#undef BYTE_ORDER
 #ifdef ROCKBOX_LITTLE_ENDIAN
 #define BYTE_ORDER LITTLE_ENDIAN
 #else
diff --git a/apps/plugins/sdl/progs/duke3d/Game/src/types.h b/apps/plugins/sdl/progs/duke3d/Game/src/types.h
index 93d6f80c86..b5e98b04e0 100644
--- a/apps/plugins/sdl/progs/duke3d/Game/src/types.h
+++ b/apps/plugins/sdl/progs/duke3d/Game/src/types.h
@@ -67,8 +67,12 @@ typedef float64                 appfloat;
 //
 //***************************************************************************
 
+#ifndef true
 #define true ( 1 == 1 )
+#endif
+#ifndef false
 #define false ( ! true )
+#endif
 
 //***************************************************************************
 //
diff --git a/apps/plugins/sdl/progs/duke3d/Game/src/util_lib.h b/apps/plugins/sdl/progs/duke3d/Game/src/util_lib.h
index 6519331b77..5085e64fae 100644
--- a/apps/plugins/sdl/progs/duke3d/Game/src/util_lib.h
+++ b/apps/plugins/sdl/progs/duke3d/Game/src/util_lib.h
@@ -11,7 +11,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -60,7 +60,7 @@ int16  IntelShort (int16 l);
 int32_t  Motoint32_t (int32_t l);
 int32_t  Intelint32_t (int32_t l);
 
-void HeapSort(uint8_t  * base, int32 nel, int32 width, int32 (*compare)(), void (*switcher)());
+//void HeapSort(uint8_t  * base, int32 nel, int32 width, int32 (*compare)(), void (*switcher)());
 
 #ifdef __cplusplus
 };