changeset 1698:8cfb2e978445

Merge
author Ritor1
date Sun, 22 Sep 2013 16:45:46 +0600
parents eccd4278fc2f (diff) 7d99124bccd8 (current diff)
children 33c7cc2d48d5
files UI/UiGame.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/UI/UiGame.cpp	Sun Sep 22 10:51:08 2013 +0200
+++ b/UI/UiGame.cpp	Sun Sep 22 16:45:46 2013 +0600
@@ -1230,7 +1230,7 @@
       if ( !pLevelDecorations[v19].uEventID )
       {
         if ( pLevelDecorations[v19].IsInteractive() )
-          pText = pNPCTopics[stru_5E4C90._decor_events[pLevelDecorations[v19]._idx_in_stru123 - 75] + 379].pTopic;
+          pText = pNPCTopics[stru_5E4C90._decor_events[pLevelDecorations[v19]._idx_in_stru123 - 75] + 379].pTopic;//неверно для костра
         else
           pText = pDecorationList->pDecorations[pLevelDecorations[v19].uDecorationDescID].field_20;
         GameUI_SetFooterString(pText);