# HG changeset patch # User Ritor1 # Date 1405310654 -21600 # Node ID 069018761f96a2215cbdfb02e112c9729c6d65be # Parent 8cee51ce4382332bfc4b3d6e6e741cbfbba1c258# Parent f794566045cd0da06daef2b198f2e685e3fe4141 Слияние diff -r 8cee51ce4382 -r 069018761f96 UI/UiGame.cpp --- a/UI/UiGame.cpp Mon Jul 14 10:03:44 2014 +0600 +++ b/UI/UiGame.cpp Mon Jul 14 10:04:14 2014 +0600 @@ -1223,7 +1223,7 @@ if ( !pLevelDecorations[pickedObjectID].uEventID ) { if ( pLevelDecorations[pickedObjectID].IsInteractive() ) - pText = pNPCTopics[stru_5E4C90_MapPersistVars._decor_events[pLevelDecorations[pickedObjectID]._idx_in_stru123 - 75] + 379].pTopic;// + pText = pNPCTopics[stru_5E4C90_MapPersistVars._decor_events[pLevelDecorations[pickedObjectID]._idx_in_stru123 - 75] + 380].pTopic;// else pText = pDecorationList->pDecorations[pLevelDecorations[pickedObjectID].uDecorationDescID].field_20; GameUI_SetFooterString(pText);