zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 14:52:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

- transitioned Exhumed to level change events.

Browse source
This commit is contained in:
Christoph Oelckers 2020-09-04 21:59:38 +02:00
parent 8114309e89
commit 1eb99f69c2
12 changed files with 110 additions and 173 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/core/menu/savegamemanager.cpp
View file

@ -66,8 +66,16 @@ void FSavegameManager::LoadGame(FSaveGameNode* node)
{
if (gi->LoadGame(node))
{
// do something here?
gamestate = GS_LEVEL;
}
else
{
I_Error("%s: Failed to load savegame", node->Filename.GetChars());
}
}
else
{
I_Error("%s: Failed to open savegame", node->Filename.GetChars());
}
}

9
source/exhumed/src/d_menu.cpp
View file

@ -28,6 +28,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "version.h"
#include "raze_sound.h"
#include "gamestate.h"
#include "mapinfo.h"
#include "gamecontrol.h"
#include "menu/menu.h" // to override the local menu.h
@ -151,9 +153,7 @@ void GameInterface::MenuSound(EMenuSounds snd)
void GameInterface::QuitToTitle()
{
M_StartControlPanel(false);
M_SetMenu(NAME_Mainmenu);
gamestate = GS_MENUSCREEN;
gameaction = ga_mainmenu;
}
void GameInterface::MenuClosed()
@ -164,7 +164,8 @@ void GameInterface::MenuClosed()
void GameInterface::StartGame(FNewGameStartup& gs)
{
GameAction = gs.Episode; // 0 is training, 1 is the regular game
auto map = FindMapByLevelNum(gs.Episode);
DeferedStartGame(map, 0); // 0 is training, 1 is the regular game - the game does not have skill levels.
}
FSavegameInfo GameInterface::GetSaveSig()

24
source/exhumed/src/exhumed.cpp
View file

@ -63,7 +63,7 @@ int32_t registerosdcommands(void);
void InitFonts();
void InitCheats();
int EndLevel = false;
int EndLevel = 0;
InputPacket localInput;
@ -260,8 +260,6 @@ double calc_smoothratio()
return I_GetTimeFrac() * MaxSmoothRatio;
}
void CheckProgression();
void GameMove(void)
{
FixPalette();
@ -336,7 +334,12 @@ static int SelectAltWeapon(int weap2)
void GameInterface::Ticker()
{
if (!paused)
if (paused)
{
r_NoInterpolate = true;
}
else if (EndLevel == 0)
{
nPlayerDAng += localInput.q16avel;
inita &= kAngleMask;
@ -453,8 +456,17 @@ void GameInterface::Ticker()
GameMove();
r_NoInterpolate = false;
}
else r_NoInterpolate = true;
CheckProgression(); // todo: Get rid of this.
else
{
// Wait for the end of level sound to play out, but stop updating the playsim.
EndLevel--;
r_NoInterpolate = false;
if (EndLevel == 0)
{
auto map = currentLevel->levelNumber == 20? nullptr : FindMapByLevelNum(currentLevel->levelNumber+1); // todo: Use the map record for progression
CompleteLevel(map);
}
}
}
void ExitGame()

5
source/exhumed/src/exhumed.h
View file

@ -100,7 +100,6 @@ extern int32_t g_noSetup;
extern char sHollyStr[];
extern int selectedlevelnew;
extern int GameAction;
extern int nNetPlayerCount;
@ -254,6 +253,10 @@ struct GameInterface : ::GameInterface
void GetInput(InputPacket* packet) override;
void Startup() override;
const char* GenericCheat(int player, int cheat) override;
void NewGame(MapRecord *map, int skill) override;
void LevelCompleted(MapRecord *map, int skill) override;
void NextLevel(MapRecord *map, int skill) override;
::GameStats getStats() override;
};

154
source/exhumed/src/gameloop.cpp
View file

