Mercurial > mm7

comparison UI/UiGame.cpp @ 1740:0155fb9254dd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 27 Sep 2013 15:19:46 +0600
parents c6fe09a06712
children 24e756a50073
comparison
equal deleted inserted replaced
1739:1776d4f033a7 1740:0155fb9254dd
1228 if (PID_TYPE(v18) == OBJECT_Decoration) 1228 if (PID_TYPE(v18) == OBJECT_Decoration)
1229 { 1229 {
1230 if ( !pLevelDecorations[v19].uEventID ) 1230 if ( !pLevelDecorations[v19].uEventID )
1231 { 1231 {
1232 if ( pLevelDecorations[v19].IsInteractive() ) 1232 if ( pLevelDecorations[v19].IsInteractive() )
1233 pText = pNPCTopics[stru_5E4C90._decor_events[pLevelDecorations[v19]._idx_in_stru123 - 75] + 379].pTopic;// 1233 pText = pNPCTopics[stru_5E4C90_MapPersistVars._decor_events[pLevelDecorations[v19]._idx_in_stru123 - 75] + 379].pTopic;//
1234 else 1234 else
1235 pText = pDecorationList->pDecorations[pLevelDecorations[v19].uDecorationDescID].field_20; 1235 pText = pDecorationList->pDecorations[pLevelDecorations[v19].uDecorationDescID].field_20;
1236 GameUI_SetFooterString(pText); 1236 GameUI_SetFooterString(pText);
1237 if ( pMouse->uPointingObjectID == 0 ) 1237 if ( pMouse->uPointingObjectID == 0 )
1238 { 1238 {