Mercurial > mm7

comparison UI/UiGame.cpp @ 1501:5e601a07010d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
UIGame.cpp cleaning(continue)
author Ritor1
date Sun, 01 Sep 2013 17:41:00 +0600
parents fd6c580a02b7
children c76c0f6974bc
comparison
equal deleted inserted replaced
1500:fd6c580a02b7 1501:5e601a07010d
1261 return; 1261 return;
1262 } 1262 }
1263 if ( v18 >= (signed int)0x2000000u || pParty->pPickedItem.uItemID ) 1263 if ( v18 >= (signed int)0x2000000u || pParty->pPickedItem.uItemID )
1264 { 1264 {
1265 v22 = pSpriteObjects[v30].stru_24.GetDisplayName(); 1265 v22 = pSpriteObjects[v30].stru_24.GetDisplayName();
1266 v26 = v22; 1266 GameUI_SetFooterString(v22);
1267 GameUI_SetFooterString(v26);
1268 if ( pMouse->uPointingObjectID == 0 ) 1267 if ( pMouse->uPointingObjectID == 0 )
1269 { 1268 {
1270 if ( uLastPointedObjectID != 0 ) 1269 if ( uLastPointedObjectID != 0 )
1271 { 1270 {
1272 pFooterString[0] = 0; 1271 pFooterString[0] = 0;
1319 } 1318 }
1320 } 1319 }
1321 uLastPointedObjectID = pMouse->uPointingObjectID; 1320 uLastPointedObjectID = pMouse->uPointingObjectID;
1322 return; 1321 return;
1323 } 1322 }
1324 v26 = v22; 1323 GameUI_SetFooterString(v22);
1325 GameUI_SetFooterString(v26);
1326 if ( pMouse->uPointingObjectID == 0 ) 1324 if ( pMouse->uPointingObjectID == 0 )
1327 { 1325 {
1328 if ( uLastPointedObjectID != 0 ) 1326 if ( uLastPointedObjectID != 0 )
1329 { 1327 {
1330 pFooterString[0] = 0; 1328 pFooterString[0] = 0;
1338 { 1336 {
1339 if ( HIWORD(v18) < 512) 1337 if ( HIWORD(v18) < 512)
1340 { 1338 {
1341 if ( uCurrentlyLoadedLevelType != LEVEL_Indoor) 1339 if ( uCurrentlyLoadedLevelType != LEVEL_Indoor)
1342 { 1340 {
1343 v18b = (signed int)(unsigned __int16)v18 >> 9; 1341 v18b = (signed int)(unsigned __int16)v18 >> 9;
1344 v21 = pOutdoor->pBModels[v18b].pFaces[v19 & 0x3F].sCogTriggeredID; 1342 v21 = pOutdoor->pBModels[v18b].pFaces[v19 & 0x3F].sCogTriggeredID;
1345 if ( !v21 || (v22 = GetEventHintString(v21)) == 0 ) 1343 if ( !v21 || (v22 = GetEventHintString(v21)) == 0 )
1346 { 1344 {
1347 pMouse->uPointingObjectID = 0; 1345 pMouse->uPointingObjectID = 0;
1348 uLastPointedObjectID = 1; 1346 uLastPointedObjectID = 1;
1355 } 1353 }
1356 } 1354 }
1357 uLastPointedObjectID = pMouse->uPointingObjectID; 1355 uLastPointedObjectID = pMouse->uPointingObjectID;
1358 return; 1356 return;
1359 } 1357 }
1360 v26 = v22; 1358 GameUI_SetFooterString(v22);
1361 GameUI_SetFooterString(v26);
1362 if ( pMouse->uPointingObjectID == 0 ) 1359 if ( pMouse->uPointingObjectID == 0 )
1363 { 1360 {
1364 if ( uLastPointedObjectID != 0 ) 1361 if ( uLastPointedObjectID != 0 )
1365 { 1362 {
1366 pFooterString[0] = 0; 1363 pFooterString[0] = 0;
1387 } 1384 }
1388 } 1385 }
1389 uLastPointedObjectID = pMouse->uPointingObjectID; 1386 uLastPointedObjectID = pMouse->uPointingObjectID;
1390 return; 1387 return;
1391 } 1388 }
1392 v26 = v22; 1389 GameUI_SetFooterString(v22);
1393 GameUI_SetFooterString(v26);
1394 if ( pMouse->uPointingObjectID == 0 ) 1390 if ( pMouse->uPointingObjectID == 0 )
1395 { 1391 {
1396 if ( uLastPointedObjectID != 0 ) 1392 if ( uLastPointedObjectID != 0 )
1397 { 1393 {
1398 pFooterString[0] = 0; 1394 pFooterString[0] = 0;