git-svn-id: https://svn.eduke32.com/eduke32@653 1a8010ca-5511-0410-912e-c29ae57300e0

This commit is contained in:
terminx 2008-03-22 00:22:48 +00:00
parent 9ef96d3033
commit 3496113ca4
8 changed files with 23 additions and 23 deletions

View file

@ -4133,4 +4133,5 @@ void makeasmwriteable(void)
ShowErrorBox("Problem making code writeable"); ShowErrorBox("Problem making code writeable");
} }
#endif #endif
} }

View file

@ -42,11 +42,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
static int floor_over_floor; 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 setupfilename[BMAX_PATH]= "mapster32.cfg";
static char defaultduke3dgrp[BMAX_PATH] = "duke3d.grp"; static char defaultduke3dgrp[BMAX_PATH] = "duke3d.grp";
static char *duke3dgrp = defaultduke3dgrp; static char *duke3dgrp = defaultduke3dgrp;
static int usecwd = 0;
static int fixmapbeforesaving = 1; static int fixmapbeforesaving = 1;
static int NoAutoLoad = 0; static int NoAutoLoad = 0;
@ -6404,13 +6403,14 @@ static void SetBOSS1Palette()
kensetpalette(BOSS1palette); kensetpalette(BOSS1palette);
} }
/*
static void SetSLIMEPalette() static void SetSLIMEPalette()
{ {
if (acurpalette==2) return; if (acurpalette==2) return;
acurpalette=2; acurpalette=2;
kensetpalette(SLIMEpalette); kensetpalette(SLIMEpalette);
} }
*/
static void SetWATERPalette() static void SetWATERPalette()
{ {

View file

@ -97,14 +97,6 @@ typedef enum
KeepPlaying KeepPlaying
} playbackstatus; } playbackstatus;
typedef struct sounddef
{
unsigned pos;
char *ptrsnd;
unsigned size;
OggVorbis_File oggStream;
} sounddef;
typedef struct VoiceNode typedef struct VoiceNode
{ {
struct VoiceNode *next; struct VoiceNode *next;
@ -220,7 +212,7 @@ typedef MONO16 VOLUME16[ 256 ];
typedef char HARSH_CLIP_TABLE_8[ MV_NumVoices * 256 ]; typedef char HARSH_CLIP_TABLE_8[ MV_NumVoices * 256 ];
#if defined(_WIN32) #if defined(_WIN32)
static unsigned MV_GetBufferSize(unsigned); static unsigned int MV_GetBufferSize(unsigned);
#endif #endif
static void MV_Mix(VoiceNode *voice, int buffer); static void MV_Mix(VoiceNode *voice, int buffer);
static void MV_PlayVoice(VoiceNode *voice); static void MV_PlayVoice(VoiceNode *voice);

View file

@ -178,6 +178,8 @@ int DSOUND_Init(int soundcard, int mixrate, int numchannels, int samplebits, int
WAVEFORMATEX wfex; WAVEFORMATEX wfex;
DSBPOSITIONNOTIFY posn; DSBPOSITIONNOTIFY posn;
UNUSED_PARAMETER(soundcard);
if (DSOUND_Installed) if (DSOUND_Installed)
{ {
DSOUND_Shutdown(); DSOUND_Shutdown();
@ -408,6 +410,8 @@ static DWORD WINAPI isr(LPVOID parm)
LPVOID lockptr; DWORD lockbytes; LPVOID lockptr; DWORD lockbytes;
LPVOID lockptr2; DWORD lockbytes2; LPVOID lockptr2; DWORD lockbytes2;
UNUSED_PARAMETER(parm);
handles = (HANDLE *)malloc(sizeof(HANDLE)*(1+_DSOUND_NumBuffers)); handles = (HANDLE *)malloc(sizeof(HANDLE)*(1+_DSOUND_NumBuffers));
if (!handles) return 1; if (!handles) return 1;
@ -579,7 +583,6 @@ int DSOUND_BeginBufferedPlayback(char *BufferStart, int(*CallBackFunc)(int), int
int DSOUND_StopPlayback(void) int DSOUND_StopPlayback(void)
{ {
// DWORD exitcode; // DWORD exitcode;
BOOL t;
int i; int i;
if (isrthread) if (isrthread)

View file

@ -253,7 +253,7 @@ char *MV_ErrorString(int ErrorNumber)
---------------------------------------------------------------------*/ ---------------------------------------------------------------------*/
#if defined(_WIN32) #if defined(_WIN32)
#define BASEBUFSZ (512+128) #define BASEBUFSZ (512+128)
static unsigned MV_GetBufferSize(unsigned samplerate) static unsigned int MV_GetBufferSize(unsigned samplerate)
{ {
static unsigned lastsr = 0, lastbufsz = 0; static unsigned lastsr = 0, lastbufsz = 0;
@ -533,7 +533,7 @@ int MV_ServiceVoc(int buffer)
Interperate the information of a VOC format sound file. Interperate the information of a VOC format sound file.
---------------------------------------------------------------------*/ ---------------------------------------------------------------------*/
playbackstatus MV_GetNextVOCBlock(VoiceNode *voice) static playbackstatus MV_GetNextVOCBlock(VoiceNode *voice)
{ {
unsigned char *ptr; unsigned char *ptr;
int blocktype; int blocktype;

View file

@ -7,7 +7,8 @@
#include <AL/al.h> #include <AL/al.h>
#include <AL/alc.h> #include <AL/alc.h>
#include <vorbis/vorbisfile.h> #include <vorbis/vorbisfile.h>
#include "_multivc.h" #include "openal.h"
// #include "_multivc.h"
ALCdevice * device=NULL; ALCdevice * device=NULL;
ALCcontext * context=NULL; ALCcontext * context=NULL;
@ -130,7 +131,6 @@ static int unloadaldriver(void)
static int loadaldriver(void) static int loadaldriver(void)
{ {
void *t;
int err=0; int err=0;
char *driver; char *driver;
@ -441,10 +441,6 @@ void AL_PlaySong(char *ptr,int loop)
{ {
vorbis_info* vorbisInfo; vorbis_info* vorbisInfo;
int bf=2,i; int bf=2,i;
ALenum format;
ALsizei size;
ALsizei freq;
ALvoid* data;
if (!context) if (!context)
return; return;

View file

@ -17,4 +17,12 @@ void AL_Continue();
void AL_SetMusicVolume(int volume); void AL_SetMusicVolume(int volume);
int openal_disabled; int openal_disabled;
typedef struct sounddef
{
unsigned pos;
char *ptrsnd;
unsigned size;
OggVorbis_File oggStream;
} sounddef;
#endif #endif

View file

@ -101,7 +101,7 @@ static void SearchSectorsBackward();
static inline void SpriteName(short spritenum, char *lo2); static inline void SpriteName(short spritenum, char *lo2);
static void PrintStatus(char *string,int num,char x,char y,char color); static void PrintStatus(char *string,int num,char x,char y,char color);
static void SetBOSS1Palette(); static void SetBOSS1Palette();
static void SetSLIMEPalette(); // static void SetSLIMEPalette();
static void SetWATERPalette(); static void SetWATERPalette();
static void SetGAMEPalette(); static void SetGAMEPalette();
static void kensetpalette(char *vgapal); static void kensetpalette(char *vgapal);