Mercurial > mm7

diff UI/UiGame.cpp @ 1407:d4f57df4c299

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PlayerSpeechID and uSpeakingCharacter
author Ritor1
date Tue, 23 Jul 2013 16:34:00 +0600
parents d071e0e9ba75
children 38df78aba732
line wrap: on
line diff
--- a/UI/UiGame.cpp	Tue Jul 23 15:41:45 2013 +0600
+++ b/UI/UiGame.cpp	Tue Jul 23 16:34:00 2013 +0600
@@ -2192,23 +2192,23 @@
     int v16; // eax@57
     int v19; // eax@62
     Texture *pPortrait; // [sp-4h] [bp-1Ch]@27
-    unsigned int v22; // [sp+14h] [bp-4h]@1
+    //unsigned int v22; // [sp+14h] [bp-4h]@1
 
-    v22 = _this;
+    //v22 = _this;
     if ( qword_A750D8 )
         {
         qword_A750D8 -= (signed int)pMiscTimer->uTimeElapsed;
         if ( qword_A750D8 <= 0 )
             {
-            if ( pPlayers[word_A750E2]->CanAct() )
-                pPlayers[word_A750E2]->PlaySound(PlayerSpeechID, 0);
+            if ( pPlayers[uSpeakingCharacter]->CanAct() )
+                pPlayers[uSpeakingCharacter]->PlaySound(PlayerSpeechID, 0);
             qword_A750D8 = 0i64;
             }
         }
 
     for (uint i = 0; i < 4; ++i)
         {
-        Player* pPlayer = pParty->pPlayers + i;
+        Player* pPlayer = &pParty->pPlayers[i];
 
         if (pPlayer->IsEradicated())
             {
@@ -2263,7 +2263,7 @@
                 pFrame = pPlayerFrameTable->GetFrameBy_y(&pPlayer->_expression21_frameset, &pPlayer->_expression21_animtime, pMiscTimer->uTimeElapsed);
             else
                 pFrame = pPlayerFrameTable->GetFrameBy_x(v7, pPlayer->uExpressionTimePassed);
-            if (pPlayer->field_1AA2 != pFrame->uTextureID - 1 || v22 )
+            if (pPlayer->field_1AA2 != pFrame->uTextureID - 1 || _this )
                 {
                 pPlayer->field_1AA2 = pFrame->uTextureID - 1;
                 pFace = (Texture *)pTextures_PlayerFaces[i][pPlayer->field_1AA2];//pFace = (Texture *)pTextures_PlayerFaces[i][pFrame->uTextureID];