jetomit/avp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More small warning cleanups

Browse source
This commit is contained in:
Steven Fuller 2001-08-07 23:26:35 +00:00 • committed by Patryk Obara
parent fc5b084897
commit 665f33b0f9
4 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/avp/language.c
View file

@ -29,7 +29,7 @@
static char EmptyString[]=""; static char EmptyString[]="";
static char *TextStringPtr[MAX_NO_OF_TEXTSTRINGS]={&EmptyString,}; static char *TextStringPtr[MAX_NO_OF_TEXTSTRINGS] = { EmptyString };
static char *TextBufferPtr; static char *TextBufferPtr;
void InitTextStrings(void) void InitTextStrings(void)
@ -41,15 +41,15 @@ void InitTextStrings(void)
GLOBALASSERT(AvP.Language>=0); GLOBALASSERT(AvP.Language>=0);
GLOBALASSERT(AvP.Language<I_MAX_NO_OF_LANGUAGES); GLOBALASSERT(AvP.Language<I_MAX_NO_OF_LANGUAGES);
#if MARINE_DEMO #if MARINE_DEMO
TextBufferPtr = LoadTextFile("menglish.txt"); TextBufferPtr = LoadTextFile("menglish.txt");
#elif ALIEN_DEMO #elif ALIEN_DEMO
TextBufferPtr = LoadTextFile("aenglish.txt"); TextBufferPtr = LoadTextFile("aenglish.txt");
#elif USE_LANGUAGE_TXT #elif USE_LANGUAGE_TXT
TextBufferPtr = LoadTextFile("language.txt"); TextBufferPtr = LoadTextFile("language.txt");
#else #else
TextBufferPtr = LoadTextFile(LanguageFilename[AvP.Language]); TextBufferPtr = LoadTextFile(LanguageFilename[AvP.Language]);
#endif #endif
LOCALASSERT(TextBufferPtr); LOCALASSERT(TextBufferPtr);
@ -65,7 +65,7 @@ void InitTextStrings(void)
} }
#if SupportWindows95 #if SupportWindows95
AddToTable( &EmptyString ); AddToTable( EmptyString );
#endif #endif
for (i=1; i<MAX_NO_OF_TEXTSTRINGS; i++) for (i=1; i<MAX_NO_OF_TEXTSTRINGS; i++)

9
src/avp/win95/psndplat.h
View file

@ -26,8 +26,10 @@ typedef struct soundsampledata
int activeInstances; int activeInstances;
int volume; int volume;
int pitch; int pitch;
// LPDIRECTSOUNDBUFFER dsBufferP;
// LPDIRECTSOUNDBUFFER dsBufferP;
void *buffer;
unsigned int flags; unsigned int flags;
int dsFrequency; int dsFrequency;
char * wavName; char * wavName;
@ -61,7 +63,10 @@ typedef struct activesoundsample
// LPDIRECTSOUNDBUFFER dsBufferP; // LPDIRECTSOUNDBUFFER dsBufferP;
// LPDIRECTSOUND3DBUFFER ds3DBufferP; // LPDIRECTSOUND3DBUFFER ds3DBufferP;
// LPKSPROPERTYSET PropSetP; // LPKSPROPERTYSET PropSetP;
void *buffer;
void *buffer3d;
void *propset;
}ACTIVESOUNDSAMPLE; }ACTIVESOUNDSAMPLE;
/* Patrick 5/6/97 ------------------------------------------------------------- /* Patrick 5/6/97 -------------------------------------------------------------

4
src/include/mem3dc.h
View file

@ -32,10 +32,6 @@
#endif #endif
#endif #endif
#if PSX
#define DBGMALLOC 0
#endif
/* parameters for DumpMallocInfo */ /* parameters for DumpMallocInfo */
#define PARTIALDUMP 0 /* print outstanding mallocs number and total memory allocated */ #define PARTIALDUMP 0 /* print outstanding mallocs number and total memory allocated */
#define DUMPTOSCREEN 1 /* print all outstanding mallocs to screen */ #define DUMPTOSCREEN 1 /* print all outstanding mallocs to screen */

4
src/stubs.c
View file

@ -146,8 +146,8 @@ void UpdateAllFMVTextures()
/* psndplat.cpp */ /* psndplat.cpp */
ACTIVESOUNDSAMPLE ActiveSounds[SOUND_MAXACTIVE]; 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}; 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,NULL}; SOUNDSAMPLEDATA BlankGameSound = {0,0,0,0,NULL,0,0,NULL,0};
SOUNDSAMPLEDATA GameSounds[SID_MAXIMUM]; SOUNDSAMPLEDATA GameSounds[SID_MAXIMUM];
int PlatStartSoundSys() int PlatStartSoundSys()