Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/mm7_4.cpp	Wed May 22 22:25:44 2013 +0400
+++ b/mm7_4.cpp	Wed May 22 22:26:31 2013 +0400
@@ -6680,7 +6680,7 @@
   //LOBYTE(v2->uFlags) |= 0x80u;
   pCurrentNPCInfo->uFlags |= 128;
   pParty->field_709 = 0;
-  Party__CountHirelings();
+  pParty->CountHirelings();
   if ( pParty->pHirelings[0].pName )
   {
     memcpy(&pParty->pHirelings[1], pCurrentNPCInfo, sizeof(pParty->pHirelings[1]));
@@ -6695,7 +6695,7 @@
   }
   strcpy(v22, v24);
   pParty->field_709 = 0;
-  Party__CountHirelings();
+  pParty->CountHirelings();
   PrepareHouse((HOUSE_ID)(int)window_SpeakInHouse->ptr_1C);
   dialog_menu_id = HOUSE_DIALOGUE_MAIN;
 
@@ -7979,7 +7979,7 @@
 				memset(v11, 0, sizeof(NPCData));
 			}
 			pParty->field_709 = 0;
-			Party__CountHirelings();
+			pParty->CountHirelings();
 			dword_591084 = 0;
 			pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
 			dword_7241C8 = 0;
@@ -8027,7 +8027,7 @@
 			}
 			strcpy(v13, v15);
 			pParty->field_709 = 0;
-			Party__CountHirelings();
+			pParty->CountHirelings();
 
 			pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
 
@@ -8090,7 +8090,7 @@
 				memset(v11, 0, sizeof(NPCData));
 			}
 			pParty->field_709 = 0;
-			Party__CountHirelings();
+			pParty->CountHirelings();
 			dword_591084 = 0;
 			pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
 			dword_7241C8 = 0;