Message code enum part 2: all components except for lights.

SpaceCadetPinball/TBlocker.cpp

@@ -7,15 +7,15 @@
 #include "render.h"
 #include "timer.h"
 
-TBlocker::TBlocker(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true)
+TBlocker::TBlocker(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, groupIndex, true)
 {
 	visualStruct visual{};
 
 	loader::query_visual(groupIndex, 0, &visual);
 	SoundIndex4 = visual.SoundIndex4;
 	SoundIndex3 = visual.SoundIndex3;
-	TurnOnMsgValue = 55;
-	TurnOffMsgValue = 5;
+	InitialDuration = 55;
+	ExtendedDuration = 5;
 	Threshold = 1000000000.0f;
 	Timer = 0;
 	MessageField = 0;
@@ -23,14 +23,14 @@ TBlocker::TBlocker(TPinballTable* table, int groupIndex) : TCollisionComponent(t
 	render::sprite_set_bitmap(RenderSprite, nullptr);
 }
 
-int TBlocker::Message(int code, float value)
+int TBlocker::Message2(MessageCode code, float value)
 {
 	switch (code)
 	{
-	case ~MessageCode::SetTiltLock:
-	case ~MessageCode::PlayerChanged:
-	case ~MessageCode::Reset:
-	case 51:
+	case MessageCode::SetTiltLock:
+	case MessageCode::PlayerChanged:
+	case MessageCode::Reset:
+	case MessageCode::TBlockerDisable:
 		if (Timer)
 		{
 			timer::kill(Timer);
@@ -39,28 +39,26 @@ int TBlocker::Message(int code, float value)
 		MessageField = 0;
 		ActiveFlag = 0;
 		render::sprite_set_bitmap(RenderSprite, nullptr);
-		if (code == 51)
+		if (code == MessageCode::TBlockerDisable)
 			loader::play_sound(SoundIndex3, this, "TBlocker1");
-		return 0;
-	case 52:
+		break;
+	case MessageCode::TBlockerEnable:
 		ActiveFlag = 1;
 		loader::play_sound(SoundIndex4, this, "TBlocker2");
 		render::sprite_set_bitmap(RenderSprite, ListBitmap->at(0));
+		if (Timer)
+			timer::kill(Timer);
+		Timer = timer::set(std::max(value, 0.0f), this, TimerExpired);
 		break;
-	case 59:
+	case MessageCode::TBlockerRestartTimeout:
+		if (Timer)
+			timer::kill(Timer);
+		Timer = timer::set(std::max(value, 0.0f), this, TimerExpired);
 		break;
 	default:
-		return 0;
+		break;
 	}
-	if (Timer)
-		timer::kill(Timer);
-
-	float timerTime;
-	if (value <= 0.0f)
-		timerTime = 0.0;
-	else
-		timerTime = value;
-	Timer = timer::set(timerTime, this, TimerExpired);
+	
 	return 0;
 }