Mercurial > mm7

comparison UI/UiGame.cpp @ 1526:f47eab1a70d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
UIHouses.cpp cleaning(continue)
author Ritor1
date Thu, 05 Sep 2013 18:05:50 +0600
parents 863de6ec906b
children c4ab816fcc5e
comparison
equal deleted inserted replaced
1525:863de6ec906b 1526:f47eab1a70d8
1250 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[470], pSpriteObjects[v19].stru_24.GetDisplayName());// "Get %s" 1250 sprintfex(pTmpBuf.data(), pGlobalTXT_LocalizationStrings[470], pSpriteObjects[v19].stru_24.GetDisplayName());// "Get %s"
1251 } 1251 }
1252 //For Decorations---------------------------------- 1252 //For Decorations----------------------------------
1253 if (PID_TYPE(v18) == OBJECT_Decoration) 1253 if (PID_TYPE(v18) == OBJECT_Decoration)
1254 { 1254 {
1255 if ( !pLevelDecorations[v19].field_16_event_id ) 1255 if ( !pLevelDecorations[v19].uEventID )
1256 { 1256 {
1257 if ( pLevelDecorations[v19].IsInteractive() ) 1257 if ( pLevelDecorations[v19].IsInteractive() )
1258 pText = pNPCTopics[stru_5E4C90._decor_events[pLevelDecorations[v19]._idx_in_stru123 - 75] + 379].pTopic; 1258 pText = pNPCTopics[stru_5E4C90._decor_events[pLevelDecorations[v19]._idx_in_stru123 - 75] + 379].pTopic;
1259 else 1259 else
1260 pText = pDecorationList->pDecorations[pLevelDecorations[v19].uDecorationDescID].field_20; 1260 pText = pDecorationList->pDecorations[pLevelDecorations[v19].uDecorationDescID].field_20;
1268 } 1268 }
1269 } 1269 }
1270 uLastPointedObjectID = pMouse->uPointingObjectID; 1270 uLastPointedObjectID = pMouse->uPointingObjectID;
1271 return; 1271 return;
1272 } 1272 }
1273 if ( !GetEventHintString(pLevelDecorations[v19].field_16_event_id) ) 1273 if ( !GetEventHintString(pLevelDecorations[v19].uEventID) )
1274 { 1274 {
1275 if ( pMouse->uPointingObjectID == 0 ) 1275 if ( pMouse->uPointingObjectID == 0 )
1276 { 1276 {
1277 if ( uLastPointedObjectID != 0 ) 1277 if ( uLastPointedObjectID != 0 )
1278 { 1278 {
1281 } 1281 }
1282 } 1282 }
1283 uLastPointedObjectID = pMouse->uPointingObjectID; 1283 uLastPointedObjectID = pMouse->uPointingObjectID;
1284 return; 1284 return;
1285 } 1285 }
1286 GameUI_SetFooterString(GetEventHintString(pLevelDecorations[v19].field_16_event_id)); 1286 GameUI_SetFooterString(GetEventHintString(pLevelDecorations[v19].uEventID));
1287 if ( pMouse->uPointingObjectID == 0 ) 1287 if ( pMouse->uPointingObjectID == 0 )
1288 { 1288 {
1289 if ( uLastPointedObjectID != 0 ) 1289 if ( uLastPointedObjectID != 0 )
1290 { 1290 {
1291 pFooterString[0] = 0; 1291 pFooterString[0] = 0;