qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-10 06:42:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

compile fixes for true64

Browse source
This commit is contained in:
Bill Currie 2001-05-30 22:22:58 +00:00
parent e0b00dfda0
commit cf16e6c5d7
2 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
include/tga.h
View file

@ -33,15 +33,19 @@
#include "qtypes.h"
#ifndef __GNUC__
# if defined (__BORLANDC__) || defined (_MSC_VER)
# if (defined(__BORLANDC__) && (__BORLANDC__ < 0x550))
# pragma option -a1
# else
# pragma pack(push, tgainclude)
# pragma pack(1)
# endif
# if defined (__DECC) && defined (__ALPHA)
# pragma nomember_alignment
# else
# error do some data packing magic here (#pragma pack?)
# if defined (__BORLANDC__) || defined (_MSC_VER)
# if (defined(__BORLANDC__) && (__BORLANDC__ < 0x550))
# pragma option -a1
# else
# pragma pack(push, tgainclude)
# pragma pack(1)
# endif
# else
# error do some data packing magic here (#pragma pack?)
# endif
# endif
#endif
@ -66,6 +70,10 @@ typedef struct _TargaHeader {
# else
# pragma pack(pop, tgainclude)
# endif
#else
# if defined (__DECC) && defined (__ALPHA)
# pragma member_alignment
# endif
#endif
byte *LoadTGA (QFile *fin);

18
source/snd_mme.c
View file

@ -143,7 +143,7 @@ SNDDMA_InitWav ( void )
if ((format = (LPPCMWAVEFORMAT)
mmeAllocMem(sizeof(*format))) == NULL) {
Con_SafePrintf("Failed to allocate PCMWAVEFORMAT struct\n");
Con_Printf("Failed to allocate PCMWAVEFORMAT struct\n");
return false;
}
@ -175,10 +175,10 @@ SNDDMA_InitWav ( void )
{
if (hr != MMSYSERR_ALLOCATED) {
mmeFreeMem(format);
Con_SafePrintf ("waveOutOpen failed: %d\n", hr);
Con_Printf ("waveOutOpen failed: %d\n", hr);
return false;
} else {
Con_SafePrintf ("waveOutOpen failed 2222\n");
Con_Printf ("waveOutOpen failed 2222\n");
}
}
mmeFreeMem(format);
@ -192,7 +192,7 @@ SNDDMA_InitWav ( void )
gSndBufSize = WAV_BUFFERS*WAV_BUFFER_SIZE;
lpData = mmeAllocBuffer(gSndBufSize);
if (!lpData) {
Con_SafePrintf ("Sound: Out of memory.\n");
Con_Printf ("Sound: Out of memory.\n");
FreeSound ();
return false;
}
@ -207,7 +207,7 @@ SNDDMA_InitWav ( void )
if (lpWaveHdr == NULL)
{
Con_SafePrintf ("Sound: Failed to Alloc header.\n");
Con_Printf ("Sound: Failed to Alloc header.\n");
FreeSound ();
return false;
}
@ -253,9 +253,9 @@ SNDDMA_Init ( void )
if (snd_iswave) {
if (snd_firsttime)
Con_SafePrintf ("Wave sound initialized\n");
Con_Printf ("Wave sound initialized\n");
} else {
Con_SafePrintf ("Wave sound failed to init\n");
Con_Printf ("Wave sound failed to init\n");
}
}
@ -263,7 +263,7 @@ SNDDMA_Init ( void )
if (!wav_init) {
if (snd_firsttime)
Con_SafePrintf ("No sound device initialized\n");
Con_Printf ("No sound device initialized\n");
return 0;
}
@ -339,7 +339,7 @@ SNDDMA_Submit ( void )
if (wResult != MMSYSERR_NOERROR)
{
Con_SafePrintf ("Failed to write block to device\n");
Con_Printf ("Failed to write block to device\n");
FreeSound ();
return;
}