zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/build/src/build.c
View file

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

2
polymer/build/src/kplib.c
View file

@ -2991,7 +2991,7 @@ long kzfindfile (char *filnam)
if (findata.attrib&16) strcat(&filnam[i],"\\"); if (findata.attrib&16) strcat(&filnam[i],"\\");
#elif defined(_WIN32) #elif defined(_WIN32)
if (!FindNextFile(hfind,&findata)) 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; if (findata.dwFileAttributes&FILE_ATTRIBUTE_HIDDEN) continue;
i = wildstpathleng; i = wildstpathleng;
if (findata.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) if (findata.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)

2
polymer/eduke32/Makefile
View file

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

1
polymer/eduke32/source/jaudiolib/dsl.c
View file

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

13
polymer/eduke32/source/jaudiolib/midi.c
View file

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