libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-20 08:53:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PEGASUS: Fix segfault after sub chase sequence

Browse Source
This commit is contained in:
Matthew Hoops 2011-11-03 15:00:22 -04:00
parent 053e1d6529
commit d932df79be
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
engines/pegasus/pegasus.cpp
View File

@ -1255,17 +1255,22 @@ void PegasusEngine::useNeighborhood(Neighborhood *neighborhood) {
}
}
void PegasusEngine::performJump(const tNeighborhoodID neighborhoodID) {
void PegasusEngine::performJump(tNeighborhoodID neighborhoodID) {
if (_neighborhood)
useNeighborhood(0);
// Sub chase is special
if (neighborhoodID == kNoradSubChaseID) {
throwAwayEverything();
doSubChase();
jumpToNewEnvironment(kNoradDeltaID, kNorad41, kEast);
return;
}
if (_neighborhood)
useNeighborhood(0);
if (shouldQuit())
return;
neighborhoodID = kNoradDeltaID;
GameState.setNextRoom(kNorad41);
GameState.setNextDirection(kEast);
}
Neighborhood *neighborhood;
makeNeighborhood(neighborhoodID, neighborhood);
@ -1273,10 +1278,10 @@ void PegasusEngine::performJump(const tNeighborhoodID neighborhoodID) {
}
void PegasusEngine::startNeighborhood() {
if (_currentItemID != kNoItemID)
if (g_interface && _currentItemID != kNoItemID)
g_interface->setCurrentInventoryItemID(_currentItemID);
if (_currentBiochipID != kNoItemID)
if (g_interface && _currentBiochipID != kNoItemID)
g_interface->setCurrentBiochipID(_currentBiochipID);
setGameMode(kModeNavigation);
@ -1344,7 +1349,7 @@ void PegasusEngine::startNewGame() {
void PegasusEngine::makeNeighborhood(tNeighborhoodID neighborhoodID, Neighborhood *&neighborhood) {
// TODO: CD check
switch (neighborhoodID) {
case kCaldoriaID:
neighborhood = new Caldoria(g_AIArea, this);
@ -1367,8 +1372,12 @@ void PegasusEngine::makeNeighborhood(tNeighborhoodID neighborhoodID, Neighborhoo
case kNoradAlphaID:
neighborhood = new NoradAlpha(g_AIArea, this);
break;
case kNoradDeltaID:
createInterface();
error("TODO: Norad Delta");
break;
default:
error("Unhandled neighborhood %d", neighborhoodID);
error("Unknown neighborhood %d", neighborhoodID);
}
}

2
engines/pegasus/pegasus.h
View File

@ -265,7 +265,7 @@ private:
// Neighborhood
Neighborhood *_neighborhood;
void useNeighborhood(Neighborhood *neighborhood);
void performJump(const tNeighborhoodID start);
void performJump(tNeighborhoodID start);
void startNewGame();
void startNeighborhood();
void makeNeighborhood(tNeighborhoodID, Neighborhood *&);