diff UIHouses.cpp @ 1018:9ac94d00012e

Merge
author Grumpy7
date Tue, 21 May 2013 02:24:31 +0200
parents c45d51b3f4f4 a704435d3285
children 3413ad40cc88
line wrap: on
line diff
--- a/UIHouses.cpp	Sun May 19 20:41:19 2013 +0200
+++ b/UIHouses.cpp	Tue May 21 02:24:31 2013 +0200
@@ -5001,9 +5001,9 @@
             {
             if ( (unsigned int)v61 | v35 )
                 {
-                v37 = LOBYTE(v1->field_1928);
-                v38 = v1->field_1924;
-                v1->uFace = v37;
+                v37 = LOBYTE(v1->uPrevFace);
+                v38 = v1->uPrevVoiceID;
+                v1->uCurrentFace = v37;
                 v1->uVoiceID = v38;
                 ReloadPlayerPortraits(uActiveCharacter - 1, (char)v37);
                 }
@@ -5028,12 +5028,12 @@
               pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, v25);
               return;
             }
-            v1->field_1928 = v1->uFace;
-            v1->field_1924 = v1->uVoiceID;
+            v1->uPrevFace = v1->uCurrentFace;
+            v1->uPrevVoiceID = v1->uVoiceID;
             v1->SetCondition(0x11u, 1);
             v1->uVoiceID = (v1->GetSexByVoice() != 0) + 23;
             v40 = (v1->GetSexByVoice() != 0) + 23;
-            v1->uFace = v40;
+            v1->uCurrentFace = v40;
             ReloadPlayerPortraits(uActiveCharacter - 1, (char)v40);
             LODWORD(v1->pConditions[17]) = LODWORD(pParty->uTimePlayed);
             v39 = (GUIWindow *)HIDWORD(pParty->uTimePlayed);