diff options
| author | Steven Fuller <relnev@icculus.org> | 2001-08-07 23:26:35 +0000 |
|---|---|---|
| committer | Patryk Obara <dreamer.tan@gmail.com> | 2019-08-20 02:22:36 +0200 |
| commit | 665f33b0f9014d8501106f74cb629d3d5d1877be (patch) | |
| tree | aa781768103a507905e540a7cf6fe1e7b891f050 | |
| parent | fc5b084897d1e0a9eb4a3557d517607609f4d4e5 (diff) | |
More small warning cleanups
| -rw-r--r-- | src/avp/language.c | 14 | ||||
| -rw-r--r-- | src/avp/win95/psndplat.h | 9 | ||||
| -rw-r--r-- | src/include/mem3dc.h | 4 | ||||
| -rw-r--r-- | src/stubs.c | 4 |
4 files changed, 16 insertions, 15 deletions
diff --git a/src/avp/language.c b/src/avp/language.c index e803daa..45e611f 100644 --- a/src/avp/language.c +++ b/src/avp/language.c @@ -29,7 +29,7 @@ static char EmptyString[]=""; -static char *TextStringPtr[MAX_NO_OF_TEXTSTRINGS]={&EmptyString,}; +static char *TextStringPtr[MAX_NO_OF_TEXTSTRINGS] = { EmptyString }; static char *TextBufferPtr; void InitTextStrings(void) @@ -41,15 +41,15 @@ void InitTextStrings(void) GLOBALASSERT(AvP.Language>=0); GLOBALASSERT(AvP.Language<I_MAX_NO_OF_LANGUAGES); - #if MARINE_DEMO +#if MARINE_DEMO TextBufferPtr = LoadTextFile("menglish.txt"); - #elif ALIEN_DEMO +#elif ALIEN_DEMO TextBufferPtr = LoadTextFile("aenglish.txt"); - #elif USE_LANGUAGE_TXT +#elif USE_LANGUAGE_TXT TextBufferPtr = LoadTextFile("language.txt"); - #else +#else TextBufferPtr = LoadTextFile(LanguageFilename[AvP.Language]); - #endif +#endif LOCALASSERT(TextBufferPtr); @@ -65,7 +65,7 @@ void InitTextStrings(void) } #if SupportWindows95 - AddToTable( &EmptyString ); + AddToTable( EmptyString ); #endif for (i=1; i<MAX_NO_OF_TEXTSTRINGS; i++) diff --git a/src/avp/win95/psndplat.h b/src/avp/win95/psndplat.h index 4fc39ba..918399f 100644 --- a/src/avp/win95/psndplat.h +++ b/src/avp/win95/psndplat.h @@ -26,8 +26,10 @@ typedef struct soundsampledata int activeInstances; int volume; int pitch; -// LPDIRECTSOUNDBUFFER dsBufferP; +// LPDIRECTSOUNDBUFFER dsBufferP; + void *buffer; + unsigned int flags; int dsFrequency; char * wavName; @@ -61,7 +63,10 @@ typedef struct activesoundsample // LPDIRECTSOUNDBUFFER dsBufferP; // LPDIRECTSOUND3DBUFFER ds3DBufferP; // LPKSPROPERTYSET PropSetP; - + + void *buffer; + void *buffer3d; + void *propset; }ACTIVESOUNDSAMPLE; /* Patrick 5/6/97 ------------------------------------------------------------- diff --git a/src/include/mem3dc.h b/src/include/mem3dc.h index 958960d..dbc9089 100644 --- a/src/include/mem3dc.h +++ b/src/include/mem3dc.h @@ -32,10 +32,6 @@ #endif #endif -#if PSX -#define DBGMALLOC 0 -#endif - /* parameters for DumpMallocInfo */ #define PARTIALDUMP 0 /* print outstanding mallocs number and total memory allocated */ #define DUMPTOSCREEN 1 /* print all outstanding mallocs to screen */ diff --git a/src/stubs.c b/src/stubs.c index 677fda7..0048294 100644 --- a/src/stubs.c +++ b/src/stubs.c @@ -146,8 +146,8 @@ void UpdateAllFMVTextures() /* psndplat.cpp */ ACTIVESOUNDSAMPLE ActiveSounds[SOUND_MAXACTIVE]; -ACTIVESOUNDSAMPLE BlankActiveSound = {SID_NOSOUND,ASP_Minimum,0,0,NULL,0,0,0,0,0,{{0,0,0},0,0},NULL, NULL, NULL}; -SOUNDSAMPLEDATA BlankGameSound = {0,0,0,0,NULL,0,NULL}; +ACTIVESOUNDSAMPLE BlankActiveSound = {SID_NOSOUND,ASP_Minimum,0,0,NULL,0,0,0,0,0, { {0,0,0},{0,0,0},0,0 }, NULL, NULL, NULL}; +SOUNDSAMPLEDATA BlankGameSound = {0,0,0,0,NULL,0,0,NULL,0}; SOUNDSAMPLEDATA GameSounds[SID_MAXIMUM]; int PlatStartSoundSys() |