Implement/match Act3Brickster::HitActor (#1212)

* Implement/match `Act3Brickster::HitActor`

* Fixes

* Fixes

* Fixes

* Add `Act3Cop::VTable0x9c`

* Fix

LEGO1/lego/legoomni/src/actors/act2actor.cpp

@@ -103,7 +103,7 @@ void Act2Actor::FUN_10018980()
 
 // FUNCTION: LEGO1 0x100189f0
 // FUNCTION: BETA10 0x1000ca64
-MxResult Act2Actor::VTable0x94(LegoPathActor*, MxBool)
+MxResult Act2Actor::HitActor(LegoPathActor*, MxBool)
 {
 	if (m_unk0x1f == FALSE) {
 		m_unk0x1f = TRUE;
@@ -117,7 +117,7 @@ MxResult Act2Actor::VTable0x94(LegoPathActor*, MxBool)
 // FUNCTION: LEGO1 0x10018a20
 MxResult Act2Actor::VTable0x9c()
 {
-	if (m_grec && !(m_grec->m_flags & LegoPathEdgeContainer::c_bit1)) {
+	if (m_grec && !m_grec->GetBit1()) {
 		delete m_grec;
 		m_grec = NULL;
 		return SUCCESS;

LEGO1/lego/legoomni/src/actors/act2genactor.cpp

@@ -14,7 +14,7 @@ MxLong Act2GenActor::g_lastHitActorTime = 0;
 
 // FUNCTION: LEGO1 0x10018740
 // FUNCTION: BETA10 0x1000c7a0
-MxResult Act2GenActor::VTable0x94(LegoPathActor* p_actor, MxBool)
+MxResult Act2GenActor::HitActor(LegoPathActor* p_actor, MxBool)
 {
 	MxLong time = Timer()->GetTime();
 	MxLong diff = time - g_lastHitActorTime;

LEGO1/lego/legoomni/src/actors/act3actors.cpp

@@ -5,8 +5,11 @@
 #include "define.h"
 #include "legocachesoundmanager.h"
 #include "legolocomotionanimpresenter.h"
+#include "legopathedgecontainer.h"
 #include "legosoundmanager.h"
 #include "misc.h"
+#include "mxmisc.h"
+#include "mxtimer.h"
 #include "mxutilities.h"
 #include "roi/legoroi.h"
 
@@ -76,7 +79,7 @@ MxU32 Act3Actor::VTable0x90(float p_time, Matrix4& p_transform)
 }
 
 // FUNCTION: LEGO1 0x1003fd90
-MxResult Act3Actor::VTable0x94(LegoPathActor* p_actor, MxBool p_bool)
+MxResult Act3Actor::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 {
 	if (!p_actor->GetUserNavFlag() && p_bool) {
 		if (p_actor->GetState()) {
@@ -110,9 +113,10 @@ Act3Cop::Act3Cop()
 
 // FUNCTION: LEGO1 0x1003ff70
 // FUNCTION: BETA10 0x10018526
-MxResult Act3Cop::VTable0x94(LegoPathActor* p_actor, MxBool p_bool)
+MxResult Act3Cop::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 {
 	LegoROI* roi = p_actor->GetROI();
+
 	if (p_bool && !strncmp(roi->GetName(), "dammo", 5)) {
 		MxS32 count = -1;
 		if (sscanf(roi->GetName(), "dammo%d", &count) != 1) {
@@ -129,9 +133,9 @@ MxResult Act3Cop::VTable0x94(LegoPathActor* p_actor, MxBool p_bool)
 		FUN_10040360();
 	}
 	else {
-		if (((Act3*) m_world)->GetBrickster()->GetROI() != roi) {
+		if (((Act3*) m_world)->m_brickster->GetROI() != roi) {
 			if (p_bool) {
-				return Act3Actor::VTable0x94(p_actor, p_bool);
+				return Act3Actor::HitActor(p_actor, p_bool);
 			}
 		}
 		else {
@@ -162,11 +166,19 @@ void Act3Cop::FUN_10040360()
 	// TODO
 }
 
-// STUB: LEGO1 0x10040d20
+// FUNCTION: LEGO1 0x10040d20
+// FUNCTION: BETA10 0x1001942c
 MxResult Act3Cop::VTable0x9c()
 {
-	// TODO
-	return SUCCESS;
+	if (m_grec && !m_grec->GetBit1()) {
+		delete m_grec;
+		m_grec = NULL;
+		m_lastTime = Timer()->GetTime();
+		FUN_10040360();
+		return SUCCESS;
+	}
+
+	return Act3Actor::VTable0x9c();
 }
 
 // FUNCTION: LEGO1 0x10040e10
@@ -220,10 +232,39 @@ void Act3Brickster::VTable0x70(float p_time)
 	// TODO
 }
 
-// STUB: LEGO1 0x100416b0
-MxResult Act3Brickster::VTable0x94(LegoPathActor*, MxBool)
+// FUNCTION: LEGO1 0x100416b0
+// FUNCTION: BETA10 0x1001a299
+MxResult Act3Brickster::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 {
-	// TODO
+	if (!p_bool) {
+		return FAILURE;
+	}
+
+	Act3* a3 = (Act3*) m_world;
+	LegoROI* r = p_actor->GetROI();
+	assert(r);
+
+	if (a3->m_cop1->GetROI() != r && a3->m_cop2->GetROI() != r) {
+		if (!strncmp(r->GetName(), "pammo", 5)) {
+			MxS32 count = -1;
+			if (sscanf(r->GetName(), "pammo%d", &count) != 1) {
+				assert(0);
+			}
+
+			assert(m_world);
+
+			if (a3->m_pizzas[count].IsValid() && !a3->m_pizzas[count].IsBit5()) {
+				a3->EatPizza(count);
+			}
+
+			m_unk0x38 = 2;
+			return SUCCESS;
+		}
+		else {
+			return Act3Actor::HitActor(p_actor, p_bool);
+		}
+	}
+
 	return SUCCESS;
 }
 
@@ -235,17 +276,27 @@ MxResult Act3Brickster::FUN_100417c0()
 	return SUCCESS;
 }
 
-// STUB: LEGO1 0x10042990
+// FUNCTION: LEGO1 0x10042990
+// FUNCTION: BETA10 0x1001b6e2
 void Act3Brickster::SwitchBoundary(LegoPathBoundary*& p_boundary, LegoUnknown100db7f4*& p_edge, float& p_unk0xe4)
 {
-	// TODO
+	if (m_unk0x38 != 8) {
+		m_boundary->SwitchBoundary(this, p_boundary, p_edge, p_unk0xe4);
+	}
 }
 
-// STUB: LEGO1 0x100429d0
+// FUNCTION: LEGO1 0x100429d0
+// FUNCTION: BETA10 0x1001b75b
 MxResult Act3Brickster::VTable0x9c()
 {
-	// TODO
-	return SUCCESS;
+	if (m_grec && !m_grec->GetBit1()) {
+		delete m_grec;
+		m_grec = NULL;
+		m_lastTime = Timer()->GetTime();
+		return SUCCESS;
+	}
+
+	return Act3Actor::VTable0x9c();
 }
 
 // FUNCTION: LEGO1 0x10042ab0

LEGO1/lego/legoomni/src/actors/doors.cpp

@@ -24,7 +24,7 @@ MxFloat g_unk0x100d8e84 = 6000.0f;
 
 // FUNCTION: LEGO1 0x10066100
 // FUNCTION: BETA10 0x10026850
-MxResult Doors::VTable0x94(LegoPathActor* p_actor, MxBool p_bool)
+MxResult Doors::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 {
 	assert(m_ltDoor && m_rtDoor);
 

LEGO1/lego/legoomni/src/entity/act2brick.cpp

@@ -107,7 +107,7 @@ void Act2Brick::FUN_1007a670(MxMatrix& p_param1, MxMatrix& p_param2, LegoPathBou
 }
 
 // FUNCTION: LEGO1 0x1007a750
-MxResult Act2Brick::VTable0x94(LegoPathActor* p_actor, MxBool)
+MxResult Act2Brick::HitActor(LegoPathActor* p_actor, MxBool)
 {
 	MxLong time = Timer()->GetTime();
 	MxLong diff = time - g_lastHitActorTime;

LEGO1/lego/legoomni/src/entity/legojetski.cpp

@@ -56,7 +56,7 @@ MxLong LegoJetski::Notify(MxParam& p_param)
 }
 
 // STUB: LEGO1 0x10013c40
-MxResult LegoJetski::VTable0x94(LegoPathActor* p_actor, MxBool p_bool)
+MxResult LegoJetski::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 {
 	// TODO
 	return 0;

LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp

@@ -168,9 +168,9 @@ MxU32 LegoJetskiRaceActor::VTable0x6c(
 
 				if (roi != NULL && (roi->GetVisibility() || actor->GetCameraFlag())) {
 					if (roi->FUN_100a9410(p_v1, p_v2, p_f1, p_f2, p_v3, m_collideBox && actor->GetCollideBox())) {
-						VTable0x94(actor, TRUE);
+						HitActor(actor, TRUE);
 
-						if (actor->VTable0x94(this, FALSE) < 0) {
+						if (actor->HitActor(this, FALSE) < 0) {
 							return 0;
 						}
 						else {

LEGO1/lego/legoomni/src/paths/legoextraactor.cpp

@@ -190,7 +190,7 @@ inline void LegoExtraActor::FUN_1002ad8a()
 }
 
 // FUNCTION: LEGO1 0x1002aba0
-MxResult LegoExtraActor::VTable0x94(LegoPathActor* p_actor, MxBool p_bool)
+MxResult LegoExtraActor::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 {
 	if (p_actor->GetState() != 0 || m_state != 0) {
 		return FAILURE;
@@ -497,11 +497,11 @@ MxU32 LegoExtraActor::VTable0x6c(
 									(local20X <= -0.01 && p_f1 + 0.01 <= local1cX)) {
 									p_v3 = p_v1;
 
-									if (VTable0x94(actor, TRUE) < 0) {
+									if (HitActor(actor, TRUE) < 0) {
 										return 0;
 									}
 
-									actor->VTable0x94(this, FALSE);
+									actor->HitActor(this, FALSE);
 									return 2;
 								}
 							}
@@ -509,11 +509,11 @@ MxU32 LegoExtraActor::VTable0x6c(
 					}
 					else {
 						if (roi->FUN_100a9410(p_v1, p_v2, p_f1, p_f2, p_v3, m_collideBox && actor->GetCollideBox())) {
-							if (VTable0x94(actor, TRUE) < 0) {
+							if (HitActor(actor, TRUE) < 0) {
 								return 0;
 							}
 
-							actor->VTable0x94(this, FALSE);
+							actor->HitActor(this, FALSE);
 							return 2;
 						}
 					}

LEGO1/lego/legoomni/src/paths/legopathactor.cpp

@@ -463,8 +463,8 @@ MxU32 LegoPathActor::VTable0x6c(
 
 				if (roi != NULL && (roi->GetVisibility() || actor->GetCameraFlag())) {
 					if (roi->FUN_100a9410(p_v1, p_v2, p_f1, p_f2, p_v3, m_collideBox && actor->m_collideBox)) {
-						VTable0x94(actor, TRUE);
-						actor->VTable0x94(this, FALSE);
+						HitActor(actor, TRUE);
+						actor->HitActor(this, FALSE);
 						return 2;
 					}
 				}

LEGO1/lego/legoomni/src/race/legoraceactor.cpp

@@ -95,7 +95,7 @@ MxU32 LegoRaceActor::VTable0x90(float p_time, Matrix4& p_transform)
 
 // FUNCTION: LEGO1 0x10014a00
 // FUNCTION: BETA10 0x100c9f5c
-MxResult LegoRaceActor::VTable0x94(LegoPathActor* p_actor, MxBool p_bool)
+MxResult LegoRaceActor::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 {
 	if (!p_actor->GetUserNavFlag()) {
 		if (p_actor->GetState()) {
@@ -115,5 +115,6 @@ MxResult LegoRaceActor::VTable0x94(LegoPathActor* p_actor, MxBool p_bool)
 			p_actor->SetState(2);
 		}
 	}
-	return 0;
+
+	return SUCCESS;
 }

LEGO1/lego/legoomni/src/race/legoracers.cpp

@@ -428,7 +428,7 @@ void LegoRaceCar::VTable0x70(float p_time)
 
 // FUNCTION: LEGO1 0x100133c0
 // FUNCTION: BETA10 0x100cbb84
-MxResult LegoRaceCar::VTable0x94(LegoPathActor* p_actor, MxBool p_bool)
+MxResult LegoRaceCar::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 {
 	// Note: Code duplication with LegoRaceActor::VTable0x94
 	if (!p_actor->GetUserNavFlag()) {
@@ -499,6 +499,7 @@ MxResult LegoRaceCar::VTable0x94(LegoPathActor* p_actor, MxBool p_bool)
 			return FAILURE;
 		}
 	}
+
 	return SUCCESS;
 }
 

LEGO1/lego/legoomni/src/race/legoracespecial.cpp

@@ -333,9 +333,9 @@ MxU32 LegoCarRaceActor::VTable0x6c(
 									p_v3,
 									m_collideBox && actor->GetCollideBox()
 								)) {
-								VTable0x94(actor, TRUE);
+								HitActor(actor, TRUE);
 
-								if (actor->VTable0x94(this, FALSE) < 0) {
+								if (actor->HitActor(this, FALSE) < 0) {
 									return 0;
 								}
 								else {
@@ -353,9 +353,9 @@ MxU32 LegoCarRaceActor::VTable0x6c(
 									p_v3,
 									m_collideBox && actor->GetCollideBox()
 								)) {
-								VTable0x94(actor, TRUE);
+								HitActor(actor, TRUE);
 
-								if (actor->VTable0x94(this, FALSE) < 0) {
+								if (actor->HitActor(this, FALSE) < 0) {
 									return 0;
 								}
 								else {
@@ -366,8 +366,9 @@ MxU32 LegoCarRaceActor::VTable0x6c(
 					}
 					else {
 						if (roi->FUN_100a9410(p_v1, p_v2, p_f1, p_f2, p_v3, m_collideBox && actor->GetCollideBox())) {
-							VTable0x94(actor, TRUE);
-							if (actor->VTable0x94(this, FALSE) < 0) {
+							HitActor(actor, TRUE);
+
+							if (actor->HitActor(this, FALSE) < 0) {
 								return 0;
 							}
 							else {

LEGO1/lego/legoomni/src/worlds/act3.cpp

@@ -180,6 +180,14 @@ Act3::~Act3()
 	TickleManager()->UnregisterClient(this);
 }
 
+// FUNCTION: LEGO1 0x10072780
+// FUNCTION: BETA10 0x100156ac
+void Act3::EatPizza(MxS32 p_index)
+{
+	assert(p_index < MAX_PIZZAS);
+	RemovePizza(m_pizzas[p_index]);
+}
+
 // FUNCTION: LEGO1 0x100727a0
 // FUNCTION: BETA10 0x1001570d
 void Act3::EatDonut(MxS32 p_index)
@@ -188,6 +196,25 @@ void Act3::EatDonut(MxS32 p_index)
 	RemoveDonut(m_donuts[p_index]);
 }
 
+// FUNCTION: LEGO1 0x100727c0
+// FUNCTION: BETA10 0x1001576e
+void Act3::RemovePizza(Act3Ammo& p_p)
+{
+#ifdef _DEBUG
+	MxS32 i;
+	for (i = 0; i < MAX_PIZZAS; i++) {
+		if (&m_pizzas[i] == &p_p) {
+			break;
+		}
+	}
+
+	assert(i != MAX_PIZZAS);
+#endif
+
+	assert(p_p.IsValid());
+	p_p.Remove();
+}
+
 // FUNCTION: LEGO1 0x100727d0
 // FUNCTION: BETA10 0x10015828
 void Act3::RemoveDonut(Act3Ammo& p_p)
@@ -534,8 +561,8 @@ MxResult Act3::Tickle()
 	return SUCCESS;
 }
 
-// STUB: LEGO1 0x100733f0
-// STUB: BETA10 0x10016ba2
+// FUNCTION: LEGO1 0x100733f0
+// FUNCTION: BETA10 0x10016ba2
 void Act3::SetBrickster(Act3Brickster* p_brickster)
 {
 	m_brickster = p_brickster;