mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-24 10:40:46 +00:00
This commit is effectively nothing
git-svn-id: https://svn.eduke32.com/eduke32@250 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
a66440c908
commit
590ba29bf3
4 changed files with 14 additions and 15 deletions
|
@ -138,7 +138,7 @@ int loadgldriver(const char *driver)
|
|||
#ifdef _WIN32
|
||||
driver = "OPENGL32.DLL";
|
||||
#elif defined __APPLE__
|
||||
driver = "OpenGLLibrary";
|
||||
driver = "/System/Library/Frameworks/OpenGL.framework/OpenGL";
|
||||
#else
|
||||
driver = "libGL.so";
|
||||
#endif
|
||||
|
|
|
@ -38,7 +38,7 @@ source:
|
|||
|
||||
binary:
|
||||
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)
|
||||
mkdir $(binarydir)
|
||||
# mkdir $(binarydir) $(binarydir)/models
|
||||
|
|
|
@ -8563,16 +8563,9 @@ void Startup(void)
|
|||
{
|
||||
int i;
|
||||
|
||||
// why the fuck aren't these part of CONFIG_ReadSetup()?
|
||||
|
||||
// CONFIG_SetupMouse();
|
||||
// CONFIG_SetupJoystick();
|
||||
|
||||
// CONFIG_WriteSetup();
|
||||
|
||||
compilecons();
|
||||
|
||||
CONFIG_ReadSetup();
|
||||
CONFIG_ReadKeys(); // we re-read the keys after compiling the CONs
|
||||
|
||||
if (initengine()) {
|
||||
wm_msgbox("Build Engine Initialisation Error",
|
||||
|
|
|
@ -136,12 +136,21 @@ static float translatepitch(int p)
|
|||
return t;
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
class SoundChannel {
|
||||
public:
|
||||
JFAudMixerChannel *chan;
|
||||
int owner; // sprite number
|
||||
int soundnum; // sound number
|
||||
bool done;
|
||||
} SoundChannel;
|
||||
|
||||
SoundChannel()
|
||||
{
|
||||
chan = NULL;
|
||||
owner = -1;
|
||||
soundnum = -1;
|
||||
done = false;
|
||||
}
|
||||
};
|
||||
|
||||
static SoundChannel *chans = NULL;
|
||||
static JFAud *jfaud = NULL;
|
||||
|
@ -152,9 +161,6 @@ static bool havemidi = false, havewave = false;
|
|||
static void stopcallback(int r)
|
||||
{
|
||||
chans[r].done = true;
|
||||
// jfaud->FreeSound(chans[r].chan);
|
||||
// chans[r].chan = NULL;
|
||||
// chans[r].owner = -1;
|
||||
}
|
||||
|
||||
void testcallback(unsigned long num)
|
||||
|
|
Loading…
Reference in a new issue