zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-03-03 15:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

New LOGO_FLAGS bits:

Browse source 
- LOGO_STOPMISCSOUNDS = 2097152: Don't play NITEVISION_ONOFF when the logo starts.
- LOGO_NOGAMETITLE = 4194304: Don't display the title (INGAMEDUKETHREEDEE and PLUTOPAKSPRITE+2) in the main menu.
- LOGO_NOTITLEBAR = 8388608: Don't display the title bar background (TITLEBAR) above the menu.

Patch from Fox.

git-svn-id: https://svn.eduke32.com/eduke32@6555 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-12-12 05:13:49 +00:00
parent ea36d5289a
commit 63748e5381
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/duke3d/src/game.h
View file

@ -93,6 +93,9 @@ enum LogoFlags_t {
LOGO_NOE3RADLOGO = 0x00040000, LOGO_NOE3RADLOGO = 0x00040000,
LOGO_NODUKETEAMTEXT = 0x00080000, LOGO_NODUKETEAMTEXT = 0x00080000,
LOGO_NODUKETEAMPIC = 0x00100000, LOGO_NODUKETEAMPIC = 0x00100000,
LOGO_STOPMISCSOUNDS = 0x00200000,
LOGO_NOGAMETITLE = 0x00400000,
LOGO_NOTITLEBAR = 0x00800000,
}; };
void A_DeleteSprite(int spriteNum); void A_DeleteSprite(int spriteNum);

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

@ -120,7 +120,8 @@ static void Menu_DrawBackground(const vec2_t origin)
static void Menu_DrawTopBar(const vec2_t origin) static void Menu_DrawTopBar(const vec2_t origin)
{ {
rotatesprite_fs(origin.x + (MENU_MARGIN_CENTER<<16), origin.y + (19<<16), MF_Redfont.cursorScale, 0,MENUBAR,16,0,10); if ((G_GetLogoFlags() & LOGO_NOTITLEBAR) == 0)
rotatesprite_fs(origin.x + (MENU_MARGIN_CENTER<<16), origin.y + (19<<16), MF_Redfont.cursorScale, 0,MENUBAR,16,0,10);
} }
static void Menu_DrawTopBarCaption(const char *caption, const vec2_t origin) static void Menu_DrawTopBarCaption(const char *caption, const vec2_t origin)
@ -2034,9 +2035,12 @@ static void Menu_PreDraw(MenuID_t cm, MenuEntry_t *entry, const vec2_t origin)
l += 4; l += 4;
fallthrough__; fallthrough__;
case MENU_MAIN: case MENU_MAIN:
rotatesprite_fs(origin.x + (MENU_MARGIN_CENTER<<16), origin.y + ((28+l)<<16), 65536L,0,INGAMEDUKETHREEDEE,0,0,10); if ((G_GetLogoFlags() & LOGO_NOGAMETITLE) == 0)
if (PLUTOPAK) // JBF 20030804 {
rotatesprite_fs(origin.x + ((MENU_MARGIN_CENTER+100)<<16), origin.y + (36<<16), 65536L,0,PLUTOPAKSPRITE+2,(sintable[(totalclock<<4)&2047]>>11),0,2+8); rotatesprite_fs(origin.x + (MENU_MARGIN_CENTER<<16), origin.y + ((28+l)<<16), 65536L,0,INGAMEDUKETHREEDEE,0,0,10);
if (PLUTOPAK) // JBF 20030804
rotatesprite_fs(origin.x + ((MENU_MARGIN_CENTER+100)<<16), origin.y + (36<<16), 65536L,0,PLUTOPAKSPRITE+2,(sintable[(totalclock<<4)&2047]>>11),0,2+8);
}
break; break;
case MENU_PLAYER: case MENU_PLAYER:

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

@ -1655,7 +1655,8 @@ void G_DisplayLogo(void)
//g_player[myconnectindex].ps->palette = palette; //g_player[myconnectindex].ps->palette = palette;
P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0); // JBF 20040308 P_SetGamePalette(g_player[myconnectindex].ps, BASEPAL, 0); // JBF 20040308
S_PlaySound(NITEVISION_ONOFF); if ((G_GetLogoFlags() & LOGO_STOPMISCSOUNDS) == 0)
S_PlaySound(NITEVISION_ONOFF);
//G_FadePalette(0,0,0,0); //G_FadePalette(0,0,0,0);
clearallviews(0L); clearallviews(0L);