Mercurial > mm7

changeset 2026:23ef3589440f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
History book fix
author Ritor1
date Sun, 17 Nov 2013 23:26:44 +0600
parents 4000f8184c29
children 3fa489e0a3f2
files GUIWindow.cpp UI/UiGame.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/GUIWindow.cpp	Sun Nov 17 01:14:58 2013 +0600
+++ b/GUIWindow.cpp	Sun Nov 17 23:26:44 2013 +0600
@@ -623,7 +623,7 @@
       memset(Journal_limitation_factor.data(), 0, 100);
       if ( books_primary_item_per_page < 29 )
       {
-        for ( int i = books_primary_item_per_page; i < books_primary_item_per_page + 31; i++ )
+        for ( int i = books_primary_item_per_page; i < books_primary_item_per_page + 29; i++ )
         {
           if ( pParty->PartyTimes.HistoryEventTimes[i] > 0 )
           {
--- a/UI/UiGame.cpp	Sun Nov 17 01:14:58 2013 +0600
+++ b/UI/UiGame.cpp	Sun Nov 17 23:26:44 2013 +0600
@@ -1234,7 +1234,7 @@
         if ( !pLevelDecorations[v19].uEventID )
         {
           if ( pLevelDecorations[v19].IsInteractive() )
-            pText = pNPCTopics[stru_5E4C90_MapPersistVars._decor_events[pLevelDecorations[v19]._idx_in_stru123 - 75] + 379].pTopic;//неверно для костра
+            pText = pNPCTopics[stru_5E4C90_MapPersistVars._decor_events[pLevelDecorations[v19]._idx_in_stru123 - 75] + 380].pTopic;//-379
           else
             pText = pDecorationList->pDecorations[pLevelDecorations[v19].uDecorationDescID].field_20;
           GameUI_SetFooterString(pText);