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

- hook up -nologo.

Browse source
This commit is contained in:
Christoph Oelckers 2020-02-02 20:44:57 +01:00
parent 5fdd69cbbb
commit ca21852945
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1153,7 +1153,7 @@ void G_DisplayExtraScreens(void)
void gameDisplay3DRScreen() void gameDisplay3DRScreen()
{ {
if (!inputState.CheckAllInput() && g_noLogoAnim == 0) if (!inputState.CheckAllInput() && g_noLogoAnim == 0 && !userConfig.nologo)
{ {
Net_GetPackets(); Net_GetPackets();
@ -1325,7 +1325,7 @@ void G_DisplayLogo(void)
FX_StopAllSounds(); // JBF 20031228 FX_StopAllSounds(); // JBF 20031228
S_ClearSoundLocks(); // JBF 20031228 S_ClearSoundLocks(); // JBF 20031228
if (!g_noLogo /* && (!g_netServer && ud.multimode < 2) */ && if (!g_noLogo && !userConfig.nologo /* && (!g_netServer && ud.multimode < 2) */ &&
VM_OnEventWithReturn(EVENT_MAINMENUSCREEN, g_player[myconnectindex].ps->i, myconnectindex, 0) == 0 && VM_OnEventWithReturn(EVENT_MAINMENUSCREEN, g_player[myconnectindex].ps->i, myconnectindex, 0) == 0 &&
(logoflags & LOGO_ENABLED)) (logoflags & LOGO_ENABLED))
{ {

12
source/rr/src/screens.cpp
View file

@ -1170,7 +1170,7 @@ void G_DisplayLogo(void)
return; return;
if (RR) if (RR)
{ {
if (!inputState.CheckAllInput() && g_noLogoAnim == 0) if (!inputState.CheckAllInput() && g_noLogoAnim == 0 && !userConfig.nologo)
{ {
Net_GetPackets(); Net_GetPackets();
Anim_Play("rr_intro.anm"); Anim_Play("rr_intro.anm");
@ -1183,7 +1183,7 @@ void G_DisplayLogo(void)
FX_StopAllSounds(); FX_StopAllSounds();
S_ClearSoundLocks(); S_ClearSoundLocks();
if (!inputState.CheckAllInput() && g_noLogoAnim == 0) if (!inputState.CheckAllInput() && g_noLogoAnim == 0 && !userConfig.nologo)
{ {
Net_GetPackets(); Net_GetPackets();
Anim_Play("redneck.anm"); Anim_Play("redneck.anm");
@ -1196,7 +1196,7 @@ void G_DisplayLogo(void)
FX_StopAllSounds(); FX_StopAllSounds();
S_ClearSoundLocks(); S_ClearSoundLocks();
if (!inputState.CheckAllInput() && g_noLogoAnim == 0) if (!inputState.CheckAllInput() && g_noLogoAnim == 0 && !userConfig.nologo)
{ {
Net_GetPackets(); Net_GetPackets();
Anim_Play("xatlogo.anm"); Anim_Play("xatlogo.anm");
@ -1217,13 +1217,13 @@ void G_DisplayLogo(void)
videoClearScreen(0L); videoClearScreen(0L);
return; return;
} }
if (!g_noLogo /* && (!g_netServer && ud.multimode < 2) */) if (!g_noLogo && !userConfig.nologo /* && (!g_netServer && ud.multimode < 2) */)
{ {
#ifndef EDUKE32_TOUCH_DEVICES #ifndef EDUKE32_TOUCH_DEVICES
if (VOLUMEALL) if (VOLUMEALL)
#endif #endif
{ {
if (!inputState.CheckAllInput() && g_noLogoAnim == 0) if (!inputState.CheckAllInput() && g_noLogoAnim == 0 && !userConfig.nologo)
{ {
Net_GetPackets(); Net_GetPackets();
Anim_Play("logo.anm"); Anim_Play("logo.anm");
@ -1242,7 +1242,7 @@ void G_DisplayLogo(void)
//g_player[myconnectindex].ps->palette = drealms; //g_player[myconnectindex].ps->palette = drealms;
//G_FadePalette(0,0,0,252); //G_FadePalette(0,0,0,252);
if (!inputState.CheckAllInput() && g_noLogoAnim == 0) if (!inputState.CheckAllInput() && g_noLogoAnim == 0 && !userConfig.nologo)
{ {
Net_GetPackets(); Net_GetPackets();

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

@ -1438,6 +1438,7 @@ void LogoLevel(void)
char called; char called;
int fin; int fin;
if (userConfig.nologo) return;
DSPRINTF(ds,"LogoLevel..."); DSPRINTF(ds,"LogoLevel...");
MONO_PRINT(ds); MONO_PRINT(ds);
@ -1690,6 +1691,7 @@ short PlayerQuitMenuLevel = -1;
void IntroAnimLevel(void) void IntroAnimLevel(void)
{ {
if (userConfig.nologo) return;
DSPRINTF(ds,"IntroAnimLevel"); DSPRINTF(ds,"IntroAnimLevel");
MONO_PRINT(ds); MONO_PRINT(ds);
playanm(0); playanm(0);