From 1c5b72410aa9333e4830df726d1ca59d72ae9df3 Mon Sep 17 00:00:00 2001
From: Misa <infoteddyatgitgud@cock.li>
Date: Sat, 5 Sep 2020 17:23:09 -0700
Subject: [PATCH] De-duplicate spike hitbox checks for player/SCM

The spike hitbox check is now one function for both the player and the
supercrewmate, instead of being two separate functions.
---
 desktop_version/src/Entity.cpp | 33 ++++-----------------------------
 desktop_version/src/Entity.h   |  4 +---
 2 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp
index 27bb6d5f..ff45c43b 100644
--- a/desktop_version/src/Entity.cpp
+++ b/desktop_version/src/Entity.cpp
@@ -3859,37 +3859,12 @@ bool entityclass::entitycollide( int a, int b )
     return false;
 }
 
-bool entityclass::checkdamage()
+bool entityclass::checkdamage(bool scm /*= false*/)
 {
-    //Returns true if player entity (rule 0) collides with a damagepoint
+    //Returns true if player (or supercrewmate) collides with a damagepoint
     for(size_t i=0; i < entities.size(); i++)
     {
-        if(entities[i].rule==0)
-        {
-            tempx = entities[i].xp + entities[i].cx;
-            tempy = entities[i].yp + entities[i].cy;
-            tempw = entities[i].w;
-            temph = entities[i].h;
-            rectset(tempx, tempy, tempw, temph);
-
-            for (size_t j=0; j<blocks.size(); j++)
-            {
-                if (blocks[j].type == DAMAGE && help.intersects(blocks[j].rect, temprect))
-                {
-                    return true;
-                }
-            }
-        }
-    }
-    return false;
-}
-
-bool entityclass::scmcheckdamage()
-{
-    //Returns true if supercrewmate collides with a damagepoint
-    for(size_t i=0; i < entities.size(); i++)
-    {
-        if(entities[i].type==14)
+        if((scm && entities[i].type == 14) || (!scm && entities[i].rule == 0))
         {
             tempx = entities[i].xp + entities[i].cx;
             tempy = entities[i].yp + entities[i].cy;
@@ -4880,7 +4855,7 @@ void entityclass::entitycollisioncheck()
     //how about the supercrewmate?
     if (game.supercrewmate)
     {
-        if (scmcheckdamage() && !map.invincibility)
+        if (checkdamage(true) && !map.invincibility)
         {
             //usual player dead stuff
             game.scmhurt = true;
diff --git a/desktop_version/src/Entity.h b/desktop_version/src/Entity.h
index 50bbaa59..5930f68e 100644
--- a/desktop_version/src/Entity.h
+++ b/desktop_version/src/Entity.h
@@ -100,9 +100,7 @@ public:
 
     bool entitycollide(int a, int b);
 
-    bool checkdamage();
-
-    bool scmcheckdamage();
+    bool checkdamage(bool scm = false);
 
     void settemprect(int t);