allow disabling ammo cheat

stohrendorf · Feb 20, 2021 · df3c4f7 · df3c4f7
1 parent 6ccbb39
commit df3c4f7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/scripts/main.py b/scripts/main.py
@@ -8,6 +8,7 @@
 
 cheats = {
     "godMode": True,
+    "allAmmoCheat": True,
     "inventory": {
         TR1ItemId.Key1: 10,
         TR1ItemId.Key2: 10,

diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp
@@ -129,6 +129,11 @@ std::pair<RunResult, std::optional<size_t>> Engine::run(World& world, bool isCut
     = core::get<bool>(core::get<pybind11::dict>(pybind11::globals(), "cheats").value_or(pybind11::dict{}), "godMode")
         .value_or(false);
 
+  const bool allAmmoCheat
+    = core::get<bool>(core::get<pybind11::dict>(pybind11::globals(), "cheats").value_or(pybind11::dict{}),
+                      "allAmmoCheat")
+        .value_or(false);
+
   std::shared_ptr<menu::MenuDisplay> menu;
   Throttler throttler;
   while(true)
@@ -191,6 +196,9 @@ std::pair<RunResult, std::optional<size_t>> Engine::run(World& world, bool isCut
         return {RunResult::RequestLoad, std::nullopt};
       }
 
+      if(allAmmoCheat)
+        m_inventory.fillAllAmmo();
+
       world.gameLoop(world.getTitle(), godMode);
     }
     else

diff --git a/src/engine/inventory.h b/src/engine/inventory.h
@@ -85,5 +85,13 @@ class Inventory
     default: BOOST_THROW_EXCEPTION(std::domain_error("weaponId"));
     }
   }
+
+  void fillAllAmmo()
+  {
+    m_pistolsAmmo.ammo = 1000;
+    m_magnumsAmmo.ammo = 1000;
+    m_uzisAmmo.ammo = 1000;
+    m_shotgunAmmo.ammo = 1000;
+  }
 };
 } // namespace engine
diff --git a/src/engine/lara/abstractstatehandler.cpp b/src/engine/lara/abstractstatehandler.cpp
@@ -270,7 +270,7 @@ bool AbstractStateHandler::tryReach(CollisionInfo& collisionInfo)
 
   if(collisionInfo.front.ceilingSpace.y > 0_len || collisionInfo.mid.ceilingSpace.y > -core::ClimbLimit2ClickMin
      || collisionInfo.mid.floorSpace.y < 200_len)
-  { //! @todo Magick 200
+  {
     return false;
   }
 
@@ -348,7 +348,6 @@ bool AbstractStateHandler::tryClimb(const CollisionInfo& collisionInfo)
     return false;
   }
 
-  //! @todo MAGICK +/- 30 degrees
   auto alignedRotation = alignRotation(m_lara.m_state.rotation.Y, 30_deg);
   if(!alignedRotation)
   {

diff --git a/src/engine/objects/laraobject.cpp b/src/engine/objects/laraobject.cpp
@@ -1632,11 +1632,6 @@ bool LaraObject::fireWeapon(const WeaponId weaponId,
 
   const auto ammoPtr = getWorld().getEngine().getInventory().getAmmo(weaponId);
 
-  if(true /* FIXME engine::allAmmoCheat */)
-  {
-    ammoPtr->ammo = 1000;
-  }
-
   if(ammoPtr->ammo == 0)
   {
     playSoundEffect(TR1SoundEffect::EmptyAmmo);