Mercurial > mm7

comparison UI/UiGame.cpp @ 2402:8cee51ce4382

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
included directx 11
author Ritor1
date Mon, 14 Jul 2014 10:03:44 +0600
parents ecd1dd95ec49
children 069018761f96
comparison
equal deleted inserted replaced
2400:ecd1dd95ec49 2402:8cee51ce4382
1325 if ( (signed int)pX >= (signed int)pButton->uX && (signed int)pX <= (signed int)pButton->uZ 1325 if ( (signed int)pX >= (signed int)pButton->uX && (signed int)pX <= (signed int)pButton->uZ
1326 && (signed int)pY >= (signed int)pButton->uY && (signed int)pY <= (signed int)pButton->uW ) 1326 && (signed int)pY >= (signed int)pButton->uY && (signed int)pY <= (signed int)pButton->uW )
1327 { 1327 {
1328 pMessageType1 = (UIMessageType)pButton->field_1C; 1328 pMessageType1 = (UIMessageType)pButton->field_1C;
1329 if ( pMessageType1 ) 1329 if ( pMessageType1 )
1330 pMessageQueue_50CBD0->AddMessage(pMessageType1, pButton->msg_param, 0); 1330 pMessageQueue_50CBD0->AddGUIMessage(pMessageType1, pButton->msg_param, 0);
1331 GameUI_SetFooterString(pButton->pButtonName); 1331 GameUI_SetFooterString(pButton->pButtonName);
1332 uLastPointedObjectID = 1; 1332 uLastPointedObjectID = 1;
1333 return; 1333 return;
1334 } 1334 }
1335 break; 1335 break;
1344 1344
1345 if (ratioX + ratioY < 1.0) 1345 if (ratioX + ratioY < 1.0)
1346 { 1346 {
1347 pMessageType2 = (UIMessageType)pButton->field_1C; 1347 pMessageType2 = (UIMessageType)pButton->field_1C;
1348 if ( pMessageType2 != 0 ) 1348 if ( pMessageType2 != 0 )
1349 pMessageQueue_50CBD0->AddMessage(pMessageType2, pButton->msg_param, 0); 1349 pMessageQueue_50CBD0->AddGUIMessage(pMessageType2, pButton->msg_param, 0);
1350 GameUI_SetFooterString(pButton->pButtonName); // for character name 1350 GameUI_SetFooterString(pButton->pButtonName); // for character name
1351 uLastPointedObjectID = 1; 1351 uLastPointedObjectID = 1;
1352 return; 1352 return;
1353 } 1353 }
1354 } 1354 }
1450 { 1450 {
1451 GameUI_SetFooterString(pButton->pButtonName); 1451 GameUI_SetFooterString(pButton->pButtonName);
1452 } 1452 }
1453 else 1453 else
1454 { 1454 {
1455 pMessageQueue_50CBD0->AddMessage(pMessageType3, pButton->msg_param, 0); 1455 pMessageQueue_50CBD0->AddGUIMessage(pMessageType3, pButton->msg_param, 0);
1456 } 1456 }
1457 uLastPointedObjectID = 1; 1457 uLastPointedObjectID = 1;
1458 return; 1458 return;
1459 } 1459 }
1460 break; 1460 break;
1469 1469
1470 if (ratioX + ratioY < 1.0) 1470 if (ratioX + ratioY < 1.0)
1471 { 1471 {
1472 pMessageType2 = (UIMessageType)pButton->field_1C; 1472 pMessageType2 = (UIMessageType)pButton->field_1C;
1473 if ( pMessageType2 != 0 ) 1473 if ( pMessageType2 != 0 )
1474 pMessageQueue_50CBD0->AddMessage(pMessageType2, pButton->msg_param, 0); 1474 pMessageQueue_50CBD0->AddGUIMessage(pMessageType2, pButton->msg_param, 0);
1475 GameUI_SetFooterString(pButton->pButtonName); // for character name 1475 GameUI_SetFooterString(pButton->pButtonName); // for character name
1476 uLastPointedObjectID = 1; 1476 uLastPointedObjectID = 1;
1477 return; 1477 return;
1478 } 1478 }
1479 } 1479 }