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

This commit is contained in:
terminx 2006-11-19 07:09:43 +00:00
parent 65dc97d55b
commit 2d356245f2
5 changed files with 7 additions and 13 deletions

View file

@ -327,7 +327,7 @@ int app_main(int argc, char **argv)
inittimer(TIMERINTSPERSECOND);
installusertimercallback(keytimerstuff);
loadpics("tiles000.art",1048576);
loadpics("tiles000.art",1048576*16);
loadnames();
Bstrcpy(kensig,"Based on BUILD by Ken Silverman");

View file

@ -2991,7 +2991,7 @@ long kzfindfile (char *filnam)
if (findata.attrib&16) strcat(&filnam[i],"\\");
#elif defined(_WIN32)
if (!FindNextFile(hfind,&findata))
{ FindClose(hfind); if (!kzhashbuf) return(0); srchstat = kzlastfnam; break; }
{ FindClose(hfind); hfind = INVALID_HANDLE_VALUE; if (!kzhashbuf) return(0); /* srchstat = kzlastfnam; */ break; }
if (findata.dwFileAttributes&FILE_ATTRIBUTE_HIDDEN) continue;
i = wildstpathleng;
if (findata.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)

View file

@ -202,7 +202,7 @@ include Makefile.deps
.PHONY: enginelib editorlib
enginelib editorlib:
-mkdir $(EOBJ)
-mkdir -p $(EOBJ)
$(MAKE) -C $(EROOT)/ "OBJ=$(CURDIR)/$(EOBJ)" \
SUPERBUILD=$(SUPERBUILD) POLYMOST=$(POLYMOST) \
USE_OPENGL=$(USE_OPENGL) \

View file

@ -159,7 +159,6 @@ int DSL_BeginBufferedPlayback(char *BufferStart,
int MixMode, void(*CallBackFunc)(void))
{
Uint16 format;
Uint8 *tmp;
int channels;
int chunksize;

View file

@ -41,8 +41,6 @@ Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com)
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
static __int64 nexttick, tickdelta;
extern int MUSIC_SoundDevice;
static const int _MIDI_CommandLengths[ NUM_MIDI_CHANNELS ] =
@ -543,8 +541,8 @@ static int _MIDI_ServiceRoutine(void)
track *Track;
int tracknum;
int status;
int c1;
int c2;
int c1 = 0;
int c2 = 0;
int TimeSet = FALSE;
if (_MIDI_SongActive)
@ -924,8 +922,6 @@ int MIDI_Reset
{
int channel;
long time;
unsigned flags;
MIDI_AllNotesOff();
@ -1209,7 +1205,6 @@ int MIDI_PlaySong
track *CurrentTrack;
unsigned char *ptr;
int status;
DWORD i;
if (_MIDI_SongLoaded)
{
@ -1377,8 +1372,8 @@ static int _MIDI_ProcessNextTick
track *Track;
int tracknum;
int status;
int c1;
int c2;
int c1 = 0;
int c2 = 0;
int TimeSet = FALSE;
Track = _MIDI_TrackPtr;