diff --git a/source/games/exhumed/src/aistuff.h b/source/games/exhumed/src/aistuff.h index 665a6703c..8ba6fa916 100644 --- a/source/games/exhumed/src/aistuff.h +++ b/source/games/exhumed/src/aistuff.h @@ -515,6 +515,8 @@ void FuncWasp(int eax, int edx, int nRun); enum { kMessageMask = 0x7F0000 }; inline int GrabTimeSlot(int nVal) { return -1; } +inline int dmgAdjust(int dmg, int fact = 2) { return dmg; } +inline bool easy() { return false; } END_PS_NS diff --git a/source/games/exhumed/src/anubis.cpp b/source/games/exhumed/src/anubis.cpp index 732ef30a3..0949dbb8e 100644 --- a/source/games/exhumed/src/anubis.cpp +++ b/source/games/exhumed/src/anubis.cpp @@ -434,7 +434,7 @@ void FuncAnubis(int a, int nDamage, int nRun) if (ap->nHealth <= 0) return; - ap->nHealth -= nDamage; + ap->nHealth -= dmgAdjust(nDamage); if (ap->nHealth > 0) { diff --git a/source/games/exhumed/src/fish.cpp b/source/games/exhumed/src/fish.cpp index d142bc3cc..d85f901a1 100644 --- a/source/games/exhumed/src/fish.cpp +++ b/source/games/exhumed/src/fish.cpp @@ -357,7 +357,7 @@ void FuncFish(int a, int nDamage, int nRun) return; } - FishList[nFish].nHealth -= nDamage; + FishList[nFish].nHealth -= dmgAdjust(nDamage); if (FishList[nFish].nHealth <= 0) { FishList[nFish].nHealth = 0; diff --git a/source/games/exhumed/src/lavadude.cpp b/source/games/exhumed/src/lavadude.cpp index eef4a3e0c..cd4499760 100644 --- a/source/games/exhumed/src/lavadude.cpp +++ b/source/games/exhumed/src/lavadude.cpp @@ -247,7 +247,7 @@ void FuncLava(int a, int nDamage, int nRun) return; } - LavaList[nLava].nHealth -= nDamage; + LavaList[nLava].nHealth -= dmgAdjust(nDamage, 3); if (LavaList[nLava].nHealth <= 0) { diff --git a/source/games/exhumed/src/lion.cpp b/source/games/exhumed/src/lion.cpp index efc6e76da..57a376888 100644 --- a/source/games/exhumed/src/lion.cpp +++ b/source/games/exhumed/src/lion.cpp @@ -175,7 +175,7 @@ void FuncLion(int a, int nDamage, int nRun) { if (nDamage && LionList[nLion].nHealth > 0) { - LionList[nLion].nHealth -= nDamage; + LionList[nLion].nHealth -= dmgAdjust(nDamage); if (LionList[nLion].nHealth <= 0) { // R.I.P. @@ -296,7 +296,7 @@ void FuncLion(int a, int nDamage, int nRun) } } - if (nAction) + if (nAction && !easy()) { LionList[nLion].nCount--; if (LionList[nLion].nCount <= 0) diff --git a/source/games/exhumed/src/mummy.cpp b/source/games/exhumed/src/mummy.cpp index 1f7c78734..18115b924 100644 --- a/source/games/exhumed/src/mummy.cpp +++ b/source/games/exhumed/src/mummy.cpp @@ -498,7 +498,7 @@ void FuncMummy(int a, int nDamage, int nRun) return; } - MummyList[nMummy].nHealth -= nDamage; + MummyList[nMummy].nHealth -= dmgAdjust(nDamage); if (MummyList[nMummy].nHealth <= 0) { diff --git a/source/games/exhumed/src/queen.cpp b/source/games/exhumed/src/queen.cpp index bc0f3feb7..db1274af2 100644 --- a/source/games/exhumed/src/queen.cpp +++ b/source/games/exhumed/src/queen.cpp @@ -1500,7 +1500,7 @@ void FuncQueen(int a, int nDamage, int nRun) { if (QueenList[nQueen].nHealth > 0) { - QueenList[nQueen].nHealth -= nDamage; + QueenList[nQueen].nHealth -= dmgAdjust(nDamage); if (QueenList[nQueen].nHealth <= 0) { diff --git a/source/games/exhumed/src/rex.cpp b/source/games/exhumed/src/rex.cpp index 9ad6c8b0b..bffd9ec65 100644 --- a/source/games/exhumed/src/rex.cpp +++ b/source/games/exhumed/src/rex.cpp @@ -179,7 +179,7 @@ void FuncRex(int a, int nDamage, int nRun) if (RexList[nRex].nAction == 5 && RexList[nRex].nHealth > 0) { - RexList[nRex].nHealth -= nDamage; + RexList[nRex].nHealth -= dmgAdjust(nDamage); if (RexList[nRex].nHealth <= 0) { diff --git a/source/games/exhumed/src/roach.cpp b/source/games/exhumed/src/roach.cpp index fdf2c7cda..5c482d7b6 100644 --- a/source/games/exhumed/src/roach.cpp +++ b/source/games/exhumed/src/roach.cpp @@ -189,7 +189,7 @@ void FuncRoach(int a, int nDamage, int nRun) return; } - RoachList[nRoach].nHealth -= nDamage; + RoachList[nRoach].nHealth -= dmgAdjust(nDamage); if (RoachList[nRoach].nHealth <= 0) { sprite[nSprite].xvel = 0; diff --git a/source/games/exhumed/src/scorp.cpp b/source/games/exhumed/src/scorp.cpp index 1fd66de0f..e2eda3680 100644 --- a/source/games/exhumed/src/scorp.cpp +++ b/source/games/exhumed/src/scorp.cpp @@ -191,7 +191,7 @@ void FuncScorp(int a, int nDamage, int nRun) return; } - scorpion[nScorp].nHealth -= nDamage; + scorpion[nScorp].nHealth -= dmgAdjust(nDamage); if (scorpion[nScorp].nHealth <= 0) { diff --git a/source/games/exhumed/src/set.cpp b/source/games/exhumed/src/set.cpp index 35fd63256..eafc3b808 100644 --- a/source/games/exhumed/src/set.cpp +++ b/source/games/exhumed/src/set.cpp @@ -269,7 +269,7 @@ void FuncSet(int a, int nDamage, int nRun) { if (nAction != 1) { - SetList[nSet].nHealth -= nDamage; + SetList[nSet].nHealth -= dmgAdjust(nDamage); } if (SetList[nSet].nHealth <= 0) diff --git a/source/games/exhumed/src/spider.cpp b/source/games/exhumed/src/spider.cpp index ade43212a..012ec3834 100644 --- a/source/games/exhumed/src/spider.cpp +++ b/source/games/exhumed/src/spider.cpp @@ -420,7 +420,7 @@ void FuncSpider(int a, int nDamage, int nRun) short nTarget = a & 0xFFFF; - spp->nHealth -= nDamage; + spp->nHealth -= dmgAdjust(nDamage); if (spp->nHealth > 0) { /* diff --git a/source/games/exhumed/src/wasp.cpp b/source/games/exhumed/src/wasp.cpp index 92b70d73b..ca04e0af6 100644 --- a/source/games/exhumed/src/wasp.cpp +++ b/source/games/exhumed/src/wasp.cpp @@ -212,7 +212,7 @@ void FuncWasp(int a, int nDamage, int nRun) if (WaspList[nWasp].nHealth > 0) { - WaspList[nWasp].nHealth -= nDamage; + WaspList[nWasp].nHealth -= dmgAdjust(nDamage, 3); if (WaspList[nWasp].nHealth > 0) {