diff --git a/polymer/build/src/winlayer.c b/polymer/build/src/winlayer.c index 1933dc4fd..f870c7cbb 100644 --- a/polymer/build/src/winlayer.c +++ b/polymer/build/src/winlayer.c @@ -4133,4 +4133,5 @@ void makeasmwriteable(void) ShowErrorBox("Problem making code writeable"); } #endif -} \ No newline at end of file +} + diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c index 8e68d7b7d..5ef66cd80 100644 --- a/polymer/eduke32/source/astub.c +++ b/polymer/eduke32/source/astub.c @@ -42,11 +42,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static int floor_over_floor; -static char *startwin_labeltext = "Starting Mapster32..."; +// static char *startwin_labeltext = "Starting Mapster32..."; static char setupfilename[BMAX_PATH]= "mapster32.cfg"; static char defaultduke3dgrp[BMAX_PATH] = "duke3d.grp"; static char *duke3dgrp = defaultduke3dgrp; -static int usecwd = 0; static int fixmapbeforesaving = 1; static int NoAutoLoad = 0; @@ -6404,13 +6403,14 @@ static void SetBOSS1Palette() kensetpalette(BOSS1palette); } - +/* static void SetSLIMEPalette() { if (acurpalette==2) return; acurpalette=2; kensetpalette(SLIMEpalette); } +*/ static void SetWATERPalette() { diff --git a/polymer/eduke32/source/jaudiolib/_multivc.h b/polymer/eduke32/source/jaudiolib/_multivc.h index 9c7d6937b..5bced8e97 100644 --- a/polymer/eduke32/source/jaudiolib/_multivc.h +++ b/polymer/eduke32/source/jaudiolib/_multivc.h @@ -97,14 +97,6 @@ typedef enum KeepPlaying } playbackstatus; -typedef struct sounddef -{ - unsigned pos; - char *ptrsnd; - unsigned size; - OggVorbis_File oggStream; -} sounddef; - typedef struct VoiceNode { struct VoiceNode *next; @@ -220,7 +212,7 @@ typedef MONO16 VOLUME16[ 256 ]; typedef char HARSH_CLIP_TABLE_8[ MV_NumVoices * 256 ]; #if defined(_WIN32) -static unsigned MV_GetBufferSize(unsigned); +static unsigned int MV_GetBufferSize(unsigned); #endif static void MV_Mix(VoiceNode *voice, int buffer); static void MV_PlayVoice(VoiceNode *voice); diff --git a/polymer/eduke32/source/jaudiolib/dsoundout.c b/polymer/eduke32/source/jaudiolib/dsoundout.c index 9761dc048..95ff1c7b5 100644 --- a/polymer/eduke32/source/jaudiolib/dsoundout.c +++ b/polymer/eduke32/source/jaudiolib/dsoundout.c @@ -178,6 +178,8 @@ int DSOUND_Init(int soundcard, int mixrate, int numchannels, int samplebits, int WAVEFORMATEX wfex; DSBPOSITIONNOTIFY posn; + UNUSED_PARAMETER(soundcard); + if (DSOUND_Installed) { DSOUND_Shutdown(); @@ -408,6 +410,8 @@ static DWORD WINAPI isr(LPVOID parm) LPVOID lockptr; DWORD lockbytes; LPVOID lockptr2; DWORD lockbytes2; + UNUSED_PARAMETER(parm); + handles = (HANDLE *)malloc(sizeof(HANDLE)*(1+_DSOUND_NumBuffers)); if (!handles) return 1; @@ -579,7 +583,6 @@ int DSOUND_BeginBufferedPlayback(char *BufferStart, int(*CallBackFunc)(int), int int DSOUND_StopPlayback(void) { // DWORD exitcode; - BOOL t; int i; if (isrthread) diff --git a/polymer/eduke32/source/jaudiolib/multivoc.c b/polymer/eduke32/source/jaudiolib/multivoc.c index dd3ace4e5..3f411aaa6 100644 --- a/polymer/eduke32/source/jaudiolib/multivoc.c +++ b/polymer/eduke32/source/jaudiolib/multivoc.c @@ -253,7 +253,7 @@ char *MV_ErrorString(int ErrorNumber) ---------------------------------------------------------------------*/ #if defined(_WIN32) #define BASEBUFSZ (512+128) -static unsigned MV_GetBufferSize(unsigned samplerate) +static unsigned int MV_GetBufferSize(unsigned samplerate) { static unsigned lastsr = 0, lastbufsz = 0; @@ -533,7 +533,7 @@ int MV_ServiceVoc(int buffer) Interperate the information of a VOC format sound file. ---------------------------------------------------------------------*/ -playbackstatus MV_GetNextVOCBlock(VoiceNode *voice) +static playbackstatus MV_GetNextVOCBlock(VoiceNode *voice) { unsigned char *ptr; int blocktype; diff --git a/polymer/eduke32/source/jaudiolib/openal.c b/polymer/eduke32/source/jaudiolib/openal.c index c7f3ad035..adefe8d8d 100644 --- a/polymer/eduke32/source/jaudiolib/openal.c +++ b/polymer/eduke32/source/jaudiolib/openal.c @@ -7,7 +7,8 @@ #include #include #include -#include "_multivc.h" +#include "openal.h" +// #include "_multivc.h" ALCdevice * device=NULL; ALCcontext * context=NULL; @@ -130,7 +131,6 @@ static int unloadaldriver(void) static int loadaldriver(void) { - void *t; int err=0; char *driver; @@ -441,10 +441,6 @@ void AL_PlaySong(char *ptr,int loop) { vorbis_info* vorbisInfo; int bf=2,i; - ALenum format; - ALsizei size; - ALsizei freq; - ALvoid* data; if (!context) return; diff --git a/polymer/eduke32/source/jaudiolib/openal.h b/polymer/eduke32/source/jaudiolib/openal.h index a37aff983..2633d635b 100644 --- a/polymer/eduke32/source/jaudiolib/openal.h +++ b/polymer/eduke32/source/jaudiolib/openal.h @@ -17,4 +17,12 @@ void AL_Continue(); void AL_SetMusicVolume(int volume); int openal_disabled; + +typedef struct sounddef +{ + unsigned pos; + char *ptrsnd; + unsigned size; + OggVorbis_File oggStream; +} sounddef; #endif diff --git a/polymer/eduke32/source/mapster32.h b/polymer/eduke32/source/mapster32.h index e3a6dc3d9..5f22fd454 100644 --- a/polymer/eduke32/source/mapster32.h +++ b/polymer/eduke32/source/mapster32.h @@ -101,7 +101,7 @@ static void SearchSectorsBackward(); static inline void SpriteName(short spritenum, char *lo2); static void PrintStatus(char *string,int num,char x,char y,char color); static void SetBOSS1Palette(); -static void SetSLIMEPalette(); +// static void SetSLIMEPalette(); static void SetWATERPalette(); static void SetGAMEPalette(); static void kensetpalette(char *vgapal);