OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-19 03:39:08 +00:00
Code Releases Activity

Force page stream to stay open during a room load

Browse Source
This commit is contained in:
Branan Purvine-Riley
2011-11-01 00:39:17 -07:00
parent 220c05e825
commit c1deed66c7
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Sources/Plasma/PubUtilLib/plResMgr/plResManager.cpp
View File

@ -1193,6 +1193,9 @@ void plResManager::PageInRoom(const plLocation& page, UInt16 objClassToRef, plRe
return; return;
} }
// Step 0.9: Open the stream on this page, so it remains open for the entire loading process
pageNode->OpenStream();
// Step 1: We force a load on all the keys in the given page // Step 1: We force a load on all the keys in the given page
kResMgrLog(2, ILog(2, "...Loading page keys...")); kResMgrLog(2, ILog(2, "...Loading page keys..."));
LoadPageKeys(pageNode); LoadPageKeys(pageNode);
@ -1211,6 +1214,7 @@ void plResManager::PageInRoom(const plLocation& page, UInt16 objClassToRef, plRe
kResMgrLog(1, ILog(1, "...SceneNode not found to base page-in op on. Aborting...")); kResMgrLog(1, ILog(1, "...SceneNode not found to base page-in op on. Aborting..."));
// This is coming up a lot lately; too intrusive to be an assert. // This is coming up a lot lately; too intrusive to be an assert.
// hsAssert( false, "No object found on which to base our PageInRoom()" ); // hsAssert( false, "No object found on which to base our PageInRoom()" );
pageNode->CloseStream();
return; return;
} }
@ -1229,6 +1233,9 @@ void plResManager::PageInRoom(const plLocation& page, UInt16 objClassToRef, plRe
kResMgrLog(2, ILog(2, "...Dispatching refMessage...")); kResMgrLog(2, ILog(2, "...Dispatching refMessage..."));
AddViaNotify(objKey, refMsg, plRefFlags::kActiveRef); AddViaNotify(objKey, refMsg, plRefFlags::kActiveRef);
// Step 5.9: Close the page stream
pageNode->CloseStream();
// All done! // All done!
kResMgrLog(1, ILog(1, "...Page in complete!")); kResMgrLog(1, ILog(1, "...Page in complete!"));