Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove references to pages that don't exist (i. e. have no .prp file) #1366

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove references to pages that don't exist (i. e. have no .prp file) #1366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2e1919
Complain more loudly when something tries to load a nonexistant page
dgelessus Mar 19, 2023
9a57e84
Fix scripts that tried to load nonexistant pages
dgelessus Mar 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Scripts/Python/Cleft.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,12 @@ def __init__(self):
else:
pages += ["Desert","Cleft","FemaleCleftDropIn","MaleCleftDropIn","clftJCsDesert","clftJCsChasm"]
if loadZandi:
pages += ["clftZandiVis","ZandiCrossLegs","ZandiDirections","ZandiDirections01","ZandiDirections02","ZandiDirections03"]
pages += ["clftZandiVis","ZandiCrossLegs","ZandiDirections"]
pages += ["ZandiIdle","ZandiRubNose","ZandiScratchHead","ZandiTurnPage","ZandiAllFace","ZandiOpen01Face"]
pages += ["ZandiOpen02Face","ZandiRand01Face","ZandiRand02Face","ZandiRand03Face","ZandiRand04Face","ZandiRand05Face"]
pages += ["ZandiRes01aFace","ZandiRes01bFace","ZandiRes02aFace","ZandiRes02bFace","ZandiRes03aFace","ZandiRes03bFace"]
pages += ["ZandiJC01aFace","ZandiJC01bFace","ZandiJC02aFace","ZandiJC02bFace","ZandiJC03aFace","ZandiJC03bFace"]
pages += ["ZandiJC04aFace","ZandiJC04bFace","ZandiJC05aFace","ZandiJC05bFace","ZandiJC06aFace","ZandiJC06bFace"]
pages += ["ZandiJC04aFace","ZandiJC05aFace","ZandiJC05bFace","ZandiJC06aFace","ZandiJC06bFace"]
pages += ["ZandiJC07aFace","ZandiJC07bFace"]
else:
PtDebugPrint("Zandi seems to have stepped away from the Airstream. Hmmm...")
Expand Down Expand Up @@ -191,8 +191,6 @@ def OnServerInitComplete(self):
SDLVarSceneYeesha = "clftSceneYeeshaUnseen"
boolSceneYeesha = ageSDL[SDLVarSceneYeesha][0]
if boolSceneYeesha:
#PtDebugPrint("Cleft.OnServerInitComplete: SDL says Yeesha hasn't played yet, paging in SceneYeesha stuff...")
#PtPageInNode("clftSceneYeesha")
SDLVarOfficeDoor = "clftOfficeDoorClosed"
boolOfficeDoor = ageSDL[SDLVarOfficeDoor][0]
if boolOfficeDoor:
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Python/city.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ def __init__(self):
# For the non-public age, add all the remaining pages
if not IsKadishGallery:
pages += ["canyon","cavetjunction","courtyard","ferry","greatstair","guildhall","harbor","HarborReflect"]
pages += ["islmGreatZeroState","islmJCNote","islmNegilahnCreatureChartGUI","islmNickNote","islmPodMapGUI"]
pages += ["islmJCNote","islmNegilahnCreatureChartGUI","islmNickNote","islmPodMapGUI"]
pages += ["islmWatsonLetterGUI","KahloPub","kahlopubtunnel","library","LibraryInterior"]
pages += ["MuseumInteriorPage","palace"]
pages += ["islmBahroShoutFerry","islmBahroShoutLibrary","islmBahroShoutPalace"]
Expand Down
2 changes: 1 addition & 1 deletion Scripts/Python/clftNpcZandi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ def ZandiSpeaks(self, clicked = 0):
if useSpeech == "1":
self.ZandiFace = "ZandiJC04aFace"
else:
self.ZandiFace = "ZandiJC04bFace"
self.ZandiFace = "ZandiJC04aFace" # Because ZandiJC04bFace is missing...

