Merge pull request #43 from MikeIsAStar/correct-the-item-objects-that…

…-can-be-hit [MKW] Correct the item objects that can be hit
WiiLink24 · Feb 1, 2024 · 43bdb8e · 43bdb8e
2 parents c54df5d + 4a5dd55
commit 43bdb8e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/payload/import/mkwItem.hpp b/payload/import/mkwItem.hpp
@@ -100,12 +100,10 @@ static bool CanTrailItem(ItemBox item)
     return !itemBehaviourTable[itemToTrail].useFunction;
 }
 
-static bool CanTrailItemObject(ItemObject itemObject)
+static bool CanHitItemObject(ItemObject itemObject)
 {
     switch (itemObject) {
-    case ItemObject::GreenShell... ItemObject::Banana:
-    case ItemObject::FakeItemBox:
-    case ItemObject::Bob_omb: {
+    case ItemObject::GreenShell... ItemObject::BulletBill: {
         return true;
     }
     default: {

diff --git a/payload/import/mkwNetEventHandler.hpp b/payload/import/mkwNetEventHandler.hpp
@@ -18,7 +18,7 @@ class EventHandler
                 NoEvent = 0,
                 ItemUsed = 1,
                 ItemThrown = 2,
-                ItemHitTrailed = 3,
+                ItemObjectHit = 3,
                 ItemDropped = 7,
             };
 
@@ -49,8 +49,8 @@ class EventHandler
                 case EventType::ItemThrown: {
                     return CanThrowItem(ItemObjectToItemBox(item));
                 }
-                case EventType::ItemHitTrailed: {
-                    return CanTrailItemObject(item);
+                case EventType::ItemObjectHit: {
+                    return CanHitItemObject(item);
                 }
                 case EventType::ItemDropped: {
                     return CanDropItemObject(item);