mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
git-svn-id: https://svn.eduke32.com/eduke32@1248 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
8aa2923529
commit
1e5bac7ef4
5 changed files with 31 additions and 13 deletions
|
@ -23,7 +23,7 @@ BUILD32_ON_64 = 0
|
|||
RANCID_NETWORKING = 1
|
||||
|
||||
# Debugging/Build options
|
||||
RELEASE?=0
|
||||
RELEASE?=1
|
||||
NOSOUND?=0
|
||||
USE_OPENAL ?= 1
|
||||
OPTLEVEL?=2
|
||||
|
|
|
@ -448,6 +448,10 @@
|
|||
RelativePath=".\source\sounds.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\sounds_mapster32.c"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\startgtk.game.c"
|
||||
>
|
||||
|
@ -556,6 +560,10 @@
|
|||
RelativePath=".\source\sounds.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\sounds_mapster32.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\source\startwin.game.h"
|
||||
>
|
||||
|
|
|
@ -7581,9 +7581,6 @@ void ExtPreSaveMap(void)
|
|||
}
|
||||
}
|
||||
|
||||
void ExtPreLoadMap(void)
|
||||
{}
|
||||
|
||||
static void G_ShowParameterHelp(void)
|
||||
{
|
||||
char *s = "Usage: mapster32 [OPTIONS] [FILE]\n\n"
|
||||
|
@ -8873,6 +8870,22 @@ int32_t loadconsounds(char *fn)
|
|||
scriptfile_clearsymbols();
|
||||
return ret;
|
||||
}
|
||||
|
||||
void ExtPreLoadMap(void)
|
||||
{
|
||||
static int32_t soundinit = 0;
|
||||
if (!soundinit)
|
||||
{
|
||||
g_numsounds = loadconsounds(gamecon);
|
||||
if (g_numsounds > 0)
|
||||
{
|
||||
if (S_SoundStartup() != 0)
|
||||
S_SoundShutdown();
|
||||
}
|
||||
soundinit = 1;
|
||||
}
|
||||
}
|
||||
|
||||
/// ^^^
|
||||
|
||||
int32_t ExtInit(void)
|
||||
|
@ -9071,13 +9084,6 @@ int32_t ExtInit(void)
|
|||
|
||||
loadtilegroups("tiles.cfg");
|
||||
|
||||
g_numsounds = loadconsounds(gamecon);
|
||||
if (g_numsounds > 0)
|
||||
{
|
||||
if (S_SoundStartup() != 0)
|
||||
S_SoundShutdown();
|
||||
}
|
||||
|
||||
ReadHelpFile("m32help.hlp");
|
||||
|
||||
return rv;
|
||||
|
|
|
@ -275,9 +275,11 @@ char *AL_ErrorString(int32_t code)
|
|||
void check(int32_t show)
|
||||
{
|
||||
AL_Error=balcGetError(device);
|
||||
if (AL_Error!=ALC_NO_ERROR&&show)initprintf("%s(%s)\n",ALC_ErrorString(AL_Error),ALdoing);
|
||||
if (AL_Error!=ALC_NO_ERROR&&show)
|
||||
initprintf("%s(%s)\n",ALC_ErrorString(AL_Error),ALdoing);
|
||||
AL_Error=balGetError();
|
||||
if (AL_Error!= AL_NO_ERROR&&show)initprintf("%s(%s)\n", AL_ErrorString(AL_Error),ALdoing);
|
||||
if (AL_Error!= AL_NO_ERROR&&show)
|
||||
initprintf("%s(%s)\n", AL_ErrorString(AL_Error),ALdoing);
|
||||
}
|
||||
extern ov_callbacks cb;
|
||||
|
||||
|
|
|
@ -222,3 +222,5 @@ static char *testplay_addparam = 0;
|
|||
int32_t gs_sprite[3][7];
|
||||
char gs_spritewhat[3][7];
|
||||
int16_t gs_cursprite=-1;
|
||||
|
||||
int32_t g_musicSize=0;
|
||||
|
|
Loading…
Reference in a new issue