Mercurial > mm7
changeset 2403:069018761f96
Слияние
author | Ritor1 |
---|---|
date | Mon, 14 Jul 2014 10:04:14 +0600 |
parents | 8cee51ce4382 (current diff) f794566045cd (diff) |
children | 82512695b45d |
files | UI/UiGame.cpp |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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);