zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-18 02:01:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

add StartGameDirect function

Browse source
This commit is contained in:
Ricardo Luís Vaz Silva 2023-05-15 02:48:17 -03:00 committed by Christoph Oelckers
parent 6033b054e2
commit 736d38e8c3
4 changed files with 72 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_level.cpp
View file

@ -271,7 +271,7 @@ void G_DeferedInitNew (const char *mapname, int newskill)
void G_DeferedInitNew (FNewGameStartup *gs) void G_DeferedInitNew (FNewGameStartup *gs)
{ {
if (gs->PlayerClass != NULL) playerclass = gs->PlayerClass; if (gs->hasPlayerClass) playerclass = gs->PlayerClass;
d_mapname = AllEpisodes[gs->Episode].mEpisodeMap; d_mapname = AllEpisodes[gs->Episode].mEpisodeMap;
d_skill = gs->Skill; d_skill = gs->Skill;
CheckWarpTransMap (d_mapname, true); CheckWarpTransMap (d_mapname, true);

73
src/menu/doommenu.cpp
View file

@ -86,6 +86,59 @@ bool OkForLocalization(FTextureID texnum, const char* substitute);
FNewGameStartup NewGameStartupInfo; FNewGameStartup NewGameStartupInfo;
int LastSkill = -1; int LastSkill = -1;
void StartGameDirect(bool hasPlayerClass, bool randomPlayerClass, PClassActor * playerClass, int Episode, int Skill)
{
// shouldn't work outside of a menu
if (DMenu::InMenu)
{
NewGameStartupInfo.hasPlayerClass = hasPlayerClass;
if(hasPlayerClass)
{
if(randomPlayerClass)
{
NewGameStartupInfo.PlayerClass = "Random";
}
else if(!playerClass)
{
NullParam("playerClass");
}
else
{
NewGameStartupInfo.PlayerClass = playerClass->GetDisplayName();
}
}
NewGameStartupInfo.Episode = Episode;
NewGameStartupInfo.Skill = Skill;
G_DeferedInitNew (&NewGameStartupInfo);
if (gamestate == GS_FULLCONSOLE)
{
gamestate = GS_HIDECONSOLE;
gameaction = ga_newgame;
}
M_ClearMenus ();
}
else
{
ThrowAbortException(X_OTHER, "Attempt to start a new game outside of menu code");
}
}
DEFINE_ACTION_FUNCTION_NATIVE(DPlayerMenu, StartGameDirect, StartGameDirect)
{
PARAM_PROLOGUE;
PARAM_BOOL(hasPlayerClass);
PARAM_BOOL(randomPlayerClass);
PARAM_POINTER(playerClass, PClassActor);
PARAM_INT(Episode);
PARAM_INT(Skill);
StartGameDirect(hasPlayerClass, randomPlayerClass, playerClass, Episode, Skill);
return 0;
}
bool M_SetSpecialMenu(FName& menu, int param) bool M_SetSpecialMenu(FName& menu, int param)
{ {
@ -127,9 +180,17 @@ bool M_SetSpecialMenu(FName& menu, int param)
// sent from the player class menu // sent from the player class menu
NewGameStartupInfo.Skill = -1; NewGameStartupInfo.Skill = -1;
NewGameStartupInfo.Episode = -1; NewGameStartupInfo.Episode = -1;
NewGameStartupInfo.PlayerClass =
param == -1000? nullptr : if(param == -1000)
param == -1? "Random" : GetPrintableDisplayName(PlayerClasses[param].Type).GetChars(); {
NewGameStartupInfo.hasPlayerClass = false;
}
else
{
NewGameStartupInfo.hasPlayerClass = true;
NewGameStartupInfo.PlayerClass = (param == -1) ? FString("Random") : PlayerClasses[param].Type->GetDisplayName();
}
M_StartupEpisodeMenu(&NewGameStartupInfo); // needs player class name from class menu (later) M_StartupEpisodeMenu(&NewGameStartupInfo); // needs player class name from class menu (later)
break; break;
@ -1180,7 +1241,7 @@ void M_StartupSkillMenu(FNewGameStartup *gs)
DMenuItemBase *li = nullptr; DMenuItemBase *li = nullptr;
FString *pItemText = nullptr; FString *pItemText = nullptr;
if (gs->PlayerClass != nullptr) if (gs->hasPlayerClass)
{ {
pItemText = skill.MenuNamesForPlayerClass.CheckKey(gs->PlayerClass); pItemText = skill.MenuNamesForPlayerClass.CheckKey(gs->PlayerClass);
} }
@ -1207,7 +1268,7 @@ void M_StartupSkillMenu(FNewGameStartup *gs)
FName action = (skill.MustConfirm && !AllEpisodes[gs->Episode].mNoSkill) ? FName action = (skill.MustConfirm && !AllEpisodes[gs->Episode].mNoSkill) ?
NAME_StartgameConfirm : NAME_Startgame; NAME_StartgameConfirm : NAME_Startgame;
FString *pItemText = nullptr; FString *pItemText = nullptr;
if (gs->PlayerClass != nullptr) if (gs->hasPlayerClass)
{ {
pItemText = skill.MenuNamesForPlayerClass.CheckKey(gs->PlayerClass); pItemText = skill.MenuNamesForPlayerClass.CheckKey(gs->PlayerClass);
} }
@ -1277,7 +1338,7 @@ fail:
"StartgameConfirm" : "Startgame"; "StartgameConfirm" : "Startgame";
FString *pItemText = nullptr; FString *pItemText = nullptr;
if (gs->PlayerClass != nullptr) if (gs->hasPlayerClass)
{ {
pItemText = skill.MenuNamesForPlayerClass.CheckKey(gs->PlayerClass); pItemText = skill.MenuNamesForPlayerClass.CheckKey(gs->PlayerClass);
} }

3
src/menu/doommenu.h
View file

@ -4,7 +4,8 @@
struct FNewGameStartup struct FNewGameStartup
{ {
const char *PlayerClass; bool hasPlayerClass;
FString PlayerClass;
int Episode; int Episode;
int Skill; int Skill;
}; };

2
wadsrc/static/zscript/ui/menu/playermenu.zs
View file

@ -41,6 +41,8 @@ class PlayerMenu : ListMenu
Array<int> PlayerColorSets; Array<int> PlayerColorSets;
Array<int> mPlayerSkins; Array<int> mPlayerSkins;
static native void StartGameDirect(bool hasPlayerClass, bool randomPlayerClass, Class<PlayerPawn> playerClass, int Episode, int Skill);
// All write function for the player config are native to prevent abuse. // All write function for the player config are native to prevent abuse.
static native void AutoaimChanged(float val); static native void AutoaimChanged(float val);
static native void TeamChanged(int val); static native void TeamChanged(int val);