teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

This commit is effectively nothing

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@250 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2006-07-27 01:51:06 +00:00
parent a66440c908
commit 590ba29bf3
4 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -138,7 +138,7 @@ int loadgldriver(const char *driver)
#ifdef _WIN32 #ifdef _WIN32
driver = "OPENGL32.DLL"; driver = "OPENGL32.DLL";
#elif defined __APPLE__ #elif defined __APPLE__
driver = "OpenGLLibrary"; driver = "/System/Library/Frameworks/OpenGL.framework/OpenGL";
#else #else
driver = "libGL.so"; driver = "libGL.so";
#endif #endif

2
polymer/eduke32/MakeDistributions
View file

@ -38,7 +38,7 @@ source:
binary: binary:
make RELEASE=1 make RELEASE=1
upx mapster32.exe eduke32.exe duke3d_w32.exe setup.exe # upx -9 mapster32.exe eduke32.exe duke3d_w32.exe setup.exe
rm -rf $(binarydir) rm -rf $(binarydir)
mkdir $(binarydir) mkdir $(binarydir)
# mkdir $(binarydir) $(binarydir)/models # mkdir $(binarydir) $(binarydir)/models

9
polymer/eduke32/source/game.c
View file

@ -8563,16 +8563,9 @@ void Startup(void)
{ {
int i; int i;
// why the fuck aren't these part of CONFIG_ReadSetup()?
// CONFIG_SetupMouse();
// CONFIG_SetupJoystick();
// CONFIG_WriteSetup();
compilecons(); compilecons();
CONFIG_ReadSetup(); CONFIG_ReadKeys(); // we re-read the keys after compiling the CONs
if (initengine()) { if (initengine()) {
wm_msgbox("Build Engine Initialisation Error", wm_msgbox("Build Engine Initialisation Error",

16
polymer/eduke32/source/jfaud_sounds.cpp
View file

@ -136,12 +136,21 @@ static float translatepitch(int p)
return t; return t;
} }
typedef struct { class SoundChannel {
public:
JFAudMixerChannel *chan; JFAudMixerChannel *chan;
int owner; // sprite number int owner; // sprite number
int soundnum; // sound number int soundnum; // sound number
bool done; bool done;
} SoundChannel;
SoundChannel()
{
chan = NULL;
owner = -1;
soundnum = -1;
done = false;
}
};
static SoundChannel *chans = NULL; static SoundChannel *chans = NULL;
static JFAud *jfaud = NULL; static JFAud *jfaud = NULL;
@ -152,9 +161,6 @@ static bool havemidi = false, havewave = false;
static void stopcallback(int r) static void stopcallback(int r)
{ {
chans[r].done = true; chans[r].done = true;
// jfaud->FreeSound(chans[r].chan);
// chans[r].chan = NULL;
// chans[r].owner = -1;
} }
void testcallback(unsigned long num) void testcallback(unsigned long num)