Mercurial > mm7

comparison UI/UiGame.cpp @ 2400:ecd1dd95ec49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixing 2 polishing bugs in GameUI_WritePointedObjectStatusString
author Grumpy7
date Thu, 10 Jul 2014 01:48:39 +0200
parents aad4f31aa297
children f794566045cd 8cee51ce4382
comparison
equal deleted inserted replaced
2399:aad4f31aa297 2400:ecd1dd95ec49
1201 if ( PID_TYPE(pickedObjectPID) == OBJECT_Item ) 1201 if ( PID_TYPE(pickedObjectPID) == OBJECT_Item )
1202 { 1202 {
1203 if ( pObjectList->pObjects[pSpriteObjects[pickedObjectID].uObjectDescID].uFlags & 0x10 ) 1203 if ( pObjectList->pObjects[pSpriteObjects[pickedObjectID].uObjectDescID].uFlags & 0x10 )
1204 { 1204 {
1205 pMouse->uPointingObjectID = 0; 1205 pMouse->uPointingObjectID = 0;
1206 if ( uLastPointedObjectID != 0 ) 1206 pFooterString[0] = 0;
1207 { 1207 bForceDrawFooter = 1;
1208 pFooterString[0] = 0;
1209 bForceDrawFooter = 1;
1210 }
1211 uLastPointedObjectID = 0; 1208 uLastPointedObjectID = 0;
1212 return; 1209 return;
1213 } 1210 }
1214 if ( pickedObjectPID >= 0x2000000u || pParty->pPickedItem.uItemID ) 1211 if ( pickedObjectPID >= 0x2000000u || pParty->pPickedItem.uItemID )
1215 { 1212 {
1266 } 1263 }
1267 } 1264 }
1268 } 1265 }
1269 if (newString) 1266 if (newString)
1270 { 1267 {
1268 GameUI_SetFooterString(newString);
1271 if ( pMouse->uPointingObjectID == 0 && uLastPointedObjectID != 0) 1269 if ( pMouse->uPointingObjectID == 0 && uLastPointedObjectID != 0)
1272 { 1270 {
1273 pFooterString[0] = 0; 1271 pFooterString[0] = 0;
1274 bForceDrawFooter = 1; 1272 bForceDrawFooter = 1;
1275 } 1273 }