Mercurial > mm7
diff UI/UiGame.cpp @ 1740:0155fb9254dd
Слияние
author | Ritor1 |
---|---|
date | Fri, 27 Sep 2013 15:19:46 +0600 |
parents | c6fe09a06712 |
children | 24e756a50073 |
line wrap: on
line diff
--- a/UI/UiGame.cpp Fri Sep 27 15:19:32 2013 +0600 +++ b/UI/UiGame.cpp Fri Sep 27 15:19: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_MapPersistVars._decor_events[pLevelDecorations[v19]._idx_in_stru123 - 75] + 379].pTopic;// else pText = pDecorationList->pDecorations[pLevelDecorations[v19].uDecorationDescID].field_20; GameUI_SetFooterString(pText);