@ -50,13 +50,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_PS_NS
void CheckProgression();
short nBestLevel;
static int32_t nonsharedtimer;
int GameAction=-1;
extern uint8_t nCinemaSeen;
void RunCinemaScene(int num);
@ -65,14 +61,8 @@ void DrawClock();
double calc_smoothratio();
void DoTitle(CompletionFunc completion);
static int FinishLevel(TArray<JobDesc> &jobs)
static void FinishLevel(int lnum, TArray<JobDesc> &jobs)
{
int lnum = currentLevel->levelNumber;
if (lnum > nBestLevel) {
nBestLevel = lnum - 1;
}
StopAllSounds();
bCamera = false;
@ -81,7 +71,7 @@ static int FinishLevel(TArray<JobDesc> &jobs)
STAT_Update(lnum == kMap20);
if (lnum != kMap20)
{
if (EndLevel != 2 && !netgame)
if (EndLevel == 13 && !netgame)
{
// There's really no choice but to enter an active wait loop here to make the sound play out.
PlayLocalSound(StaticSound[59], 0, true, CHANF_UI);
@ -97,7 +87,6 @@ static int FinishLevel(TArray<JobDesc> &jobs)
else nPlayerLives[0] = 0;
DoAfterCinemaScene(lnum, jobs);
return lnum == kMap20? -1 : lnum + 1;
}
@ -145,7 +134,6 @@ void GameInterface::Render()
//
//
//---------------------------------------------------------------------------
void CheckProgression();
void GameInterface::DrawBackground()
{
@ -161,7 +149,6 @@ void GameInterface::DrawBackground()
// draw the fire urn/lamp thingies
DrawRel(kTile3512 + dword_9AB5F, 50, 150, 32);
DrawRel(kTile3512 + ((dword_9AB5F + 2) & 3), 270, 150, 32);
CheckProgression();
}
//---------------------------------------------------------------------------
@ -170,78 +157,73 @@ void GameInterface::DrawBackground()
//
//---------------------------------------------------------------------------
void CheckProgression()
static void Intermission(MapRecord *from_map, MapRecord *to_map)
{
TArray<JobDesc> jobs;
bool startlevel = false;
int mylevelnew = -1;
if (GameAction >= 0)
{
if (GameAction < 1000)
{
// start a new game on the given level
currentLevel = nullptr;
mylevelnew = GameAction;
currentLevel = FindMapByLevelNum(mylevelnew);
GameAction = -1;
InitNewGame();
if (mylevelnew > 0) STAT_StartNewGame("Exhumed", 1);
if (mylevelnew != 0) nBestLevel = mylevelnew - 1;
}
else
{
// A savegame was loaded. Just start the level without any further actions.
GameAction = -1;
gamestate = GS_LEVEL;
return;
}
}
else if (EndLevel)
{
if (currentLevel->levelNumber == 0) startmainmenu();
else mylevelnew = FinishLevel(jobs);
EndLevel = false;
}
if (mylevelnew > -1 && mylevelnew < kMap20)
{
startlevel = true;
// start a new game at the given level
if (!nNetPlayerCount && mylevelnew > 0)
{
showmap(currentLevel? currentLevel->levelNumber : -1, mylevelnew, nBestLevel, jobs);
}
else
jobs.Push({ Create<DScreenJob>() }); // we need something in here even in the multiplayer case.
}
if (jobs.Size() > 0)
{
selectedlevelnew = mylevelnew;
RunScreenJob(jobs.Data(), jobs.Size(), [=](bool)
{
if (!startlevel) gamestate = GS_STARTUP;
else
{
gamestate = GS_LEVEL;
if (to_map && to_map->levelNumber != 0)
{
nBestLevel = to_map->levelNumber - 1;
FinishLevel(to_map->levelNumber, jobs);
}
if (to_map->levelNumber > -1 && to_map->levelNumber < kMap20)
{
// start a new game at the given level
if (!nNetPlayerCount && to_map->levelNumber > 0)
{
showmap(from_map? from_map->levelNumber : -1, to_map->levelNumber, nBestLevel, jobs);
}
else
jobs.Push({ Create<DScreenJob>() }); // we need something in here even in the multiplayer case.
}
if (jobs.Size() > 0)
{
RunScreenJob(jobs.Data(), jobs.Size(), [=](bool)
{
if (!to_map) gameaction = ga_startup; // this was the end of the game
else
{
if (to_map->levelNumber != selectedlevelnew)
{
// User can switch destination on the scrolling map.
g_nextmap = FindMapByLevelNum(selectedlevelnew);
STAT_Cancel();
}
gameaction = ga_nextlevel;
InitLevel(selectedlevelnew);
#if 0
// this would be the place to autosave upon level start
if (!bInDemo && selectedlevelnew > nBestLevel && selectedlevelnew != 0 && selectedlevelnew <= kMap20) {
menu_GameSave(SavePosition);
}
#endif
if (selectedlevelnew > nBestLevel)
{
nBestLevel = selectedlevelnew;
}
}
});
}
}
if (selectedlevelnew == 11) nCinemaSeen |= 2;
if (mylevelnew != selectedlevelnew) STAT_Cancel();
else STAT_NewLevel(currentLevel->labelName);
}
});
}
void GameInterface::NextLevel(MapRecord *map, int skill)
{
InitLevel(map->levelNumber);
if (map->levelNumber > nBestLevel)
{
nBestLevel = selectedlevelnew;
}
if (map->levelNumber == 11) nCinemaSeen |= 2;
STAT_NewLevel(currentLevel->labelName);
}
void GameInterface::NewGame(MapRecord *map, int skill)
{
// start a new game on the given level
InitNewGame();
if (map->levelNumber == 1) STAT_StartNewGame("Exhumed", 1);
Intermission(nullptr, map);
}
void GameInterface::LevelCompleted(MapRecord *map, int skill)
{
if (currentLevel->levelNumber == 0) startmainmenu();
else Intermission(currentLevel, map);
}
//---------------------------------------------------------------------------
@ -253,14 +235,13 @@ void CheckProgression()
void GameInterface::Startup()
{
resettiming();
GameAction = -1;
EndLevel = false;
EndLevel = 0;
if (userConfig.CommandMap.IsNotEmpty())
{
/*
auto map = FindMapByName(userConfig.CommandMap);
if (map) GameAction = map->levelNumber;
if (map) DeferedStartMap(map, 0);
userConfig.CommandMap = "";
goto again;
*/
@ -276,8 +257,7 @@ void GameInterface::Startup()
void GameInterface::ErrorCleanup()
{
// Clear all progression sensitive variables here.
GameAction = -1;
EndLevel = false;
EndLevel = 0;
}
END_PS_NS

4
source/exhumed/src/init.cpp
View file

@ -173,7 +173,7 @@ uint8_t LoadLevel(int nMap)
return true;
}
void InitLevel(int level)
void InitLevel(int level) // todo: use a map record
{
StopCD();
if (!LoadLevel(level)) {
@ -187,7 +187,7 @@ void InitLevel(int level)
RestartPlayer(i);
InitPlayerKeys(i);
}
EndLevel = 0;
lastfps = 0;
InitStatus();
ResetView();

2
source/exhumed/src/object.cpp
View file

@ -1544,7 +1544,7 @@ void DoFinale()
}
else if (nFinaleStage == 3 && leveltime >= nextstage)
{
EndLevel = true;
EndLevel = 13;
}
}
else

66
source/exhumed/src/osdcmds.cpp
View file

@ -35,63 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_PS_NS
static int osdcmd_map(CCmdFuncPtr parm)
{
if (parm->numparms != 1)
{
return CCMD_SHOWHELP;
}
FString mapname = parm->parms[0];
FString mapfilename = mapname;
DefaultExtension(mapfilename, ".map");
if (!fileSystem.FileExists(mapfilename))
{
Printf(TEXTCOLOR_RED "map: file \"%s\" not found.\n", mapfilename.GetChars());
return CCMD_OK;
}
// Check if the map is already defined.
auto map = FindMapByName(mapname);
if (map)
{
GameAction = map->levelNumber;
}
return CCMD_OK;
}
static int osdcmd_changelevel(CCmdFuncPtr parm)
{
char* p;
if (parm->numparms != 1) return CCMD_SHOWHELP;
int nLevel = strtol(parm->parms[0], &p, 10);
if (p[0]) return CCMD_SHOWHELP;
if (nLevel < 0) return CCMD_SHOWHELP;
int nMaxLevels;
if (!ISDEMOVER) {
nMaxLevels = 32;
}
else {
nMaxLevels = 4;
}
if (nLevel > nMaxLevels)
{
Printf("changelevel: invalid level number\n");
return CCMD_SHOWHELP;
}
GameAction = nLevel;
return CCMD_OK;
}
static int osdcmd_warptocoords(CCmdFuncPtr parm)
{
if (parm->numparms < 3 || parm->numparms > 5)
@ -117,12 +60,6 @@ static int osdcmd_warptocoords(CCmdFuncPtr parm)
return CCMD_OK;
}
static int osdcmd_exitmap(CCmdFuncPtr parm)
{
EndLevel = true;
return CCMD_OK;
}
static int osdcmd_doors(CCmdFuncPtr parm)
{
for (int i = 0; i < kMaxChannels; i++)
@ -195,9 +132,6 @@ static int osdcmd_noop(CCmdFuncPtr parm)
int32_t registerosdcommands(void)
{
//if (VOLUMEONE)
C_RegisterFunction("levelwarp","levelwarp <level>: warps to the given level", osdcmd_changelevel);
C_RegisterFunction("map","map <mapname>: loads the given map", osdcmd_map);
C_RegisterFunction("exitmap", "exits current map", osdcmd_exitmap);
C_RegisterFunction("doors", "opens/closes doors", osdcmd_doors);
C_RegisterFunction("spawn","spawn <creaturetype>: spawns a creature",osdcmd_spawn);
C_RegisterFunction("warptocoords","warptocoords [x] [y] [z] [ang] (optional) [horiz] (optional): warps the player to the specified coordinates",osdcmd_warptocoords);

4
source/exhumed/src/player.cpp
View file

@ -1065,7 +1065,7 @@ void FuncPlayer(int a, int nDamage, int nRun)
}
else
{
EndLevel = true;
EndLevel = 13;
}
return;
@ -2462,7 +2462,7 @@ do_default_b:
{
if (!bInDemo)
{
EndLevel = true;
EndLevel = 13;
}
DestroyItemAnim(nValB);

2
source/exhumed/src/ramses.cpp
View file

@ -490,7 +490,7 @@ int DoSpiritHead()
{
if (!CDplaying())
{
EndLevel = 2;
EndLevel = 1;
}
}
}

1
source/exhumed/src/save.cpp
View file

@ -60,7 +60,6 @@ bool GameInterface::LoadGame(FSaveGameNode* sv)
pSky->yscale = 65536;
parallaxtype = 2;
g_visibility = 2048;
GameAction = 1000;
if (currentLevel->levelNumber > 15)
{

2
source/exhumed/src/view.cpp
View file

@ -436,7 +436,7 @@ void DrawView(double smoothRatio, bool sceneonly)
if ((bSubTitles && !subtitleOverlay.AdvanceCinemaText(myclock)) || inputState.CheckAllInput())
{
inputState.ClearAllInput();
EndLevel = 2;
EndLevel = 1;
if (CDplaying()) {
fadecdaudio();