OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved G_ChangeLevel and other exit functions into FLevelLocals.

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-29 23:45:14 +01:00
commit 4ad327d7e0
13 changed files with 56 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/fragglescript/t_cmd.cpp
View file

@ -77,7 +77,7 @@ static void FS_Gimme(const char * what)
//
//==========================================================================
void FS_MapCmd(FScanner &sc)
void FS_MapCmd(FLevelLocals *Level, FScanner &sc)
{
char nextmap[9];
int NextSkill = -1;
@ -108,7 +108,7 @@ void FS_MapCmd(FScanner &sc)
flags &= ~(CHANGELEVEL_RESETINVENTORY|CHANGELEVEL_RESETHEALTH);
}
}
G_ChangeLevel(nextmap, 0, flags, NextSkill);
Level->ChangeLevel(nextmap, 0, flags, NextSkill);
}
//==========================================================================
@ -168,7 +168,7 @@ void FS_EmulateCmd(FLevelLocals *Level, char * string)
}
else if (sc.Compare("map"))
{
FS_MapCmd(sc);
FS_MapCmd(Level, sc);
}
else if (sc.Compare("gr_fogdensity"))
{

4
src/fragglescript/t_func.cpp
View file

@ -608,7 +608,7 @@ void FParser::SF_Clock(void)
void FParser::SF_ExitLevel(void)
{
G_ExitLevel(0, false);
Level->ExitLevel(0, false);
}
//==========================================================================
@ -2825,7 +2825,7 @@ void FParser::SF_AmbientSound(void)
void FParser::SF_ExitSecret(void)
{
G_SecretExitLevel(0);
Level->SecretExitLevel(0);
}