Mercurial > mm7

diff Player.cpp @ 2061:b2a434d65344

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GAME_SETTINGS_* defines introduced DEBUG_SETTINGS_* defines introduced
author Nomad
date Mon, 02 Dec 2013 15:13:49 +0200
parents f9698295c0bd
children a290d9fbdc95
line wrap: on
line diff
--- a/Player.cpp	Mon Dec 02 17:00:58 2013 +0600
+++ b/Player.cpp	Mon Dec 02 15:13:49 2013 +0200
@@ -7349,7 +7349,7 @@
       case 5: damageType = 4; //yes, the original just assigned the value 4
         break;   
     }
-    if ( !(dword_6BE368_debug_settings_2 & 0x10) )
+    if ( !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_NO_DAMAGE) )
     {
       dmgToReceive = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)damageType);
       if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 )
@@ -7386,7 +7386,7 @@
           }
         }
       }
-      if ( !(dword_6BE368_debug_settings_2 & 0x10)
+      if ( !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_NO_DAMAGE)
         && actorPtr->pMonsterInfo.uSpecialAttackType
         && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackLevel )
       {
@@ -7541,7 +7541,7 @@
           damageType = 4;
           break;
       }
-      if ( !(dword_6BE368_debug_settings_2 & 0x10) )
+      if ( !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_NO_DAMAGE) )
       {
         int reflectedDmg = playerPtr->ReceiveDamage(dmgToReceive, (DAMAGE_TYPE)damageType);
         if ( playerPtr->pPlayerBuffs[PLAYER_BUFF_PAIN_REFLECTION].uExpireTime > 0 )
@@ -7580,7 +7580,7 @@
         }
       }
       if ( !dmgSource
-        && !(dword_6BE368_debug_settings_2 & 0x10)
+        && !(dword_6BE368_debug_settings_2 & DEBUG_SETTINGS_NO_DAMAGE)
         && actorPtr->pMonsterInfo.uSpecialAttackType
         && rand() % 100 < actorPtr->pMonsterInfo.uLevel * actorPtr->pMonsterInfo.uSpecialAttackLevel )
       {