From 12fb756d8901c20a1e090ebbf05c4c927ee5aab6 Mon Sep 17 00:00:00 2001
From: ilikecats <ilikecats@mx.sdf.org>
Date: Fri, 5 Jul 2024 18:40:40 -0700
Subject: [PATCH] Clarifying README.cat a bit, removed auto rescue

---
 README.cat         | 14 ++++++++++----
 src/karts/kart.cpp |  8 ++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/README.cat b/README.cat
index 9762efd31..53c5772f0 100644
--- a/README.cat
+++ b/README.cat
@@ -1,7 +1,13 @@
 STK Cat Mod {Now with 100% more git repos!}
 
 What I've changed in the mod:
- - Press space once, and it checks for lack of powerup, and if you have no
-   powerup, gives you the zipper.
- - You always have nitro.
- - Using nitro gives you nitro, instead of taking it away (can help beating nitro collecting levels).
\ No newline at end of file
+
+- You can have different default powerups (so, not POWERUP_NOTHING anymore),
+  and the default powerup is now the zipper.
+
+- You always have nitro.
+
+- Using nitro gives you nitro, instead of taking it away (can help beating
+  nitro collecting levels).
+
+- There is no more auto rescue, use backspace instead.
\ No newline at end of file
diff --git a/src/karts/kart.cpp b/src/karts/kart.cpp
index f0d433067..4110033bc 100644
--- a/src/karts/kart.cpp
+++ b/src/karts/kart.cpp
@@ -1601,7 +1601,7 @@ void Kart::update(int ticks)
         const float roll = quad_normal.angle
                ((Vec3(0, 1, 0).rotate(q.getAxis(), q.getAngle())));
 
-        if (Track::getCurrentTrack()->isAutoRescueEnabled() &&
+        if (false && Track::getCurrentTrack()->isAutoRescueEnabled() &&
             (!m_terrain_info->getMaterial() ||
             !m_terrain_info->getMaterial()->hasGravity()) &&
             !has_animation_before && fabs(roll) > 60 * DEGREE_TO_RAD &&
@@ -1689,7 +1689,7 @@ void Kart::update(int ticks)
 #endif
 
     PROFILER_PUSH_CPU_MARKER("Kart::Update (material)", 0x60, 0x34, 0x7F);
-    if (!material)   // kart falling off the track
+    /*if (!material)   // kart falling off the track
     {
         // let kart fall a bit before rescuing
         const Vec3 *min, *max;
@@ -1730,7 +1730,7 @@ void Kart::update(int ticks)
             }
 #endif
         }
-    }   // if there is material
+    }*/   // if there is material
     PROFILER_POP_CPU_MARKER();
 
     Track::getCurrentTrack()->getItemManager()->checkItemHit(this);
@@ -2438,7 +2438,7 @@ void Kart::crashed(const Material *m, const Vec3 &normal)
             }
         }
 #endif
-        if (m->getCollisionReaction() == Material::RESCUE)
+        if (false && m->getCollisionReaction() == Material::RESCUE)
         {
             RescueAnimation::create(this);
             m_last_factor_engine_sound = 0.0f;