diff --git a/LEGO1/lego/legoomni/include/islepathactor.h b/LEGO1/lego/legoomni/include/islepathactor.h
index 951af433..767b1b1a 100644
--- a/LEGO1/lego/legoomni/include/islepathactor.h
+++ b/LEGO1/lego/legoomni/include/islepathactor.h
@@ -134,7 +134,7 @@ class IslePathActor : public LegoPathActor {
 	void Reset()
 	{
 		m_roi->SetVisibility(TRUE);
-		SetActorFlags(0);
+		SetActorState(c_initial);
 	}
 
 	void SetWorld(LegoWorld* p_world) { m_world = p_world; }
diff --git a/LEGO1/lego/legoomni/include/legopathactor.h b/LEGO1/lego/legoomni/include/legopathactor.h
index 0f5f32d9..cfce3aa2 100644
--- a/LEGO1/lego/legoomni/include/legopathactor.h
+++ b/LEGO1/lego/legoomni/include/legopathactor.h
@@ -22,9 +22,16 @@ extern const char* g_strHIT_WALL_SOUND;
 // SIZE 0x154
 class LegoPathActor : public LegoActor {
 public:
-	enum {
-		c_bit2 = 0x02,
-		c_disable = 0x04,
+	enum ActorState {
+		// States
+		c_initial = 0,
+		c_one = 1,
+		c_two = 2,
+		c_three = 3,
+		c_disabled = 4,
+		c_maxState = 255,
+
+		// Flags
 		c_noCollide = 0x100
 	};
 
@@ -133,7 +140,7 @@ class LegoPathActor : public LegoActor {
 	LegoPathBoundary* GetBoundary() { return m_boundary; }
 
 	// FUNCTION: BETA10 0x1001c860
-	MxU32 GetActorFlags() { return m_actorFlags; }
+	MxU32 GetActorState() { return m_actorState; }
 
 	LegoPathController* GetController() { return m_pathController; }
 	MxBool GetCollideBox() { return m_collideBox; }
@@ -143,7 +150,7 @@ class LegoPathActor : public LegoActor {
 	void SetBoundary(LegoPathBoundary* p_boundary) { m_boundary = p_boundary; }
 
 	// FUNCTION: BETA10 0x10013430
-	void SetActorFlags(MxU32 p_actorFlags) { m_actorFlags = p_actorFlags; }
+	void SetActorState(MxU32 p_actorState) { m_actorState = p_actorState; }
 
 	void SetController(LegoPathController* p_pathController) { m_pathController = p_pathController; }
 	void SetLastTime(MxFloat p_lastTime) { m_lastTime = p_lastTime; }
@@ -173,7 +180,7 @@ class LegoPathActor : public LegoActor {
 	MxFloat m_lastTime;                   // 0x84
 	LegoPathBoundary* m_boundary;         // 0x88
 	LegoUnknown m_unk0x8c;                // 0x8c
-	MxU32 m_actorFlags;                   // 0xdc
+	MxU32 m_actorState;                   // 0xdc
 	LegoUnknown100db7f4* m_destEdge;      // 0xe0
 	MxFloat m_unk0xe4;                    // 0xe4
 	MxBool m_collideBox;                  // 0xe8
diff --git a/LEGO1/lego/legoomni/src/actors/act3actors.cpp b/LEGO1/lego/legoomni/src/actors/act3actors.cpp
index d1b088e9..6594ede8 100644
--- a/LEGO1/lego/legoomni/src/actors/act3actors.cpp
+++ b/LEGO1/lego/legoomni/src/actors/act3actors.cpp
@@ -31,20 +31,21 @@ Act3Actor::Act3Actor()
 }
 
 // FUNCTION: LEGO1 0x1003fb70
+// FUNCTION: BETA10 0x100180ab
 MxU32 Act3Actor::VTable0x90(float p_time, Matrix4& p_transform)
 {
 	// Note: Code duplication with LegoExtraActor::VTable0x90
-	switch (m_actorFlags & 0xff) {
-	case 0:
-	case 1:
+	switch (m_actorState & c_maxState) {
+	case c_initial:
+	case c_one:
 		return TRUE;
-	case 2:
+	case c_two:
 		m_unk0x1c = p_time + 2000.0f;
-		m_actorFlags = 3;
+		m_actorState = c_three;
 		m_actorTime += (p_time - m_lastTime) * m_worldSpeed;
 		m_lastTime = p_time;
 		return FALSE;
-	case 3:
+	case c_three:
 		assert(!m_userNavFlag);
 		Vector3 positionRef(p_transform[3]);
 
@@ -65,7 +66,7 @@ MxU32 Act3Actor::VTable0x90(float p_time, Matrix4& p_transform)
 			return FALSE;
 		}
 		else {
-			m_actorFlags = 0;
+			m_actorState = c_initial;
 			m_unk0x1c = 0;
 
 			positionRef -= g_unk0x10104ef0;
@@ -79,10 +80,11 @@ MxU32 Act3Actor::VTable0x90(float p_time, Matrix4& p_transform)
 }
 
 // FUNCTION: LEGO1 0x1003fd90
+// FUNCTION: BETA10 0x10018328
 MxResult Act3Actor::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 {
 	if (!p_actor->GetUserNavFlag() && p_bool) {
-		if (p_actor->GetActorFlags()) {
+		if (p_actor->GetActorState() != c_initial) {
 			return FAILURE;
 		}
 
@@ -96,7 +98,7 @@ MxResult Act3Actor::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 		roi->FUN_100a58f0(local2world);
 		roi->VTable0x14();
 
-		p_actor->SetActorFlags(c_bit2 | c_noCollide);
+		p_actor->SetActorState(c_two | c_noCollide);
 	}
 
 	return SUCCESS;
@@ -108,7 +110,7 @@ Act3Cop::Act3Cop()
 {
 	m_unk0x20 = -1.0f;
 	m_world = NULL;
-	SetActorFlags(c_disable);
+	SetActorState(c_disabled);
 }
 
 // FUNCTION: LEGO1 0x1003ff70
@@ -194,7 +196,7 @@ Act3Brickster::Act3Brickster()
 	m_unk0x24 = 0.0f;
 	m_unk0x54 = 0;
 
-	SetActorFlags(c_disable);
+	SetActorState(c_disabled);
 	m_unk0x58 = 0;
 
 	m_unk0x3c.Clear();
diff --git a/LEGO1/lego/legoomni/src/actors/act3ammo.cpp b/LEGO1/lego/legoomni/src/actors/act3ammo.cpp
index ff46874e..d7437479 100644
--- a/LEGO1/lego/legoomni/src/actors/act3ammo.cpp
+++ b/LEGO1/lego/legoomni/src/actors/act3ammo.cpp
@@ -159,7 +159,7 @@ MxResult Act3Ammo::FUN_10053cb0(LegoPathController* p_p, LegoPathBoundary* p_bou
 	m_unk0x19c = p_unk0x19c;
 	m_unk0x7c = 0.0f;
 	m_lastTime = -1.0f;
-	m_actorFlags = 1;
+	m_actorState = c_one;
 	return SUCCESS;
 }
 
@@ -186,13 +186,13 @@ MxResult Act3Ammo::FUN_10053d30(LegoPathController* p_p, MxFloat p_unk0x19c)
 	m_unk0x19c = p_unk0x19c;
 	m_unk0x7c = 0.0f;
 	m_lastTime = -1.0f;
-	m_actorFlags = 1;
+	m_actorState = c_one;
 	return SUCCESS;
 }
 
-// STUB: LEGO1 0x10054050
-// STUB: BETA10 0x1001e362
+// FUNCTION: LEGO1 0x10054050
+// FUNCTION: BETA10 0x1001e362
 void Act3Ammo::UpdateState(float p_time)
 {
-	// TODO
+	assert(IsValid());
 }
diff --git a/LEGO1/lego/legoomni/src/actors/doors.cpp b/LEGO1/lego/legoomni/src/actors/doors.cpp
index 235cdc7c..dd6544df 100644
--- a/LEGO1/lego/legoomni/src/actors/doors.cpp
+++ b/LEGO1/lego/legoomni/src/actors/doors.cpp
@@ -75,7 +75,7 @@ void Doors::UpdateState(float p_time)
 	switch (m_unk0x154) {
 	case 0:
 		m_unk0x154 = 1;
-		m_actorFlags = 0;
+		m_actorState = c_initial;
 		break;
 	case 1:
 		break;
@@ -108,7 +108,7 @@ void Doors::UpdateState(float p_time)
 			m_ltDoor->VTable0x14();
 			m_rtDoor->VTable0x14();
 			m_unk0x154 = 1;
-			m_actorFlags = 0;
+			m_actorState = c_initial;
 			m_unk0x1f4 = 0;
 		}
 	}
diff --git a/LEGO1/lego/legoomni/src/actors/helicopter.cpp b/LEGO1/lego/legoomni/src/actors/helicopter.cpp
index 1e7d5827..87fef05e 100644
--- a/LEGO1/lego/legoomni/src/actors/helicopter.cpp
+++ b/LEGO1/lego/legoomni/src/actors/helicopter.cpp
@@ -134,7 +134,7 @@ MxLong Helicopter::HandleClick()
 		((Isle*) CurrentWorld())->SetDestLocation(LegoGameState::e_copter);
 		FUN_10015820(TRUE, 0);
 		TransitionManager()->StartTransition(MxTransitionManager::e_mosaic, 50, FALSE, TRUE);
-		SetActorFlags(LegoPathActor::c_disable);
+		SetActorState(c_disabled);
 		PlayMusic(JukeboxScript::c_Jail_Music);
 		break;
 	case LegoGameState::e_act2:
@@ -199,7 +199,7 @@ MxLong Helicopter::HandleControl(LegoControlManagerNotificationParam& p_param)
 				m_state->m_unk0x08 = 1;
 				m_world->RemoveActor(this);
 				InvokeAction(Extra::ActionType::e_start, script, IsleScript::c_HelicopterTakeOff_Anim, NULL);
-				SetActorFlags(0);
+				SetActorState(c_initial);
 			}
 
 			result = 1;
@@ -214,7 +214,7 @@ MxLong Helicopter::HandleControl(LegoControlManagerNotificationParam& p_param)
 				m_state->m_unk0x08 = 3;
 				m_world->RemoveActor(this);
 				InvokeAction(Extra::ActionType::e_start, script, IsleScript::c_HelicopterLand_Anim, NULL);
-				SetActorFlags(LegoPathActor::c_disable);
+				SetActorState(c_disabled);
 			}
 
 			result = 1;
@@ -419,7 +419,8 @@ void Helicopter::UpdateState(float p_time)
 			else {
 				((Act3*) m_world)->FUN_10073430();
 			}
-			LegoPathActor::m_actorFlags = 4;
+
+			LegoPathActor::m_actorState = c_disabled;
 		}
 	}
 }
diff --git a/LEGO1/lego/legoomni/src/actors/islepathactor.cpp b/LEGO1/lego/legoomni/src/actors/islepathactor.cpp
index da611a0e..470839d4 100644
--- a/LEGO1/lego/legoomni/src/actors/islepathactor.cpp
+++ b/LEGO1/lego/legoomni/src/actors/islepathactor.cpp
@@ -148,7 +148,7 @@ void IslePathActor::Exit()
 			m_previousActor->SetLocation(GetWorldPosition(), GetWorldDirection(), GetWorldUp(), TRUE);
 		}
 
-		m_previousActor->SetActorFlags(0);
+		m_previousActor->SetActorState(c_initial);
 		GameState()->m_currentArea = LegoGameState::Area::e_unk66;
 	}
 
