Mercurial > mm7

comparison mm7_1.cpp @ 456:20d96ec810c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 24 Feb 2013 13:53:18 +0600
parents 5e5dfedcc0ad 0a1ea44b4a0a
children 0dbf780e247f
comparison
equal deleted inserted replaced
455:4c4584219da3 456:20d96ec810c8
1518 for ( result = v4->pControlsHead; result; result = result->pNext ) 1518 for ( result = v4->pControlsHead; result; result = result->pNext )
1519 { 1519 {
1520 if ( result->uHotkey == v3 ) 1520 if ( result->uHotkey == v3 )
1521 { 1521 {
1522 v6 = result->uControlParam; 1522 v6 = result->uControlParam;
1523 if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 1523 pMessageQueue_50CBD0->AddMessage((UIMessageType)result->uControlID, v6, 0);
1524 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
1524 { 1525 {
1525 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)result->uControlID; 1526 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)result->uControlID;
1526 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v6; 1527 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v6;
1527 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0; 1528 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
1528 ++pMessageQueue_50CBD0->uNumMessages; 1529 ++pMessageQueue_50CBD0->uNumMessages;
1529 } 1530 }*/
1530 return result; 1531 return result;
1531 } 1532 }
1532 } 1533 }
1533 if ( v4->uFrameX || v4->uFrameY || !(v4->uFrameWidth == 640 & v4->uFrameHeight == 480) ) 1534 if ( v4->uFrameX || v4->uFrameY || !(v4->uFrameWidth == 640 & v4->uFrameHeight == 480) )
1534 { 1535 {
2023 } 2024 }
2024 while ( v13 ); 2025 while ( v13 );
2025 } 2026 }
2026 LABEL_26: 2027 LABEL_26:
2027 v11 = v9->uControlParam; 2028 v11 = v9->uControlParam;
2028 if ( (signed int)v2 < 40 ) 2029 /*if ( (signed int)v2 < 40 )
2029 { 2030 {
2030 pMessageQueue_50CBD0->pMessages[v2].eType = (UIMessageType)v9->uControlID; 2031 pMessageQueue_50CBD0->pMessages[v2].eType = (UIMessageType)v9->uControlID;
2031 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v11; 2032 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v11;
2032 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = v1; 2033 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = v1;
2033 v2 = pMessageQueue_50CBD0->uNumMessages + 1; 2034 v2 = pMessageQueue_50CBD0->uNumMessages + 1;
2034 ++pMessageQueue_50CBD0->uNumMessages; 2035 ++pMessageQueue_50CBD0->uNumMessages;
2035 } 2036 }*/
2037 pMessageQueue_50CBD0->AddMessage((UIMessageType)v9->uControlID, v11, v1);
2036 goto LABEL_47; 2038 goto LABEL_47;
2037 } 2039 }
2038 if ( v26 != 38 ) 2040 if ( v26 != 38 )
2039 { 2041 {
2040 if ( v26 == 39 ) 2042 if ( v26 == 39 )
2148 } 2150 }
2149 while ( v25 ); 2151 while ( v25 );
2150 } 2152 }
2151 LABEL_56: 2153 LABEL_56:
2152 v21 = v19->uControlParam; 2154 v21 = v19->uControlParam;
2153 if ( (signed int)v2 < 40 ) 2155 /*if ( (signed int)v2 < 40 )
2154 { 2156 {
2155 pMessageQueue_50CBD0->pMessages[v2].eType = (UIMessageType)v19->uControlID; 2157 pMessageQueue_50CBD0->pMessages[v2].eType = (UIMessageType)v19->uControlID;
2156 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v21; 2158 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v21;
2157 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = v1; 2159 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = v1;
2158 ++pMessageQueue_50CBD0->uNumMessages; 2160 ++pMessageQueue_50CBD0->uNumMessages;
2159 } 2161 }*/
2162 pMessageQueue_50CBD0->AddMessage((UIMessageType)v19->uControlID, v21, v1);
2160 return 1; 2163 return 1;
2161 } 2164 }
2162 2165
2163 //----- (0041D20D) -------------------------------------------------------- 2166 //----- (0041D20D) --------------------------------------------------------
2164 char __fastcall sub_41D20D_buff_remaining_time_string(int ecx0, GUIWindow *edx0, __int64 a3, GUIFont *a2) 2167 char __fastcall sub_41D20D_buff_remaining_time_string(int ecx0, GUIWindow *edx0, __int64 a3, GUIFont *a2)
4538 sub_41C0B8_set_status_string(v13); 4541 sub_41C0B8_set_status_string(v13);
4539 uLastPointedObjectID = 1; 4542 uLastPointedObjectID = 1;
4540 return; 4543 return;
4541 } 4544 }
4542 v38 = pButton->uControlParam; 4545 v38 = pButton->uControlParam;
4543 if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 4546 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
4544 { 4547 {
4545 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = pMessageType3; 4548 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = pMessageType3;
4546 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v38; 4549 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v38;
4547 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0; 4550 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
4548 ++pMessageQueue_50CBD0->uNumMessages; 4551 ++pMessageQueue_50CBD0->uNumMessages;
4549 } 4552 }*/
4553 pMessageQueue_50CBD0->AddMessage(pMessageType3, v38, 0);
4550 //goto LABEL_131; 4554 //goto LABEL_131;
4551 uLastPointedObjectID = 1; 4555 uLastPointedObjectID = 1;
4552 return; 4556 return;
4553 } 4557 }
4554 } 4558 }
4572 if ( pMessageType2 != 0 ) 4576 if ( pMessageType2 != 0 )
4573 { 4577 {
4574 v36 = pButton->uControlParam; 4578 v36 = pButton->uControlParam;
4575 if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 4579 if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
4576 { 4580 {
4577 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = pMessageType2; 4581 pMessageQueue_50CBD0->AddMessage(pMessageType2, v36, 0);
4582 /*pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = pMessageType2;
4578 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v36; 4583 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v36;
4579 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0; 4584 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
4580 //goto LABEL_27; 4585 //goto LABEL_27;
4581 ++pMessageQueue_50CBD0->uNumMessages; 4586 ++pMessageQueue_50CBD0->uNumMessages;*/
4582 v13 = pButton->pButtonName; 4587 v13 = pButton->pButtonName;
4583 sub_41C0B8_set_status_string(v13); 4588 sub_41C0B8_set_status_string(v13);
4584 uLastPointedObjectID = 1; 4589 uLastPointedObjectID = 1;
4585 return; 4590 return;
4586 } 4591 }
4663 //LABEL_24: 4668 //LABEL_24:
4664 pMessageType1 = (UIMessageType)pButton->field_1C; 4669 pMessageType1 = (UIMessageType)pButton->field_1C;
4665 if ( pMessageType1 ) 4670 if ( pMessageType1 )
4666 { 4671 {
4667 v12 = pButton->uControlParam; 4672 v12 = pButton->uControlParam;
4668 if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 4673 pMessageQueue_50CBD0->AddMessage(pMessageType1, v12, 0);
4674 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
4669 { 4675 {
4670 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = pMessageType1; 4676 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = pMessageType1;
4671 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v12; 4677 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v12;
4672 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0; 4678 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
4673 //LABEL_27: 4679 //LABEL_27:
4674 ++pMessageQueue_50CBD0->uNumMessages; 4680 ++pMessageQueue_50CBD0->uNumMessages;
4675 } 4681 }*/
4676 } 4682 }
4677 //LABEL_28: 4683 //LABEL_28:
4678 v13 = pButton->pButtonName; 4684 v13 = pButton->pButtonName;
4679 //_set_status_and_ret: 4685 //_set_status_and_ret:
4680 sub_41C0B8_set_status_string(v13); 4686 sub_41C0B8_set_status_string(v13);
4699 //{ 4705 //{
4700 pMessageType1 = (UIMessageType)pButton->field_1C; 4706 pMessageType1 = (UIMessageType)pButton->field_1C;
4701 if ( pMessageType1 ) 4707 if ( pMessageType1 )
4702 { 4708 {
4703 v12 = pButton->uControlParam; 4709 v12 = pButton->uControlParam;
4704 if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 4710 pMessageQueue_50CBD0->AddMessage(pMessageType1, v12, 0);
4711 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
4705 { 4712 {
4706 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = pMessageType1; 4713 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = pMessageType1;
4707 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v12; 4714 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v12;
4708 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0; 4715 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
4709 ++pMessageQueue_50CBD0->uNumMessages; 4716 ++pMessageQueue_50CBD0->uNumMessages;
4710 } 4717 }*/
4711 } 4718 }
4712 v13 = pButton->pButtonName; 4719 v13 = pButton->pButtonName;
4713 sub_41C0B8_set_status_string(v13); 4720 sub_41C0B8_set_status_string(v13);
4714 uLastPointedObjectID = 1; 4721 uLastPointedObjectID = 1;
4715 return; 4722 return;
5390 sub_4451A8_press_any_key(0, 0, 0); 5397 sub_4451A8_press_any_key(0, 0, 0);
5391 } 5398 }
5392 } 5399 }
5393 return; 5400 return;
5394 } 5401 }
5395 if ( (signed int)pMessageQueue_50CBD0->uNumMessages >= 40 ) 5402 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages >= 40 )
5396 return; 5403 return;
5397 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)161; 5404 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)161;
5398 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v18; 5405 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v18;
5399 LABEL_42: 5406 LABEL_42:
5400 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0; 5407 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
5401 ++pMessageQueue_50CBD0->uNumMessages; 5408 ++pMessageQueue_50CBD0->uNumMessages;
5409 return;*/
5410 pMessageQueue_50CBD0->AddMessage(UIMSG_StartNPCDialogue, v18, 0);
5402 return; 5411 return;
5403 } 5412 }
5404 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 3 ) 5413 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 3 )
5405 { 5414 {
5406 pTurnEngine->field_18 |= 8u; 5415 pTurnEngine->field_18 |= 8u;
5407 return; 5416 return;
5408 } 5417 }
5409 if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 5418 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
5410 { 5419 {
5411 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)23; 5420 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)23;
5412 goto LABEL_41; 5421 goto LABEL_41;
5413 } 5422 }*/
5423 pMessageQueue_50CBD0->AddMessage(UIMSG_Attack, 0, 0);
5414 } 5424 }
5415 else 5425 else
5416 { 5426 {
5417 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 3 ) 5427 if ( pParty->bTurnBasedModeOn == 1 && pTurnEngine->field_4 == 3 )
5418 { 5428 {
5419 pParty->uFlags |= 8u; 5429 pParty->uFlags |= 8u;
5420 return; 5430 return;
5421 } 5431 }
5422 if ( uActiveCharacter 5432 if ( uActiveCharacter
5423 && sub_427769_spell(pPlayers[uActiveCharacter]->uQuickSpell) 5433 && sub_427769_spell(pPlayers[uActiveCharacter]->uQuickSpell))
5424 && (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 5434 {
5425 { 5435 pMessageQueue_50CBD0->AddMessage(UIMSG_19, 0, 0);
5436 /*&& (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
5426 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)25; 5437 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)25;
5427 LABEL_41: 5438 LABEL_41:
5428 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0; 5439 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0;
5429 goto LABEL_42; 5440 goto LABEL_42;*/
5430 } 5441 }
5431 } 5442 }
5432 } 5443 }
5433 5444
5434 //----- (004226C2) -------------------------------------------------------- 5445 //----- (004226C2) --------------------------------------------------------