# HG changeset patch # User Ritor1 # Date 1379846746 -21600 # Node ID 8cfb2e978445aa89c085a3ff883353402d46b712 # Parent eccd4278fc2f19968b4323455c990e6bde7c4a2f# Parent 7d99124bccd8560b2b0b979f17e13fb85765a0c0 Merge diff -r 7d99124bccd8 -r 8cfb2e978445 UI/UiGame.cpp --- 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);