diff --git a/LEGO1/lego/legoomni/src/actors/pizza.cpp b/LEGO1/lego/legoomni/src/actors/pizza.cpp
index a29b9c5c..fad6c10a 100644
--- a/LEGO1/lego/legoomni/src/actors/pizza.cpp
+++ b/LEGO1/lego/legoomni/src/actors/pizza.cpp
@@ -202,7 +202,7 @@ void Pizza::FUN_100382b0()
 
 		m_act1state->m_unk0x018 = 0;
 		m_state->m_unk0x0c = 0;
-		UserActor()->SetActorFlags(0);
+		UserActor()->SetActorState(LegoPathActor::c_initial);
 		g_isleFlags |= Isle::c_playMusic;
 		AnimationManager()->EnableCamAnims(TRUE);
 		AnimationManager()->FUN_1005f6d0(TRUE);
@@ -472,7 +472,7 @@ MxLong Pizza::HandleEndAction(MxEndActionNotificationParam& p_param)
 
 			m_state->m_unk0x0c = 4;
 			m_state->SetUnknown0xb0(IsleScript::c_noneIsle);
-			UserActor()->SetActorFlags(0);
+			UserActor()->SetActorState(LegoPathActor::c_initial);
 			m_skateBoard->SetUnknown0x160(TRUE);
 			m_world->PlaceActor(m_skateBoard, "int37", 2, 0.5, 3, 0.5);
 
