OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 10:37:41 -04:00
Code Releases Activity

Merged in cwalther/cwe (pull request #3)

Browse Source
This commit is contained in:
rarified
2012-01-27 20:02:49 -07:00
parent a35a942ab2 dd55856ea2
commit 7c058fa898
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
View File

@ -1742,10 +1742,8 @@ void pfJournalBook::IHandleCheckClick( UInt32 idx, pfBookData::WhichSide which )
void pfJournalBook::GoToPage( UInt32 pageNumber )
{
// Put us here, but only on an even page (odd pages go on the right, y'know)
if (pageNumber < fPageStarts.Count())
fCurrentPage = pageNumber & ~0x00000001;
else
fCurrentPage = 0;
// (no need for a range check, going past the end simply puts you on a blank page, able to go backward but not forward)
fCurrentPage = pageNumber & ~0x00000001;
fVisibleLinks.Reset();
IRenderPage( fCurrentPage, pfJournalDlgProc::kTagLeftDTMap );
IRenderPage( fCurrentPage + 1, pfJournalDlgProc::kTagRightDTMap );
@ -2602,7 +2600,7 @@ void pfJournalBook::IRenderPage( UInt32 page, UInt32 whichDTMap, hsBool suppress
}
}
hsAssert(page < fPageStarts.GetCount(), "UnInitialized page start!");
hsAssert(page < fPageStarts.GetCount() || page > fLastPage, "UnInitialized page start!");
if( page <= fLastPage
&& page < fPageStarts.GetCount()) // Added this as a crash-prevention bandaid - MT
{