OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-21 12:49:10 +00:00
Code Releases Activity

Merge pull request #96 from branan/pagestream

Browse Source 
Force page stream to stay open during a room load
This commit is contained in:
Branan Purvine-Riley
2011-11-02 23:27:24 -07:00
parent 70a9698605 c1deed66c7
commit 470224c54e
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;
}
// 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
kResMgrLog(2, ILog(2, "...Loading page keys..."));
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..."));
// This is coming up a lot lately; too intrusive to be an assert.
// hsAssert( false, "No object found on which to base our PageInRoom()" );
pageNode->CloseStream();
return;
}
@ -1229,6 +1233,9 @@ void plResManager::PageInRoom(const plLocation& page, UInt16 objClassToRef, plRe
kResMgrLog(2, ILog(2, "...Dispatching refMessage..."));
AddViaNotify(objKey, refMsg, plRefFlags::kActiveRef);
// Step 5.9: Close the page stream
pageNode->CloseStream();
// All done!
kResMgrLog(1, ILog(1, "...Page in complete!"));