Mercurial > mm7

diff mm7_4.cpp @ 659:c10163a6d946

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
NPC hiring fixed
author zipi
date Tue, 12 Mar 2013 23:11:11 +0000
parents 6abf5b610585
children ecfb1b3c9a39
line wrap: on
line diff
--- a/mm7_4.cpp	Wed Mar 13 01:30:53 2013 +0200
+++ b/mm7_4.cpp	Tue Mar 12 23:11:11 2013 +0000
@@ -9590,7 +9590,7 @@
   //LOBYTE(v2->uFlags) |= 0x80u;
   pCurrentNPCInfo->uFlags |= 128;
   pParty->field_709 = 0;
-  sub_44A56A();
+  Party__CountHirelings();
   if ( pParty->pHirelings[0].pName )
   {
     memcpy(&pParty->pHirelings[1], pCurrentNPCInfo, sizeof(pParty->pHirelings[1]));
@@ -9605,7 +9605,7 @@
   }
   strcpy(v22, v24);
   pParty->field_709 = 0;
-  sub_44A56A();
+  Party__CountHirelings();
   PrepareHouse((HOUSE_ID)(int)window_SpeakInHouse->ptr_1C);
   dialog_menu_id = 1;
 
@@ -10870,7 +10870,7 @@
 				memset(v11, 0, sizeof(NPCData));
 			}
 			pParty->field_709 = 0;
-			sub_44A56A();
+			Party__CountHirelings();
 			dword_591084 = 0;
 			pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
 			dword_7241C8 = 0;
@@ -10918,7 +10918,7 @@
 			}
 			strcpy(v13, v15);
 			pParty->field_709 = 0;
-			sub_44A56A();
+			Party__CountHirelings();
 
 			pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
 
@@ -10981,7 +10981,7 @@
 				memset(v11, 0, sizeof(NPCData));
 			}
 			pParty->field_709 = 0;
-			sub_44A56A();
+			Party__CountHirelings();
 			dword_591084 = 0;
 			pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
 			dword_7241C8 = 0;