elif not self.CheckForJC(jcProgress, JC.Sign) and not PtIsDemoMode():
if self.LastSpeech != 7:
Expand Down
4 changes: 1 addition & 3 deletions Scripts/Python/kemoEmgrPhase0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@
#globals
variable = None

BooleanVARs = [
"kemoJourneySymbolVis",
]
BooleanVARs = []


AgeStartedIn = None
Expand Down
6 changes: 0 additions & 6 deletions Scripts/Python/ki/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,12 +297,9 @@ def __del__(self):
PtUnloadDialog("KIHelp")
PtUnloadDialog("KIHelpMenu")
PtUnloadDialog("KeyMapDialog")
PtUnloadDialog("GameSettingsDialog")
PtUnloadDialog("CalibrationGUI")
PtUnloadDialog("TrailerPreviewGUI")
PtUnloadDialog("KeyMap2Dialog")
PtUnloadDialog("AdvancedGameSettingsDialog")
PtUnloadDialog("OptionsHelpGUI")
PtUnloadDialog("bkNotebook")
PtUnloadDialog("bkBahroRockBook")
PtUnloadDialog("YeeshaPageGUI")
Expand Down Expand Up @@ -344,12 +341,9 @@ def OnInit(self):
PtLoadDialog("KIHelp")
PtLoadDialog("KIHelpMenu")
PtLoadDialog("KeyMapDialog")
PtLoadDialog("GameSettingsDialog")
PtLoadDialog("CalibrationGUI")
PtLoadDialog("TrailerPreviewGUI")
PtLoadDialog("KeyMap2Dialog")
PtLoadDialog("AdvancedGameSettingsDialog")
PtLoadDialog("OptionsHelpGUI")
PtLoadDialog("bkNotebook")
PtLoadDialog("bkBahroRockBook")
PtLoadDialog("YeeshaPageGUI")
Expand Down
4 changes: 1 addition & 3 deletions Scripts/Python/tldnEmgrPhase0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@
#globals
variable = None

BooleanVARs = [
"tldnPumpSwitchFunc"
]
BooleanVARs = []

AgeStartedIn = None

Expand Down
2 changes: 0 additions & 2 deletions Scripts/Python/xOptionsMenu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,6 @@ def OnFirstUpdate(self):
"First update, load our dialogs"
PtLoadDialog("OptionsMenuGUI",self.key)
PtLoadDialog("KeyMapDialog",self.key)
PtLoadDialog("GameSettingsDialog",self.key)
PtLoadDialog("CalibrationGUI",self.key)
PtLoadDialog("TrailerPreviewGUI",self.key)
PtLoadDialog("AdvancedGameSettingsDialog",self.key)
Expand All @@ -479,7 +478,6 @@ def OnFirstUpdate(self):
def __del__(self):
"the destructor - unload any dialogs we loaded"
PtUnloadDialog("KeyMapDialog")
PtUnloadDialog("GameSettingsDialog")
PtUnloadDialog("CalibrationGUI")
PtUnloadDialog("TrailerPreviewGUI")
PtUnloadDialog("AdvancedGameSettingsDialog")
Expand Down
2 changes: 1 addition & 1 deletion Sources/Plasma/NucleusLib/pnMessage/plClientMsg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ void plClientMsg::AddRoomLoc(const plLocation& loc)
if (loc.IsValid())
fRoomLocs.emplace_back(loc);
else
hsStatusMessage("Trying to load an invalid room, ignoring");
hsAssert(false, "Trying to load an invalid room");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The challenge with this is that it only fires in debug builds.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, we could make it a hard error everywhere. I can't think of a good reason why you'd want to silently ignore invalid page loads, but perhaps there are weird cases that I don't know about.

Or just leave the original log message in place, in addition to the assert. Though I feel like the log message on its own isn't a good tool for uncovering these issues, considering that it has appeared on every game start for years without anybody paying attention to it...

}

void plClientMsg::Read(hsStream* stream, hsResMgr* mgr)
Expand Down