zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-01 09:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

-- more work on the menu - episode and skill menus are working in DN3D.

Browse source
This commit is contained in:
Christoph Oelckers 2019-11-25 23:21:51 +01:00
parent d73f915c66
commit a74a670c99
20 changed files with 309 additions and 682 deletions
Download patch file Download diff file Expand all files Collapse all files

1
source/rr/src/config.cpp
View file

@ -86,7 +86,6 @@ void CONFIG_SetDefaults(void)
ud.show_level_text = 1;
ud.screenfade = 1;
ud.menubackground = 1;
ud.default_skill = 1;
ud.slidebar_paldisabled = 1;
ud.shadow_pal = 4;
ud.menu_scrollbartilenum = -1;

2
source/rr/src/game.h
View file

@ -163,8 +163,6 @@ typedef struct {
int32_t playerbest;
int32_t default_volume, default_skill;
//int32_t returnvar[MAX_RETURN_VALUES-1];
uint32_t userbytever;

4
source/rr/src/menus.cpp
View file

@ -1579,7 +1579,7 @@ void Menu_Init(void)
MMF_Top_Episode.pos.y = (58 + (3-k)*6)<<16;
if (g_skillCnt == 0)
MEO_EPISODE.linkID = MENU_NULL;
M_EPISODE.currentEntry = ud.default_volume;
M_EPISODE.currentEntry = gDefaultVolume;
// prepare skills
k = -1;
@ -1598,7 +1598,7 @@ void Menu_Init(void)
MEOS_NETOPTIONS_MONSTERS.numOptions = g_skillCnt + 1; // k+1;
MEOSN_NetSkills[g_skillCnt] = MenuSkillNone;
MMF_Top_Skill.pos.y = (58 + (4-g_skillCnt)*6)<<16;
M_SKILL.currentEntry = ud.default_skill;
M_SKILL.currentEntry = gDefaultSkill;
Menu_AdjustForCurrentEntryAssignmentBlind(&M_SKILL);
// prepare multiplayer gametypes

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

@ -754,7 +754,6 @@ FString GameInterface::statFPS()
GameStats GameInterface::getStats()
{
GameStats stats;
DukePlayer_t* p = g_player[myconnectindex].ps;
return { p->actors_killed, p->max_actors_killed, p->secret_rooms, p->max_secret_rooms, p->player_par / REALGAMETICSPERSEC };
}