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

Remove some Duke-specific screen displays from standalone builds

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6271 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2017-06-24 21:18:06 +00:00
parent 854b303d18
commit 504b04067b
4 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/duke3d/src/anim.cpp
View file

@ -86,6 +86,8 @@ void Anim_Init(void)
Anim_Setup("logo.anm", 9, logoanimsounds); Anim_Setup("logo.anm", 9, logoanimsounds);
Anim_Setup("3dr.anm", 10, NULL); Anim_Setup("3dr.anm", 10, NULL);
#ifndef EDUKE32_STANDALONE
Anim_Setup("vol4e1.anm", 10, endanimvol41); Anim_Setup("vol4e1.anm", 10, endanimvol41);
Anim_Setup("vol4e2.anm", 14, endanimvol42); Anim_Setup("vol4e2.anm", 14, endanimvol42);
Anim_Setup("vol4e3.anm", 10, endanimvol43); Anim_Setup("vol4e3.anm", 10, endanimvol43);
@ -96,6 +98,7 @@ void Anim_Init(void)
Anim_Setup("radlogo.anm", 10, NULL); Anim_Setup("radlogo.anm", 10, NULL);
Anim_Setup("cineov2.anm", 18, endanimsounds); Anim_Setup("cineov2.anm", 18, endanimsounds);
Anim_Setup("cineov3.anm", 10, endanimsounds); Anim_Setup("cineov3.anm", 10, endanimsounds);
#endif
} }
int32_t Anim_Play(const char *fn) int32_t Anim_Play(const char *fn)

2
source/duke3d/src/game.cpp
View file

@ -5983,8 +5983,10 @@ static int G_EndOfLevel(void)
ud.eog = 0; ud.eog = 0;
if ((!g_netServer && ud.multimode < 2)) if ((!g_netServer && ud.multimode < 2))
{ {
#ifndef EDUKE32_STANDALONE
if (!VOLUMEALL) if (!VOLUMEALL)
G_DoOrderScreen(); G_DoOrderScreen();
#endif
g_player[myconnectindex].ps->gm = 0; g_player[myconnectindex].ps->gm = 0;
Menu_Open(myconnectindex); Menu_Open(myconnectindex);
Menu_Change(MENU_MAIN); Menu_Change(MENU_MAIN);

2
source/duke3d/src/menus.cpp
View file

@ -2337,7 +2337,7 @@ static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
creditsminitext(origin.x + (160<<16), origin.y + ((90+7+10-l)<<16), "Evan \"Hendricks266\" Ramos", 8); creditsminitext(origin.x + (160<<16), origin.y + ((90+7+10-l)<<16), "Evan \"Hendricks266\" Ramos", 8);
mgametextcenter(origin.x, origin.y + ((130+7-l)<<16), "Based on \"JFDuke3D\" by"); mgametextcenter(origin.x, origin.y + ((130+7-l)<<16), "Special thanks to");
creditsminitext(origin.x + (160<<16), origin.y + ((130+7+10-l)<<16), "Jonathon \"JonoF\" Fowler", 8); creditsminitext(origin.x + (160<<16), origin.y + ((130+7+10-l)<<16), "Jonathon \"JonoF\" Fowler", 8);
mgametextcenter(origin.x, origin.y + ((150+7-l)<<16), "Uses BUILD Engine technology by"); mgametextcenter(origin.x, origin.y + ((150+7-l)<<16), "Uses BUILD Engine technology by");

6
source/duke3d/src/screens.cpp
View file

@ -51,6 +51,7 @@ int32_t g_noLogoAnim = 0;
int32_t g_noLogo = 0; int32_t g_noLogo = 0;
////////// OFTEN-USED FEW-LINERS ////////// ////////// OFTEN-USED FEW-LINERS //////////
#ifndef EDUKE32_STANDALONE
static void G_HandleEventsWhileNoInput(void) static void G_HandleEventsWhileNoInput(void)
{ {
I_ClearAllInput(); I_ClearAllInput();
@ -77,6 +78,7 @@ static int32_t G_PlaySoundWhileNoInput(int32_t soundnum)
return 0; return 0;
} }
#endif
////////// //////////
void P_SetGamePalette(DukePlayer_t *player, uint32_t palid, int32_t set) void P_SetGamePalette(DukePlayer_t *player, uint32_t palid, int32_t set)
@ -1655,6 +1657,7 @@ void G_DisplayLogo(void)
clearallviews(0L); clearallviews(0L);
} }
#ifndef EDUKE32_STANDALONE
void G_DoOrderScreen(void) void G_DoOrderScreen(void)
{ {
int32_t i; int32_t i;
@ -1988,6 +1991,7 @@ static void G_BonusCutscenes(void)
break; break;
} }
} }
#endif
static void G_DisplayMPResultsScreen(void) static void G_DisplayMPResultsScreen(void)
{ {
@ -2147,8 +2151,10 @@ void G_BonusScreen(int32_t bonusonly)
FX_SetReverb(0L); FX_SetReverb(0L);
CONTROL_BindsEnabled = 1; // so you can use your screenshot bind on the score screens CONTROL_BindsEnabled = 1; // so you can use your screenshot bind on the score screens
#ifndef EDUKE32_STANDALONE
if (!bonusonly) if (!bonusonly)
G_BonusCutscenes(); G_BonusCutscenes();
#endif
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 8+2+1); // JBF 20040308 P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 8+2+1); // JBF 20040308
G_FadePalette(0, 0, 0, 252); // JBF 20031228 G_FadePalette(0, 0, 0, 252); // JBF 20031228