Mercurial > mm7

comparison mm7_4.cpp @ 1037:ff2d888f8033

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Wed, 22 May 2013 22:26:31 +0400
parents 7f8be9f9769e 306ec23b37df
children 9456f2ed5ff9
comparison
equal deleted inserted replaced
1036:7f8be9f9769e 1037:ff2d888f8033
6678 Party::TakeGold(pPrice); 6678 Party::TakeGold(pPrice);
6679 } 6679 }
6680 //LOBYTE(v2->uFlags) |= 0x80u; 6680 //LOBYTE(v2->uFlags) |= 0x80u;
6681 pCurrentNPCInfo->uFlags |= 128; 6681 pCurrentNPCInfo->uFlags |= 128;
6682 pParty->field_709 = 0; 6682 pParty->field_709 = 0;
6683 Party__CountHirelings(); 6683 pParty->CountHirelings();
6684 if ( pParty->pHirelings[0].pName ) 6684 if ( pParty->pHirelings[0].pName )
6685 { 6685 {
6686 memcpy(&pParty->pHirelings[1], pCurrentNPCInfo, sizeof(pParty->pHirelings[1])); 6686 memcpy(&pParty->pHirelings[1], pCurrentNPCInfo, sizeof(pParty->pHirelings[1]));
6687 v24 = pCurrentNPCInfo->pName; 6687 v24 = pCurrentNPCInfo->pName;
6688 v22 = pParty->pHireling2Name; 6688 v22 = pParty->pHireling2Name;
6693 v24 = pCurrentNPCInfo->pName; 6693 v24 = pCurrentNPCInfo->pName;
6694 v22 = pParty->pHireling1Name; 6694 v22 = pParty->pHireling1Name;
6695 } 6695 }
6696 strcpy(v22, v24); 6696 strcpy(v22, v24);
6697 pParty->field_709 = 0; 6697 pParty->field_709 = 0;
6698 Party__CountHirelings(); 6698 pParty->CountHirelings();
6699 PrepareHouse((HOUSE_ID)(int)window_SpeakInHouse->ptr_1C); 6699 PrepareHouse((HOUSE_ID)(int)window_SpeakInHouse->ptr_1C);
6700 dialog_menu_id = HOUSE_DIALOGUE_MAIN; 6700 dialog_menu_id = HOUSE_DIALOGUE_MAIN;
6701 6701
6702 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 6702 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
6703 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) 6703 /*if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 )
7977 { 7977 {
7978 v11 = &pParty->pHirelings[1]; 7978 v11 = &pParty->pHirelings[1];
7979 memset(v11, 0, sizeof(NPCData)); 7979 memset(v11, 0, sizeof(NPCData));
7980 } 7980 }
7981 pParty->field_709 = 0; 7981 pParty->field_709 = 0;
7982 Party__CountHirelings(); 7982 pParty->CountHirelings();
7983 dword_591084 = 0; 7983 dword_591084 = 0;
7984 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 7984 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
7985 dword_7241C8 = 0; 7985 dword_7241C8 = 0;
7986 return; 7986 return;
7987 } 7987 }
8025 v15 = speakingNPC->pName; 8025 v15 = speakingNPC->pName;
8026 v13 = pParty->pHireling1Name; 8026 v13 = pParty->pHireling1Name;
8027 } 8027 }
8028 strcpy(v13, v15); 8028 strcpy(v13, v15);
8029 pParty->field_709 = 0; 8029 pParty->field_709 = 0;
8030 Party__CountHirelings(); 8030 pParty->CountHirelings();
8031 8031
8032 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 8032 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
8033 8033
8034 if ( sDialogue_SpeakingActorNPC_ID >= 0 ) 8034 if ( sDialogue_SpeakingActorNPC_ID >= 0 )
8035 pDialogue_SpeakingActor->uAIState = Removed; 8035 pDialogue_SpeakingActor->uAIState = Removed;
8088 { 8088 {
8089 v11 = &pParty->pHirelings[1]; 8089 v11 = &pParty->pHirelings[1];
8090 memset(v11, 0, sizeof(NPCData)); 8090 memset(v11, 0, sizeof(NPCData));
8091 } 8091 }
8092 pParty->field_709 = 0; 8092 pParty->field_709 = 0;
8093 Party__CountHirelings(); 8093 pParty->CountHirelings();
8094 dword_591084 = 0; 8094 dword_591084 = 0;
8095 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0); 8095 pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
8096 dword_7241C8 = 0; 8096 dword_7241C8 = 0;
8097 return; 8097 return;
8098 } 8098 }