Mercurial > mm7

diff UI/UIHouses.cpp @ 2185:385040580292

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
CastSpell continue
author Ritor1
date Mon, 27 Jan 2014 00:13:01 +0600
parents d28d3c006077
children 20995bb8895a
line wrap: on
line diff
--- a/UI/UIHouses.cpp	Fri Jan 24 18:01:51 2014 +0600
+++ b/UI/UIHouses.cpp	Mon Jan 27 00:13:01 2014 +0600
@@ -2283,7 +2283,7 @@
     pPlayers[uActiveCharacter]->sMana = pPlayers[uActiveCharacter]->GetMaxMana();
     if ( (signed int)window_SpeakInHouse->ptr_1C != 78 && ((signed int)window_SpeakInHouse->ptr_1C <= 80 || (signed int)window_SpeakInHouse->ptr_1C > 82) )
     {
-      if ( (unsigned int)pPlayers[uActiveCharacter]->pConditions[Condition_Zombie] | v35 )
+      if ( (unsigned int)pPlayers[uActiveCharacter]->pConditions[Condition_Zombie] | v35 )// если состояние зомби
       {
         pPlayers[uActiveCharacter]->uCurrentFace = pPlayers[uActiveCharacter]->uPrevFace;
         pPlayers[uActiveCharacter]->uVoiceID = pPlayers[uActiveCharacter]->uPrevVoiceID;
@@ -2296,9 +2296,7 @@
       return;
     }
     if ( (unsigned int)pPlayers[uActiveCharacter]->pConditions[Condition_Zombie] | v35 )
-    {
       LODWORD(pPlayers[uActiveCharacter]->pConditions[Condition_Zombie]) = v35;
-    }
     else
     {
       if ( !pPlayers[uActiveCharacter]->pConditions[Condition_Eradicated]
@@ -2312,15 +2310,15 @@
       }
       pPlayers[uActiveCharacter]->uPrevFace = pPlayers[uActiveCharacter]->uCurrentFace;
       pPlayers[uActiveCharacter]->uPrevVoiceID = pPlayers[uActiveCharacter]->uVoiceID;
-      pPlayers[uActiveCharacter]->SetCondition(0x11u, 1);
+      pPlayers[uActiveCharacter]->SetCondition(Condition_Zombie, 1);
       pPlayers[uActiveCharacter]->uVoiceID = (pPlayers[uActiveCharacter]->GetSexByVoice() != 0) + 23;
       pPlayers[uActiveCharacter]->uCurrentFace = (pPlayers[uActiveCharacter]->GetSexByVoice() != 0) + 23;
       ReloadPlayerPortraits(uActiveCharacter - 1, (pPlayers[uActiveCharacter]->GetSexByVoice() != 0) + 23);
-      LODWORD(pPlayers[uActiveCharacter]->pConditions[Condition_Zombie]) = LODWORD(pParty->uTimePlayed);
+      pPlayers[uActiveCharacter]->pConditions[Condition_Zombie] = pParty->uTimePlayed;
       //v39 = (GUIWindow *)HIDWORD(pParty->uTimePlayed);
     }
     //HIDWORD(pPlayers[uActiveCharacter]->pConditions[Condition_Zombie]) = (int)v39;
-    pPlayers[uActiveCharacter]->pConditions[Condition_Zombie] =pParty->uTimePlayed;
+    pPlayers[uActiveCharacter]->pConditions[Condition_Zombie] = pParty->uTimePlayed;
     pAudioPlayer->PlaySound((SoundID)(SOUND_GoldReceived|0x2), -1, 0, -1, 0, 0, 0, 0);
     pPlayers[uActiveCharacter]->PlaySound(SPEECH_82, 0);
     pOtherOverlayList->_4418B1(20, uActiveCharacter + 99, 0, 65536);