Alex/REDRIVER2
1
0
Fork 0
mirror of https://github.com/OpenDriver2/REDRIVER2.git synced 2024-11-22 10:22:48 +01:00
Code Issues Projects Releases Wiki Activity

- fix SaveGameDate skipping mission ladder step

Browse Source
This commit is contained in:
Ilya Shurumov 2021-05-22 13:53:12 +06:00 committed by InspirationByte
parent d196da6b9d
commit f7d68c0bd3
2 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src_rebuild/Game/C/glaunch.c
View File

@ -367,7 +367,7 @@ void State_MissionLadder(void* param)
quit = 0;
RenderArgs.nRenders = 0;
CurrentStep = MissionLadder + gMissionLadderPos;
CurrentStep = &MissionLadder[gMissionLadderPos];
if (newgame == 0 && CurrentStep->flags != 0)
{
@ -383,20 +383,15 @@ void State_MissionLadder(void* param)
}
do {
if (CurrentStep->disc == 0)
{
CheckForCorrectDisc(0);
}
else
{
CheckForCorrectDisc(1);
}
CheckForCorrectDisc(CurrentStep->disc);
if (RenderArgs.nRenders == 4)
{
SetPleaseWait(NULL);
PlayRender(&RenderArgs);
RenderArgs.nRenders = 0;
SetPleaseWait(NULL);
}
@ -410,30 +405,20 @@ void State_MissionLadder(void* param)
}
SetPleaseWait(NULL);
gCurrentMissionNumber = CurrentStep->data;
SetState(STATE_GAMELAUNCH);
quit = 1;
/*
if (WantedGameMode == GAMEMODE_NEXTMISSION)
{
if (gCurrentMissionNumber > gFurthestMission)
gFurthestMission = gCurrentMissionNumber;
}
else
{
quit = 1;
}*/
}
else if (CurrentStep->flags == 1)
else if (CurrentStep->flags == 1) // any render
{
RenderArgs.Args[RenderArgs.nRenders].render = CurrentStep->data;
RenderArgs.Args[RenderArgs.nRenders].recap = 0;
RenderArgs.Args[RenderArgs.nRenders].credits = 0;
RenderArgs.nRenders++;
}
else if (CurrentStep->flags == 4)
else if (CurrentStep->flags == 4) // ending
{
SetPleaseWait(NULL);
@ -445,14 +430,13 @@ void State_MissionLadder(void* param)
PlayRender(&RenderArgs);
SetPleaseWait(NULL);
AvailableCheats.cheat5 = true;
quit = 1;
AvailableCheats.cheat5 = true;
}
CurrentStep++;
gMissionLadderPos = CurrentStep - MissionLadder;
} while (!quit);
}

2
src_rebuild/Game/C/loadsave.c
View File

@ -378,7 +378,7 @@ int SaveGameData(char* buffer)
ClearMem((char*)saveHeader, sizeof(GAME_SAVE_HEADER));
saveHeader->magic = 0x54876421;
saveHeader->gMissionLadderPos = gMissionLadderPos + 1;
saveHeader->gMissionLadderPos = gMissionLadderPos;
saveHeader->SavedData = MissionEndData;