From 2d356245f22b7152b5c6400ba84924068253a70d Mon Sep 17 00:00:00 2001 From: terminx Date: Sun, 19 Nov 2006 07:09:43 +0000 Subject: [PATCH] git-svn-id: https://svn.eduke32.com/eduke32@350 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/build/src/build.c | 2 +- polymer/build/src/kplib.c | 2 +- polymer/eduke32/Makefile | 2 +- polymer/eduke32/source/jaudiolib/dsl.c | 1 - polymer/eduke32/source/jaudiolib/midi.c | 13 ++++--------- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/polymer/build/src/build.c b/polymer/build/src/build.c index 337660d9a..03ecc111e 100644 --- a/polymer/build/src/build.c +++ b/polymer/build/src/build.c @@ -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"); diff --git a/polymer/build/src/kplib.c b/polymer/build/src/kplib.c index 1f1535b03..7f3c1feb1 100644 --- a/polymer/build/src/kplib.c +++ b/polymer/build/src/kplib.c @@ -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) diff --git a/polymer/eduke32/Makefile b/polymer/eduke32/Makefile index 807d644c8..0b5ee9992 100644 --- a/polymer/eduke32/Makefile +++ b/polymer/eduke32/Makefile @@ -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) \ diff --git a/polymer/eduke32/source/jaudiolib/dsl.c b/polymer/eduke32/source/jaudiolib/dsl.c index 100bea7f3..b8163d14a 100755 --- a/polymer/eduke32/source/jaudiolib/dsl.c +++ b/polymer/eduke32/source/jaudiolib/dsl.c @@ -159,7 +159,6 @@ int DSL_BeginBufferedPlayback(char *BufferStart, int MixMode, void(*CallBackFunc)(void)) { Uint16 format; - Uint8 *tmp; int channels; int chunksize; diff --git a/polymer/eduke32/source/jaudiolib/midi.c b/polymer/eduke32/source/jaudiolib/midi.c index c8ee9e283..122df9502 100644 --- a/polymer/eduke32/source/jaudiolib/midi.c +++ b/polymer/eduke32/source/jaudiolib/midi.c @@ -41,8 +41,6 @@ Modifications for JonoF's port by Jonathon Fowler (jonof@edgenetwk.com) #define WIN32_LEAN_AND_MEAN #include -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;