simplify attack check process (#235)

Author: Aaron-Goldman

src/GameState/enemies/GEnemyProcess.cpp

@@ -198,67 +198,47 @@ TBool GEnemyProcess::MaybeHit() {
   return EFalse;
 }
 
-static const TFloat DX = 20,
-  DY = 26;
+static const TInt DX = 8,
+  DY = 8;
 
 TBool GEnemyProcess::MaybeAttack() {
   TRect myRect, hisRect;
   mSprite->GetRect(myRect);
   mPlayerSprite->GetRect(hisRect);
 
   if (!mPlayerSprite->mInvulnerable) {
-    if (myRect.x1 >= hisRect.x2) {
-      // to right of player
-      if (ABS(hisRect.x2 - myRect.x1) > DX) {
-        mAttackTimer = 1;
-        return EFalse;
-      }
-      if (ABS(mPlayerSprite->y - mSprite->y) > DY) {
-        mAttackTimer = 1;
-        return EFalse;
-      }
-      if (--mAttackTimer <= 0) {
-        NewState(ATTACK_STATE, DIRECTION_LEFT);
-      }
-      return ETrue;
-    } else if (myRect.x2 <= hisRect.x1) {
-      // to left of player
-      if (ABS(hisRect.x1 - myRect.x2) > DX) {
-        mAttackTimer = 1;
-        return EFalse;
-      }
-      if (ABS(mPlayerSprite->y - mSprite->y) > DY) {
-        mAttackTimer = 1;
-        return EFalse;
-      }
-      if (--mAttackTimer <= 0) {
-        NewState(ATTACK_STATE, DIRECTION_RIGHT);
-      }
-      return ETrue;
-    }
-
-    if (myRect.y1 >= hisRect.y2) {
-      // enemy below player
-      if (ABS(mPlayerSprite->y - mSprite->y) > DY) {
-        // too far away
-        mAttackTimer = 1;
-        return EFalse;
+    if (myRect.y1 <= hisRect.y2 && myRect.y2 >= hisRect.y1) {
+      // vertical overlap
+      if (myRect.x1 >= hisRect.x2 && myRect.x1 - hisRect.x2 < DX) {
+        // to right of player
+        if (--mAttackTimer <= 0) {
+          NewState(ATTACK_STATE, DIRECTION_LEFT);
+        }
+        return ETrue;
       }
-      if (--mAttackTimer <= 0) {
-        NewState(ATTACK_STATE, DIRECTION_UP);
+      if (myRect.x2 <= hisRect.x1 && hisRect.x1 - myRect.x2 < DX) {
+        // to left of player
+        if (--mAttackTimer <= 0) {
+          NewState(ATTACK_STATE, DIRECTION_RIGHT);
+        }
+        return ETrue;
       }
-      return ETrue;
-    } else if (myRect.y2 <= hisRect.y1) {
-      // enemy above player
-      if (ABS(mPlayerSprite->y - mSprite->y) > DY) {
-        // too far away
-        mAttackTimer = 1;
-        return EFalse;
+    } else if (myRect.x1 <= hisRect.x2 && myRect.x2 >= hisRect.x1) {
+      // horizontal overlap
+      if (myRect.y1 >= hisRect.y2 && myRect.y1 - hisRect.y2 < DY) {
+        // below player
+        if (--mAttackTimer <= 0) {
+          NewState(ATTACK_STATE, DIRECTION_UP);
+        }
+        return ETrue;
       }
-      if (--mAttackTimer <= 0) {
-        NewState(ATTACK_STATE, DIRECTION_DOWN);
+      if (myRect.y2 <= hisRect.y1 && hisRect.y1 - myRect.y2 < DY) {
+        // above player
+        if (--mAttackTimer <= 0) {
+          NewState(ATTACK_STATE, DIRECTION_DOWN);
+        }
+        return ETrue;
       }
-      return ETrue;
     }
 
     // player not near us