Mercurial > mm7

comparison mm7_1.cpp @ 992:3a3ab572eff5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Mon, 13 May 2013 17:07:52 +0200
parents c5d8ea1e6ccb 087a9af8e0ec
children 3431f6abc786
comparison
equal deleted inserted replaced
991:c5d8ea1e6ccb 992:3a3ab572eff5
623 ShowStatusBarString(pTmpBuf2, 2u); 623 ShowStatusBarString(pTmpBuf2, 2u);
624 pAudioPlayer->PlaySound(SOUND_GoldReceived, v2, v2, -1, v2, v2, v2, v2); 624 pAudioPlayer->PlaySound(SOUND_GoldReceived, v2, v2, -1, v2, v2, v2, v2);
625 } 625 }
626 626
627 //----- (00420E01) -------------------------------------------------------- 627 //----- (00420E01) --------------------------------------------------------
628 void __cdecl sub_420E01() 628 void __cdecl OnChestLeftClick()
629 { 629 {
630 int chest_id; // edi@1 630 int chest_id; // edi@1
631 POINT *v1; // esi@2 631 POINT *v1; // esi@2
632 int v2; // eax@2 632 int v2; // eax@2
633 int v3; // ebx@4 633 int v3; // ebx@4
848 //LABEL_23: 848 //LABEL_23:
849 viewparams->bRedrawGameUI = true; 849 viewparams->bRedrawGameUI = true;
850 if ( uActiveCharacter == uPlayerID ) 850 if ( uActiveCharacter == uPlayerID )
851 { 851 {
852 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103; 852 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103;
853 pCurrentScreen = SCREEN_F; 853 pCurrentScreen = SCREEN_CHEST_INVENTORY;
854 //goto LABEL_28; 854 //goto LABEL_28;
855 uActiveCharacter = uPlayerID; 855 uActiveCharacter = uPlayerID;
856 return; 856 return;
857 } 857 }
858 //LABEL_27: 858 //LABEL_27:
868 { 868 {
869 //LABEL_28: 869 //LABEL_28:
870 uActiveCharacter = uPlayerID; 870 uActiveCharacter = uPlayerID;
871 return; 871 return;
872 } 872 }
873 if ( pCurrentScreen != SCREEN_F ) 873 if ( pCurrentScreen != SCREEN_CHEST_INVENTORY )
874 { 874 {
875 viewparams->bRedrawGameUI = true; 875 viewparams->bRedrawGameUI = true;
876 uActiveCharacter = uPlayerID; 876 uActiveCharacter = uPlayerID;
877 if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 102 ) 877 if ( pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] == 102 )
878 FillAwardsData(); 878 FillAwardsData();
881 //goto LABEL_23; 881 //goto LABEL_23;
882 viewparams->bRedrawGameUI = true; 882 viewparams->bRedrawGameUI = true;
883 if ( uActiveCharacter == uPlayerID ) 883 if ( uActiveCharacter == uPlayerID )
884 { 884 {
885 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103; 885 pWindowList_at_506F50_minus1_indexing_buttons____and_an_int_[0] = 103;
886 pCurrentScreen = SCREEN_F; 886 pCurrentScreen = SCREEN_CHEST_INVENTORY;
887 //goto LABEL_28; 887 //goto LABEL_28;
888 uActiveCharacter = uPlayerID; 888 uActiveCharacter = uPlayerID;
889 return; 889 return;
890 } 890 }
891 //LABEL_27: 891 //LABEL_27:
914 } 914 }
915 // 4E28F8: using guessed type int pCurrentScreen; 915 // 4E28F8: using guessed type int pCurrentScreen;
916 // F8B19C: using guessed type int dword_F8B19C; 916 // F8B19C: using guessed type int dword_F8B19C;
917 917
918 //----- (00421EA6) -------------------------------------------------------- 918 //----- (00421EA6) --------------------------------------------------------
919 void __cdecl sub_421EA6_OnInventoryLeftClick() 919 void __cdecl OnInventoryLeftClick()
920 { 920 {
921 Player *v0; // ebx@1 921 Player *v0; // ebx@1
922 signed int v1; // eax@2 922 signed int v1; // eax@2
923 signed int v2; // ecx@2 923 signed int v2; // ecx@2
924 int v3; // eax@2 924 int v3; // eax@2
1252 } 1252 }
1253 return; 1253 return;
1254 } 1254 }
1255 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages >= 40 ) 1255 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages >= 40 )
1256 return; 1256 return;
1257 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)161; 1257 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = UIMSG_StartNPCDialogue;
1258 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v18; 1258 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = v18;
1259 LABEL_42: 1259 LABEL_42:
1260 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0; 1260 *(&pMessageQueue_50CBD0->uNumMessages + 3 * pMessageQueue_50CBD0->uNumMessages + 3) = 0;
1261 ++pMessageQueue_50CBD0->uNumMessages; 1261 ++pMessageQueue_50CBD0->uNumMessages;
1262 return;*/ 1262 return;*/
1268 pTurnEngine->field_18 |= 8u; 1268 pTurnEngine->field_18 |= 8u;
1269 return; 1269 return;
1270 } 1270 }
1271 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 1271 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
1272 { 1272 {
1273 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)23; 1273 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = UIMSG_Attack;
1274 goto LABEL_41; 1274 goto LABEL_41;
1275 }*/ 1275 }*/
1276 pMessageQueue_50CBD0->AddMessage(UIMSG_Attack, 0, 0); 1276 pMessageQueue_50CBD0->AddMessage(UIMSG_Attack, 0, 0);
1277 } 1277 }
1278 else 1278 else
1285 if ( uActiveCharacter 1285 if ( uActiveCharacter
1286 && sub_427769_spell(pPlayers[uActiveCharacter]->uQuickSpell)) 1286 && sub_427769_spell(pPlayers[uActiveCharacter]->uQuickSpell))
1287 { 1287 {
1288 pMessageQueue_50CBD0->AddMessage(UIMSG_CastQuickSpell, 0, 0); 1288 pMessageQueue_50CBD0->AddMessage(UIMSG_CastQuickSpell, 0, 0);
1289 /*&& (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 1289 /*&& (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
1290 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = (UIMessageType)25; 1290 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].eType = UIMSG_CastQuickSpell;
1291 LABEL_41: 1291 LABEL_41:
1292 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0; 1292 pMessageQueue_50CBD0->pMessages[pMessageQueue_50CBD0->uNumMessages].param = 0;
1293 goto LABEL_42;*/ 1293 goto LABEL_42;*/
1294 } 1294 }
1295 } 1295 }