Mercurial > mm7

diff mm7_4.cpp @ 1800:c3140e8ad3ef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Ritor1
date Sun, 06 Oct 2013 22:45:11 +0600
parents 4dee76d79c78
children 4002c0fe5efc
line wrap: on
line diff
--- a/mm7_4.cpp	Sun Oct 06 22:45:00 2013 +0600
+++ b/mm7_4.cpp	Sun Oct 06 22:45:11 2013 +0600
@@ -1405,7 +1405,7 @@
   int v8; // [sp+Ch] [bp-8h]@3
   int v9; // [sp+10h] [bp-4h]@2
   int a2a; // [sp+1Ch] [bp+8h]@1
-
+  return 0;
   v3 = 0;
   result = word_4EE088_sound_ids[uSoundID];
   v5 = this;
@@ -3446,7 +3446,7 @@
 				v11 = &pParty->pHirelings[1];
 				memset(v11, 0, sizeof(NPCData));
 			}
-			pParty->field_709 = 0;
+			pParty->hirelingScrollPosition = 0;
 			pParty->CountHirelings();
 			dword_591084 = 0;
 			pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
@@ -3494,7 +3494,7 @@
 				v13 = pParty->pHireling1Name;
 			}
 			strcpy(v13, v15);
-			pParty->field_709 = 0;
+			pParty->hirelingScrollPosition = 0;
 			pParty->CountHirelings();
 
 			pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
@@ -3555,7 +3555,7 @@
 				v11 = &pParty->pHirelings[1];
 				memset(v11, 0, sizeof(NPCData));
 			}
-			pParty->field_709 = 0;
+			pParty->hirelingScrollPosition = 0;
 			pParty->CountHirelings();
 			dword_591084 = 0;
 			pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);