diff --git a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
index e54a6db8..4b74fdf1 100644
--- a/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoanimationmanager.cpp
@@ -1028,7 +1028,7 @@ MxResult LegoAnimationManager::FUN_100605e0(
 				LegoPathActor* actor = UserActor();
 
 				if (actor != NULL) {
-					actor->SetActorFlags(LegoPathActor::c_disable);
+					actor->SetActorState(LegoPathActor::c_disabled);
 					actor->SetWorldSpeed(0.0f);
 				}
 			}
@@ -1592,7 +1592,7 @@ MxU16 LegoAnimationManager::FUN_10062110(
 {
 	LegoPathActor* actor = (LegoPathActor*) p_roi->GetEntity();
 
-	if (actor != NULL && actor->GetBoundary() == p_boundary && actor->GetActorFlags() == 0) {
+	if (actor != NULL && actor->GetBoundary() == p_boundary && actor->GetActorState() == LegoPathActor::c_initial) {
 		if (GetViewManager()->IsBoundingBoxInFrustum(p_roi->GetWorldBoundingBox())) {
 			Mx3DPointFloat direction(p_roi->GetWorldDirection());
 
@@ -2786,7 +2786,7 @@ void LegoAnimationManager::FUN_100648f0(LegoTranInfo* p_tranInfo, MxLong p_unk0x
 
 		LegoPathActor* actor = UserActor();
 		if (actor != NULL) {
-			actor->SetActorFlags(LegoPathActor::c_disable);
+			actor->SetActorState(LegoPathActor::c_disabled);
 			actor->SetWorldSpeed(0.0f);
 		}
 
diff --git a/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp b/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
index 241b18c3..21bad45d 100644
--- a/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
+++ b/LEGO1/lego/legoomni/src/common/legoanimmmpresenter.cpp
@@ -460,7 +460,7 @@ MxBool LegoAnimMMPresenter::FUN_1004b6d0(MxLong p_time)
 			}
 		}
 
-		actor->SetActorFlags(0);
+		actor->SetActorState(LegoPathActor::c_initial);
 	}
 
 	return TRUE;
diff --git a/LEGO1/lego/legoomni/src/entity/act2brick.cpp b/LEGO1/lego/legoomni/src/entity/act2brick.cpp
index ddbc38ea..f7f47839 100644
--- a/LEGO1/lego/legoomni/src/entity/act2brick.cpp
+++ b/LEGO1/lego/legoomni/src/entity/act2brick.cpp
@@ -100,7 +100,7 @@ void Act2Brick::FUN_1007a670(MxMatrix& p_param1, MxMatrix& p_param2, LegoPathBou
 	CurrentWorld()->PlaceActor(this);
 	p_boundary->AddActor(this);
 
-	SetActorFlags(LegoPathActor::c_disable);
+	SetActorState(c_disabled);
 	m_roi->FUN_100a58f0(p_param1);
 	m_roi->VTable0x14();
 	m_roi->SetVisibility(TRUE);
diff --git a/LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp b/LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
index 5fa3ff44..7d94dc78 100644
--- a/LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
+++ b/LEGO1/lego/legoomni/src/entity/legojetskiraceactor.cpp
@@ -37,7 +37,7 @@ MxS32 LegoJetskiRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_
 	Vector3* v1 = NULL;
 	Vector3* v2 = NULL;
 
-	if (m_actorFlags == 1) {
+	if (m_actorState == c_one) {
 		if (m_destEdge == LegoPathController::GetControlEdgeA(13)) {
 			m_boundary = (LegoPathBoundary*) m_destEdge->OtherFace(LegoPathController::GetControlBoundaryA(13));
 		}
@@ -45,7 +45,7 @@ MxS32 LegoJetskiRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_
 			m_boundary = (LegoPathBoundary*) m_destEdge->OtherFace(LegoPathController::GetControlBoundaryA(15));
 		}
 
-		m_actorFlags = 0;
+		m_actorState = c_initial;
 		m_unk0x7c = 0;
 
 		if (m_userNavFlag) {
@@ -58,7 +58,7 @@ MxS32 LegoJetskiRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_
 	}
 	else {
 		if (p_edge == LegoPathController::GetControlEdgeA(12)) {
-			m_actorFlags = 1;
+			m_actorState = c_one;
 
 			if (m_worldSpeed < g_unk0x100da044) {
 				m_worldSpeed = g_unk0x100da044;
@@ -68,7 +68,7 @@ MxS32 LegoJetskiRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_
 			m_boundary = LegoPathController::GetControlBoundaryA(13);
 		}
 		else if (p_edge == LegoPathController::GetControlEdgeA(14)) {
-			m_actorFlags = 1;
+			m_actorState = c_one;
 
 			if (m_worldSpeed < g_unk0x100da044) {
 				m_worldSpeed = g_unk0x100da044;
@@ -78,7 +78,7 @@ MxS32 LegoJetskiRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_
 			m_boundary = LegoPathController::GetControlBoundaryA(15);
 		}
 
-		if (m_actorFlags == 1) {
+		if (m_actorState == c_one) {
 			if (m_userNavFlag) {
 				m_unk0xe4 = 0.5f;
 			}
diff --git a/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp b/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
index d5c99186..4834913f 100644
--- a/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
@@ -79,7 +79,7 @@ void LegoAnimActor::UpdateState(float p_time)
 		m_lastTime = p_time - 1.0f;
 	}
 
-	if (m_actorFlags == 0 && !m_userNavFlag && m_worldSpeed <= 0) {
+	if (m_actorState == c_initial && !m_userNavFlag && m_worldSpeed <= 0) {
 		if (m_curAnim >= 0) {
 			MxMatrix matrix(m_unk0xec);
 			float f;
diff --git a/LEGO1/lego/legoomni/src/paths/legoextraactor.cpp b/LEGO1/lego/legoomni/src/paths/legoextraactor.cpp
index 8699bb29..d4b754e5 100644
--- a/LEGO1/lego/legoomni/src/paths/legoextraactor.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legoextraactor.cpp
@@ -50,17 +50,17 @@ LegoExtraActor::~LegoExtraActor()
 // FUNCTION: LEGO1 0x1002a720
 MxU32 LegoExtraActor::VTable0x90(float p_time, Matrix4& p_transform)
 {
-	switch (m_actorFlags & 0xff) {
-	case 0:
-	case 1:
+	switch (m_actorState & c_maxState) {
+	case c_initial:
+	case c_one:
 		return TRUE;
-	case 2:
+	case c_two:
 		m_scheduledTime = p_time + 2000.0f;
-		m_actorFlags = 3;
+		m_actorState = c_three;
 		m_actorTime += (p_time - m_lastTime) * m_worldSpeed;
 		m_lastTime = p_time;
 		return FALSE;
-	case 3: {
+	case c_three: {
 		Vector3 positionRef(p_transform[3]);
 		p_transform = m_roi->GetLocal2World();
 
@@ -95,7 +95,7 @@ MxU32 LegoExtraActor::VTable0x90(float p_time, Matrix4& p_transform)
 			return FALSE;
 		}
 		else {
-			m_actorFlags = 0;
+			m_actorState = c_initial;
 			m_scheduledTime = 0.0f;
 			positionRef -= g_unk0x10104c18;
 			m_roi->FUN_100a58f0(p_transform);
@@ -192,7 +192,7 @@ inline void LegoExtraActor::FUN_1002ad8a()
 // FUNCTION: LEGO1 0x1002aba0
 MxResult LegoExtraActor::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 {
-	if (p_actor->GetActorFlags() != 0 || m_actorFlags != 0) {
+	if (p_actor->GetActorState() != c_initial || m_actorState != c_initial) {
 		return FAILURE;
 	}
 
@@ -237,7 +237,7 @@ MxResult LegoExtraActor::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 				VTable0xc4();
 				SetWorldSpeed(0);
 				m_whichAnim = 1;
-				m_actorFlags = 0x101;
+				m_actorState = c_one | c_noCollide;
 			}
 		}
 
@@ -245,7 +245,7 @@ MxResult LegoExtraActor::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 			LegoROI* roi = m_roi;
 			SoundManager()->GetCacheSoundManager()->Play("crash5", m_roi->GetName(), FALSE);
 			VTable0xc4();
-			m_actorFlags = 0x102;
+			m_actorState = c_two | c_noCollide;
 			Mx3DPointFloat dir = p_actor->GetWorldDirection();
 			MxMatrix matrix3 = MxMatrix(roi->GetLocal2World());
 			Vector3 positionRef(matrix3[3]);
@@ -339,7 +339,7 @@ void LegoExtraActor::UpdateState(float p_time)
 	case 1:
 		if (m_scheduledTime < p_time) {
 			m_whichAnim = 2;
-			m_actorFlags = 0x101;
+			m_actorState = c_one | c_noCollide;
 			m_scheduledTime = m_assAnim->GetDuration() + p_time;
 			break;
 		}
@@ -350,7 +350,7 @@ void LegoExtraActor::UpdateState(float p_time)
 	case 2:
 		if (m_scheduledTime < p_time) {
 			m_whichAnim = 0;
-			m_actorFlags = 0;
+			m_actorState = c_initial;
 			SetWorldSpeed(m_prevWorldSpeed);
 			m_roi->FUN_100a58f0(m_unk0x18);
 			m_lastTime = p_time;
@@ -452,7 +452,7 @@ MxU32 LegoExtraActor::VTable0x6c(
 		if (plpas.find(*itpa) != plpas.end()) {
 			LegoPathActor* actor = *itpa;
 
-			if (this != actor && !(actor->GetActorFlags() & LegoPathActor::c_noCollide)) {
+			if (this != actor && !(actor->GetActorState() & LegoPathActor::c_noCollide)) {
 				LegoROI* roi = actor->GetROI();
 
 				if ((roi != NULL && roi->GetVisibility()) || actor->GetCameraFlag()) {
diff --git a/LEGO1/lego/legoomni/src/paths/legopathactor.cpp b/LEGO1/lego/legoomni/src/paths/legopathactor.cpp
index e247ac71..13e8f63f 100644
--- a/LEGO1/lego/legoomni/src/paths/legopathactor.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legopathactor.cpp
@@ -46,7 +46,7 @@ LegoPathActor::LegoPathActor()
 	m_lastTime = 0;
 	m_unk0x7c = 0;
 	m_userNavFlag = FALSE;
-	m_actorFlags = 0;
+	m_actorState = c_initial;
 	m_grec = NULL;
 	m_pathController = NULL;
 	m_collideBox = FALSE;
@@ -235,7 +235,7 @@ MxResult LegoPathActor::VTable0x84(
 // FUNCTION: BETA10 0x100b0520
 MxS32 LegoPathActor::VTable0x8c(float p_time, Matrix4& p_transform)
 {
-	if (m_userNavFlag && m_actorFlags == 0) {
+	if (m_userNavFlag && m_actorState == c_initial) {
 		m_lastTime = p_time;
 
 		Mx3DPointFloat p1, p2, p3, p4, p5;
@@ -387,7 +387,7 @@ void LegoPathActor::UpdateState(float p_time)
 	MxU32 b = FALSE;
 
 	while (m_lastTime < p_time) {
-		if (m_actorFlags != 0 && !VTable0x90(p_time, transform)) {
+		if (m_actorState != c_initial && !VTable0x90(p_time, transform)) {
 			return;
 		}
 
@@ -458,7 +458,7 @@ MxU32 LegoPathActor::VTable0x6c(
 		if (plpas.find(*itpa) != plpas.end()) {
 			LegoPathActor* actor = *itpa;
 
-			if (this != actor && !(actor->GetActorFlags() & LegoPathActor::c_noCollide)) {
+			if (this != actor && !(actor->GetActorState() & LegoPathActor::c_noCollide)) {
 				LegoROI* roi = actor->GetROI();
 
 				if (roi != NULL && (roi->GetVisibility() || actor->GetCameraFlag())) {
diff --git a/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp b/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
index 16e94b62..655f814f 100644
--- a/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legopathcontroller.cpp
@@ -366,7 +366,7 @@ void LegoPathController::FUN_10046970()
 		LegoPathActor* actor = *itpa;
 
 		if (m_actors.find(actor) != m_actors.end()) {
-			if (!((MxU8) actor->GetActorFlags() & LegoPathActor::c_disable)) {
+			if (!((MxU8) actor->GetActorState() & LegoPathActor::c_disabled)) {
 				actor->UpdateState(time);
 			}
 		}
diff --git a/LEGO1/lego/legoomni/src/race/legoraceactor.cpp b/LEGO1/lego/legoomni/src/race/legoraceactor.cpp
index 25fb4471..a8a7fccd 100644
--- a/LEGO1/lego/legoomni/src/race/legoraceactor.cpp
+++ b/LEGO1/lego/legoomni/src/race/legoraceactor.cpp
@@ -48,19 +48,17 @@ MxS32 LegoRaceActor::VTable0x68(Vector3& p_v1, Vector3& p_v2, Vector3& p_v3)
 MxU32 LegoRaceActor::VTable0x90(float p_time, Matrix4& p_transform)
 {
 	// Note: Code duplication with LegoExtraActor::VTable0x90
-	switch (m_actorFlags) {
-	case 0:
-	case 1:
-		return 1;
-
-	case 2:
+	switch (m_actorState) {
+	case c_initial:
+	case c_one:
+		return TRUE;
+	case c_two:
 		m_unk0x08 = p_time + 2000.0f;
-		m_actorFlags = 3;
+		m_actorState = c_three;
 		m_actorTime += (p_time - m_lastTime) * m_worldSpeed;
 		m_lastTime = p_time;
-		return 0;
-
-	case 3:
+		return FALSE;
+	case c_three:
 		assert(!m_userNavFlag);
 		Vector3 positionRef(p_transform[3]);
 
@@ -78,19 +76,19 @@ MxU32 LegoRaceActor::VTable0x90(float p_time, Matrix4& p_transform)
 			m_lastTime = p_time;
 
 			VTable0x74(p_transform);
-			return 0;
+			return FALSE;
 		}
 		else {
-			m_actorFlags = 0;
+			m_actorState = c_initial;
 			m_unk0x08 = 0;
 
 			positionRef -= g_unk0x10102b08;
 			m_roi->FUN_100a58f0(p_transform);
-			return 1;
+			return TRUE;
 		}
 	}
 
-	return 0;
+	return FALSE;
 }
 
 // FUNCTION: LEGO1 0x10014a00
@@ -98,7 +96,7 @@ MxU32 LegoRaceActor::VTable0x90(float p_time, Matrix4& p_transform)
 MxResult LegoRaceActor::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 {
 	if (!p_actor->GetUserNavFlag()) {
-		if (p_actor->GetActorFlags()) {
+		if (p_actor->GetActorState() != c_initial) {
 			return FAILURE;
 		}
 
@@ -112,7 +110,7 @@ MxResult LegoRaceActor::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 
 			roi->FUN_100a58f0(matr);
 
-			p_actor->SetActorFlags(2);
+			p_actor->SetActorState(c_two);
 		}
 	}
 
diff --git a/LEGO1/lego/legoomni/src/race/legoracers.cpp b/LEGO1/lego/legoomni/src/race/legoracers.cpp
index 00883dba..007a1a21 100644
--- a/LEGO1/lego/legoomni/src/race/legoracers.cpp
+++ b/LEGO1/lego/legoomni/src/race/legoracers.cpp
@@ -438,7 +438,7 @@ MxResult LegoRaceCar::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 {
 	// Note: Code duplication with LegoRaceActor::HitActor
 	if (!p_actor->GetUserNavFlag()) {
-		if (p_actor->GetActorFlags()) {
+		if (p_actor->GetActorState() != c_initial) {
 			return FAILURE;
 		}
 
@@ -451,7 +451,7 @@ MxResult LegoRaceCar::HitActor(LegoPathActor* p_actor, MxBool p_bool)
 			Vector3(matr[3]) += g_unk0x10102af0;
 			roi->FUN_100a58f0(matr);
 
-			p_actor->SetActorFlags(2);
+			p_actor->SetActorState(c_two);
 		}
 
 		if (m_userNavFlag) {
diff --git a/LEGO1/lego/legoomni/src/race/legoracespecial.cpp b/LEGO1/lego/legoomni/src/race/legoracespecial.cpp
index f30c3e7a..cef60472 100644
--- a/LEGO1/lego/legoomni/src/race/legoracespecial.cpp
+++ b/LEGO1/lego/legoomni/src/race/legoracespecial.cpp
@@ -113,7 +113,7 @@ MxS32 LegoCarRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_edg
 	Mx3DPointFloat destEdgeUnknownVector;
 	Mx3DPointFloat crossProduct;
 
-	if (m_actorFlags == 1) {
+	if (m_actorState == c_one) {
 		m_boundary = NULL;
 
 		// Not sure where the upper bound of 11 comes from, the underlying array has a size of 16
@@ -126,7 +126,7 @@ MxS32 LegoCarRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_edg
 
 		assert(m_boundary);
 
-		m_actorFlags = 0;
+		m_actorState = c_initial;
 		m_unk0x7c = 0;
 
 		if (m_userNavFlag) {
@@ -140,7 +140,7 @@ MxS32 LegoCarRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_edg
 	else {
 		for (MxS32 i = 0; i < 11; i += 2) {
 			if (LegoPathController::GetControlEdgeA(i) == p_edge) {
-				m_actorFlags = 1;
+				m_actorState = c_one;
 
 				if (m_worldSpeed < g_unk0x100f7aec) {
 					m_worldSpeed = g_unk0x100f7aec;
@@ -152,7 +152,7 @@ MxS32 LegoCarRaceActor::VTable0x1c(LegoPathBoundary* p_boundary, LegoEdge* p_edg
 			}
 		}
 
-		if (m_actorFlags == 1) {
+		if (m_actorState == c_one) {
 			if (m_userNavFlag) {
 				m_unk0xe4 = 0.5f;
 			}
diff --git a/LEGO1/lego/legoomni/src/worlds/act3.cpp b/LEGO1/lego/legoomni/src/worlds/act3.cpp
index 22acedc8..c8da9436 100644
--- a/LEGO1/lego/legoomni/src/worlds/act3.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/act3.cpp
@@ -426,7 +426,7 @@ MxLong Act3::Notify(MxParam& p_param)
 					VideoManager()->Get3DManager()->SetFrustrum(45.0f, 0.1f, 125.0f);
 
 					m_brickster->SetWorldSpeed(5.0f);
-					m_brickster->SetActorFlags(0);
+					m_brickster->SetActorState(LegoPathActor::c_initial);
 					assert(BackgroundAudioManager());
 
 					action.SetAtomId(*g_jukeboxScript);
@@ -435,11 +435,11 @@ MxLong Act3::Notify(MxParam& p_param)
 					BackgroundAudioManager()->PlayMusic(action, 5, MxPresenter::e_repeating);
 					m_brickster->FUN_100417c0();
 
-					m_cop1->SetActorFlags(0);
+					m_cop1->SetActorState(LegoPathActor::c_initial);
 					m_cop1->SetWorldSpeed(2.0f);
 					m_cop1->VTable0xa8();
 
-					m_cop2->SetActorFlags(0);
+					m_cop2->SetActorState(LegoPathActor::c_initial);
 					m_cop2->SetWorldSpeed(2.0f);
 					m_cop2->VTable0xa8();
 
@@ -592,9 +592,9 @@ void Act3::GoodEnding(const Matrix4& p_destination)
 {
 	assert(m_cop1 && m_cop2 && m_brickster && m_state);
 
-	m_cop1->SetActorFlags(LegoPathActor::c_disable);
-	m_cop2->SetActorFlags(LegoPathActor::c_disable);
-	m_brickster->SetActorFlags(LegoPathActor::c_disable);
+	m_cop1->SetActorState(LegoPathActor::c_disabled);
+	m_cop2->SetActorState(LegoPathActor::c_disabled);
+	m_brickster->SetActorState(LegoPathActor::c_disabled);
 
 	m_unk0x4220.Clear();
 	m_copter->FUN_10004640(p_destination);
diff --git a/LEGO1/lego/legoomni/src/worlds/isle.cpp b/LEGO1/lego/legoomni/src/worlds/isle.cpp
index 36fb0a3a..0a516043 100644
--- a/LEGO1/lego/legoomni/src/worlds/isle.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/isle.cpp
@@ -586,7 +586,7 @@ void Isle::Enable(MxBool p_enable)
 				FALSE,
 				IslePathActor::c_spawnBit1 | IslePathActor::c_playMusic | IslePathActor::c_spawnBit3
 			);
-			actor->SetActorFlags(0);
+			actor->SetActorState(LegoPathActor::c_initial);
 		}
 		else {
 			FUN_10032620();
diff --git a/LEGO1/lego/legoomni/src/worlds/legoact2.cpp b/LEGO1/lego/legoomni/src/worlds/legoact2.cpp
index 9edbc55d..6e730236 100644
--- a/LEGO1/lego/legoomni/src/worlds/legoact2.cpp
+++ b/LEGO1/lego/legoomni/src/worlds/legoact2.cpp
@@ -177,7 +177,7 @@ MxResult LegoAct2::Tickle()
 		m_unk0x10c4 = 1;
 		break;
 	case 1:
-		((LegoPathActor*) m_pepper->GetEntity())->SetActorFlags(LegoPathActor::c_disable);
+		((LegoPathActor*) m_pepper->GetEntity())->SetActorState(LegoPathActor::c_disabled);
 
 		switch (rand() % 3) {
 		case 0:
@@ -336,7 +336,7 @@ MxLong LegoAct2::Notify(MxParam& p_param)
 
 				m_unk0x10c4 = 14;
 				m_unk0x10d0 = 0;
-				((LegoPathActor*) m_pepper->GetEntity())->SetActorFlags(LegoPathActor::c_disable);
+				((LegoPathActor*) m_pepper->GetEntity())->SetActorState(LegoPathActor::c_disabled);
 			}
 			break;
 		case c_notificationTransitioned:
@@ -417,7 +417,7 @@ MxLong LegoAct2::HandleEndAction(MxEndActionNotificationParam& p_param)
 			m_unk0x10d0 = 0;
 
 			FUN_10052560(Act2mainScript::c_tra045la_RunAnim, TRUE, TRUE, NULL, NULL, NULL);
-			((LegoPathActor*) m_pepper->GetEntity())->SetActorFlags(LegoPathActor::c_disable);
+			((LegoPathActor*) m_pepper->GetEntity())->SetActorState(LegoPathActor::c_disabled);
 			AnimationManager()->EnableCamAnims(TRUE);
 			AnimationManager()->FUN_1005f6d0(TRUE);
 			AnimationManager()->FUN_100604f0(g_unk0x100f4428, sizeOfArray(g_unk0x100f4428));
@@ -450,7 +450,7 @@ MxLong LegoAct2::HandleEndAction(MxEndActionNotificationParam& p_param)
 			m_unk0x10c4 = 13;
 			SpawnBricks();
 			PlayMusic(JukeboxScript::c_BrickHunt);
-			((LegoPathActor*) m_pepper->GetEntity())->SetActorFlags(0);
+			((LegoPathActor*) m_pepper->GetEntity())->SetActorState(LegoPathActor::c_initial);
 			break;
 		}
 		case 14:
@@ -602,7 +602,7 @@ MxLong LegoAct2::HandlePathStruct(LegoPathStructNotificationParam& p_param)
 {
 	if (m_unk0x10c4 == 5 && p_param.GetData() == 0x32) {
 		LegoPathActor* actor = (LegoPathActor*) m_pepper->GetEntity();
-		actor->SetActorFlags(LegoPathActor::c_disable);
+		actor->SetActorState(LegoPathActor::c_disabled);
 		actor->SetWorldSpeed(0.0f);
 		FUN_10051900();
 
@@ -630,7 +630,7 @@ MxLong LegoAct2::HandlePathStruct(LegoPathStructNotificationParam& p_param)
 		FUN_10051fa0(p_param.GetData());
 	}
 	else if (m_unk0x10c4 == 10 && p_param.GetData() == 0x165) {
-		((LegoPathActor*) m_pepper->GetEntity())->SetActorFlags(LegoPathActor::c_disable);
+		((LegoPathActor*) m_pepper->GetEntity())->SetActorState(LegoPathActor::c_disabled);
 
 		if (FUN_10052560(Act2mainScript::c_VOhide_PlayWav, FALSE, TRUE, NULL, NULL, NULL) == SUCCESS) {
 			m_unk0x1140 = Act2mainScript::c_VOhide_PlayWav;
@@ -746,7 +746,7 @@ void LegoAct2::FUN_10051960()
 		roi->SetVisibility(FALSE);
 	}
 
-	((LegoPathActor*) m_pepper->GetEntity())->SetActorFlags(0);
+	((LegoPathActor*) m_pepper->GetEntity())->SetActorState(LegoPathActor::c_initial);
 }
 
 // FUNCTION: LEGO1 0x100519c0
@@ -937,7 +937,7 @@ MxResult LegoAct2::BadEnding()
 	}
 
 	LegoPathActor* actor = m_unk0x1138;
-	actor->SetActorFlags(LegoPathActor::c_disable);
+	actor->SetActorState(LegoPathActor::c_disabled);
 
 	m_gameState->SetUnknown0x08(104);
 	m_destLocation = LegoGameState::e_infomain;