diff UI/UIHouses.cpp @ 2057:b7485a6502f2

AgressorAtackInfo
author Ritor1
date Sun, 01 Dec 2013 20:13:48 +0600
parents 03d9336e862f
children b2a434d65344
line wrap: on
line diff
--- a/UI/UIHouses.cpp	Sat Nov 30 21:00:37 2013 +0200
+++ b/UI/UIHouses.cpp	Sun Dec 01 20:13:48 2013 +0600
@@ -2282,13 +2282,13 @@
       return;
     }
     Party::TakeGold(pPrice);
-    v35 = LODWORD(pPlayers[uActiveCharacter]->pConditions[17]);
+    v35 = LODWORD(pPlayers[uActiveCharacter]->pConditions[Condition_Zombie]);
     memset(pPlayers[uActiveCharacter], 0, 0xA0u);
     pPlayers[uActiveCharacter]->sHealth = pPlayers[uActiveCharacter]->GetMaxHealth();
     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[17] | v35 )
+      if ( (unsigned int)pPlayers[uActiveCharacter]->pConditions[Condition_Zombie] | v35 )
       {
         pPlayers[uActiveCharacter]->uCurrentFace = pPlayers[uActiveCharacter]->uPrevFace;
         pPlayers[uActiveCharacter]->uVoiceID = pPlayers[uActiveCharacter]->uPrevVoiceID;
@@ -2300,14 +2300,14 @@
       pMessageQueue_50CBD0->AddMessage(UIMSG_Escape, 1, 0);
       return;
     }
-    if ( (unsigned int)pPlayers[uActiveCharacter]->pConditions[17] | v35 )
+    if ( (unsigned int)pPlayers[uActiveCharacter]->pConditions[Condition_Zombie] | v35 )
     {
-      LODWORD(pPlayers[uActiveCharacter]->pConditions[17]) = v35;
+      LODWORD(pPlayers[uActiveCharacter]->pConditions[Condition_Zombie]) = v35;
     }
     else
     {
-      if ( !pPlayers[uActiveCharacter]->pConditions[16]
-        && !pPlayers[uActiveCharacter]->pConditions[15] && !pPlayers[uActiveCharacter]->pConditions[14] )
+      if ( !pPlayers[uActiveCharacter]->pConditions[Condition_Eradicated]
+        && !pPlayers[uActiveCharacter]->pConditions[Condition_Pertified] && !pPlayers[uActiveCharacter]->pConditions[Condition_Dead] )
       {
         pAudioPlayer->PlaySound((SoundID)(SOUND_GoldReceived|0x2), -1, 0, -1, 0, 0, 0, 0);
         pPlayers[uActiveCharacter]->PlaySound(SPEECH_82, 0);
@@ -2321,11 +2321,11 @@
       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[17]) = LODWORD(pParty->uTimePlayed);
+      LODWORD(pPlayers[uActiveCharacter]->pConditions[Condition_Zombie]) = LODWORD(pParty->uTimePlayed);
       //v39 = (GUIWindow *)HIDWORD(pParty->uTimePlayed);
     }
-    //HIDWORD(pPlayers[uActiveCharacter]->pConditions[17]) = (int)v39;
-    pPlayers[uActiveCharacter]->pConditions[17] =pParty->uTimePlayed;
+    //HIDWORD(pPlayers[uActiveCharacter]->pConditions[Condition_Zombie]) = (int)v39;
+    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);