From dfe1665ba1af6013914744c6195c714085c21d54 Mon Sep 17 00:00:00 2001 From: Muzychenko Andrey <33288308+k4zmu2a@users.noreply.github.com> Date: Tue, 6 Sep 2022 16:57:56 +0300 Subject: [PATCH] Message code enum part 4: finalized transition of Message to enum class. --- SpaceCadetPinball/TBall.cpp | 4 +- SpaceCadetPinball/TBall.h | 4 +- SpaceCadetPinball/TBlocker.cpp | 4 +- SpaceCadetPinball/TBlocker.h | 4 +- SpaceCadetPinball/TBumper.cpp | 10 +- SpaceCadetPinball/TBumper.h | 4 +- SpaceCadetPinball/TCollisionComponent.h | 15 - SpaceCadetPinball/TComponentGroup.cpp | 6 +- SpaceCadetPinball/TComponentGroup.h | 4 +- SpaceCadetPinball/TDemo.cpp | 18 +- SpaceCadetPinball/TDemo.h | 4 +- SpaceCadetPinball/TDrain.cpp | 4 +- SpaceCadetPinball/TDrain.h | 4 +- SpaceCadetPinball/TFlagSpinner.cpp | 4 +- SpaceCadetPinball/TFlagSpinner.h | 4 +- SpaceCadetPinball/TFlipper.cpp | 4 +- SpaceCadetPinball/TFlipper.h | 4 +- SpaceCadetPinball/TGate.cpp | 4 +- SpaceCadetPinball/TGate.h | 4 +- SpaceCadetPinball/THole.cpp | 4 +- SpaceCadetPinball/THole.h | 4 +- SpaceCadetPinball/TKickback.cpp | 4 +- SpaceCadetPinball/TKickback.h | 4 +- SpaceCadetPinball/TKickout.cpp | 6 +- SpaceCadetPinball/TKickout.h | 4 +- SpaceCadetPinball/TLight.cpp | 42 +- SpaceCadetPinball/TLight.h | 4 +- SpaceCadetPinball/TLightBargraph.cpp | 18 +- SpaceCadetPinball/TLightBargraph.h | 2 +- SpaceCadetPinball/TLightGroup.cpp | 68 +- SpaceCadetPinball/TLightGroup.h | 4 +- SpaceCadetPinball/TLightRollover.cpp | 2 +- SpaceCadetPinball/TLightRollover.h | 2 +- SpaceCadetPinball/TPinballComponent.cpp | 6 +- SpaceCadetPinball/TPinballComponent.h | 28 +- SpaceCadetPinball/TPinballTable.cpp | 48 +- SpaceCadetPinball/TPinballTable.h | 4 +- SpaceCadetPinball/TPlunger.cpp | 10 +- SpaceCadetPinball/TPlunger.h | 4 +- SpaceCadetPinball/TPopupTarget.cpp | 8 +- SpaceCadetPinball/TPopupTarget.h | 4 +- SpaceCadetPinball/TRollover.cpp | 6 +- SpaceCadetPinball/TRollover.h | 4 +- SpaceCadetPinball/TSink.cpp | 4 +- SpaceCadetPinball/TSink.h | 4 +- SpaceCadetPinball/TSoloTarget.cpp | 10 +- SpaceCadetPinball/TSoloTarget.h | 4 +- SpaceCadetPinball/TTextBox.cpp | 4 +- SpaceCadetPinball/TTextBox.h | 4 +- SpaceCadetPinball/TTimer.cpp | 4 +- SpaceCadetPinball/TTimer.h | 4 +- SpaceCadetPinball/TWall.cpp | 4 +- SpaceCadetPinball/TWall.h | 4 +- SpaceCadetPinball/control.cpp | 1066 +++++++++++------------ SpaceCadetPinball/pb.cpp | 32 +- 55 files changed, 751 insertions(+), 792 deletions(-) diff --git a/SpaceCadetPinball/TBall.cpp b/SpaceCadetPinball/TBall.cpp index d919ce1..3318625 100644 --- a/SpaceCadetPinball/TBall.cpp +++ b/SpaceCadetPinball/TBall.cpp @@ -11,7 +11,7 @@ #include "TPinballTable.h" #include "TTableLayer.h" -TBall::TBall(TPinballTable* table) : TPinballComponent2(table, -1, false) +TBall::TBall(TPinballTable* table) : TPinballComponent(table, -1, false) { visualStruct visual{}; char ballGroupName[10]{"ball"}; @@ -106,7 +106,7 @@ bool TBall::already_hit(TEdgeSegment* edge) return false; } -int TBall::Message2(MessageCode code, float value) +int TBall::Message(MessageCode code, float value) { if (code == MessageCode::Reset) { diff --git a/SpaceCadetPinball/TBall.h b/SpaceCadetPinball/TBall.h index abfcbf5..96f8a0b 100644 --- a/SpaceCadetPinball/TBall.h +++ b/SpaceCadetPinball/TBall.h @@ -5,14 +5,14 @@ class TCollisionComponent; class TEdgeSegment; -class TBall : public TPinballComponent2 +class TBall : public TPinballComponent { public : TBall(TPinballTable* table); void Repaint(); void not_again(TEdgeSegment* edge); bool already_hit(TEdgeSegment* edge); - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; vector2 get_coordinates() override; void Disable(); diff --git a/SpaceCadetPinball/TBlocker.cpp b/SpaceCadetPinball/TBlocker.cpp index 03c8368..1f798fc 100644 --- a/SpaceCadetPinball/TBlocker.cpp +++ b/SpaceCadetPinball/TBlocker.cpp @@ -7,7 +7,7 @@ #include "render.h" #include "timer.h" -TBlocker::TBlocker(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, groupIndex, true) +TBlocker::TBlocker(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { visualStruct visual{}; @@ -23,7 +23,7 @@ TBlocker::TBlocker(TPinballTable* table, int groupIndex) : TCollisionComponent2( render::sprite_set_bitmap(RenderSprite, nullptr); } -int TBlocker::Message2(MessageCode code, float value) +int TBlocker::Message(MessageCode code, float value) { switch (code) { diff --git a/SpaceCadetPinball/TBlocker.h b/SpaceCadetPinball/TBlocker.h index 95b5b9a..a42f4e2 100644 --- a/SpaceCadetPinball/TBlocker.h +++ b/SpaceCadetPinball/TBlocker.h @@ -2,11 +2,11 @@ #include "TCollisionComponent.h" class TBlocker : - public TCollisionComponent2 + public TCollisionComponent { public: TBlocker(TPinballTable* table, int groupIndex); - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; static void TimerExpired(int timerId, void* caller); diff --git a/SpaceCadetPinball/TBumper.cpp b/SpaceCadetPinball/TBumper.cpp index b80d4e8..ffd4eed 100644 --- a/SpaceCadetPinball/TBumper.cpp +++ b/SpaceCadetPinball/TBumper.cpp @@ -8,7 +8,7 @@ #include "timer.h" #include "TPinballTable.h" -TBumper::TBumper(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, groupIndex, true) +TBumper::TBumper(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { visualStruct visual{}; @@ -21,7 +21,7 @@ TBumper::TBumper(TPinballTable* table, int groupIndex) : TCollisionComponent2(ta OriginalThreshold = Threshold; } -int TBumper::Message2(MessageCode code, float value) +int TBumper::Message(MessageCode code, float value) { switch (code) { @@ -51,7 +51,7 @@ int TBumper::Message2(MessageCode code, float value) auto maxBmp = static_cast(ListBitmap->size()) - 1; if (2 * nextBmp > maxBmp) nextBmp = maxBmp / 2; - TBumper::Message2(MessageCode::TBumperSetBmpIndex, static_cast(nextBmp)); + TBumper::Message(MessageCode::TBumperSetBmpIndex, static_cast(nextBmp)); break; } case MessageCode::TBumperDecBmpIndex: @@ -59,7 +59,7 @@ int TBumper::Message2(MessageCode code, float value) auto nextBmp = BmpIndex - 1; if (nextBmp < 0) nextBmp = 0; - TBumper::Message2(MessageCode::TBumperSetBmpIndex, static_cast(nextBmp)); + TBumper::Message(MessageCode::TBumperSetBmpIndex, static_cast(nextBmp)); break; } case MessageCode::PlayerChanged: @@ -71,7 +71,7 @@ int TBumper::Message2(MessageCode code, float value) playerPtr = &PlayerData[static_cast(floor(value))]; BmpIndex = playerPtr->BmpIndex; MessageField = playerPtr->MessageField; - TBumper::Message2(MessageCode::TBumperSetBmpIndex, static_cast(BmpIndex)); + TBumper::Message(MessageCode::TBumperSetBmpIndex, static_cast(BmpIndex)); break; } case MessageCode::Reset: diff --git a/SpaceCadetPinball/TBumper.h b/SpaceCadetPinball/TBumper.h index 310d3c3..f6303e6 100644 --- a/SpaceCadetPinball/TBumper.h +++ b/SpaceCadetPinball/TBumper.h @@ -8,12 +8,12 @@ struct TBumper_player_backup }; class TBumper : - public TCollisionComponent2 + public TCollisionComponent { public: TBumper(TPinballTable* table, int groupIndex); ~TBumper() override = default; - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void Collision(TBall* ball, vector2* nextPosition, vector2* direction, float distance, TEdgeSegment* edge) override; void Fire(); diff --git a/SpaceCadetPinball/TCollisionComponent.h b/SpaceCadetPinball/TCollisionComponent.h index d93327b..e0d727c 100644 --- a/SpaceCadetPinball/TCollisionComponent.h +++ b/SpaceCadetPinball/TCollisionComponent.h @@ -24,18 +24,3 @@ public: virtual int FieldEffect(TBall* ball, vector2* vecDst); bool DefaultCollision(TBall* ball, vector2* nextPosition, vector2* direction); }; - - -class TCollisionComponent2 : public TCollisionComponent -{ -public: - TCollisionComponent2(TPinballTable* table, int group_index, bool create_wall) - : TCollisionComponent(table, group_index, create_wall) - { - } - - DEPRECATED int Message(int code, float value) override - { - return Message2(static_cast(code), value); - } -}; diff --git a/SpaceCadetPinball/TComponentGroup.cpp b/SpaceCadetPinball/TComponentGroup.cpp index a86ce29..ab7f2d2 100644 --- a/SpaceCadetPinball/TComponentGroup.cpp +++ b/SpaceCadetPinball/TComponentGroup.cpp @@ -7,7 +7,7 @@ #include "timer.h" #include "TPinballTable.h" -TComponentGroup::TComponentGroup(TPinballTable* table, int groupIndex) : TPinballComponent2(table, groupIndex, false) +TComponentGroup::TComponentGroup(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) { Timer = 0; if (groupIndex > 0) @@ -33,7 +33,7 @@ TComponentGroup::~TComponentGroup() } } -int TComponentGroup::Message2(MessageCode code, float value) +int TComponentGroup::Message(MessageCode code, float value) { if (code == MessageCode::TComponentGroupResetNotifyTimer) { @@ -50,7 +50,7 @@ int TComponentGroup::Message2(MessageCode code, float value) { for (auto component : List) { - component->Message2(code, value); + component->Message(code, value); } } return 0; diff --git a/SpaceCadetPinball/TComponentGroup.h b/SpaceCadetPinball/TComponentGroup.h index 8876b33..e498f7a 100644 --- a/SpaceCadetPinball/TComponentGroup.h +++ b/SpaceCadetPinball/TComponentGroup.h @@ -3,12 +3,12 @@ class TComponentGroup : - public TPinballComponent2 + public TPinballComponent { public: TComponentGroup(TPinballTable* table, int groupIndex); ~TComponentGroup() override; - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; static void NotifyTimerExpired(int timerId, void* caller); std::vector List; diff --git a/SpaceCadetPinball/TDemo.cpp b/SpaceCadetPinball/TDemo.cpp index 7b5f129..807673c 100644 --- a/SpaceCadetPinball/TDemo.cpp +++ b/SpaceCadetPinball/TDemo.cpp @@ -10,7 +10,7 @@ #include "TBall.h" TDemo::TDemo(TPinballTable* table, int groupIndex) - : TCollisionComponent2(table, groupIndex, false) + : TCollisionComponent(table, groupIndex, false) { visualStruct visual{}; @@ -56,7 +56,7 @@ TDemo::TDemo(TPinballTable* table, int groupIndex) Edge3 = TEdgeSegment::install_wall(v9, this, &ActiveFlag, visual.CollisionGroup, table->CollisionCompOffset, 1404); } -int TDemo::Message2(MessageCode code, float value) +int TDemo::Message(MessageCode code, float value) { switch (code) { @@ -125,7 +125,7 @@ void TDemo::Collision(TBall* ball, vector2* nextPosition, vector2* direction, fl case 1404: if (!PlungerFlag) { - PinballTable->Message2(MessageCode::PlungerInputPressed, ball->TimeNow); + PinballTable->Message(MessageCode::PlungerInputPressed, ball->TimeNow); float time = RandFloat() + 2.0f; PlungerFlag = timer::set(time, this, PlungerRelease); } @@ -139,14 +139,14 @@ void TDemo::PlungerRelease(int timerId, void* caller) { auto demo = static_cast(caller); demo->PlungerFlag = 0; - demo->PinballTable->Message2(MessageCode::PlungerInputReleased, pb::time_next); + demo->PinballTable->Message(MessageCode::PlungerInputReleased, pb::time_next); } void TDemo::UnFlipRight(int timerId, void* caller) { auto demo = static_cast(caller); if (demo->FlipRightFlag) - demo->PinballTable->Message2(MessageCode::RightFlipperInputReleased, pb::time_next); + demo->PinballTable->Message(MessageCode::RightFlipperInputReleased, pb::time_next); demo->FlipRightFlag = 0; } @@ -154,7 +154,7 @@ void TDemo::UnFlipLeft(int timerId, void* caller) { auto demo = static_cast(caller); if (demo->FlipLeftFlag) - demo->PinballTable->Message2(MessageCode::LeftFlipperInputReleased, pb::time_next); + demo->PinballTable->Message(MessageCode::LeftFlipperInputReleased, pb::time_next); demo->FlipLeftFlag = 0; } @@ -168,7 +168,7 @@ void TDemo::FlipRight(int timerId, void* caller) timer::kill(demo->FlipRightTimer); demo->FlipRightTimer = 0; } - demo->PinballTable->Message2(MessageCode::RightFlipperInputPressed, pb::time_next); + demo->PinballTable->Message(MessageCode::RightFlipperInputPressed, pb::time_next); demo->FlipRightFlag = 1; float time = demo->UnFlipTimerTime1 + demo->UnFlipTimerTime2 - RandFloat() * (demo->UnFlipTimerTime2 + demo->UnFlipTimerTime2); @@ -186,7 +186,7 @@ void TDemo::FlipLeft(int timerId, void* caller) timer::kill(demo->FlipLeftTimer); demo->FlipLeftTimer = 0; } - demo->PinballTable->Message2(MessageCode::LeftFlipperInputPressed, pb::time_next); + demo->PinballTable->Message(MessageCode::LeftFlipperInputPressed, pb::time_next); demo->FlipLeftFlag = 1; float time = demo->UnFlipTimerTime1 + demo->UnFlipTimerTime2 - RandFloat() * (demo->UnFlipTimerTime2 + demo->UnFlipTimerTime2); @@ -198,6 +198,6 @@ void TDemo::NewGameRestartTimer(int timerId, void* caller) { auto demo = static_cast(caller); pb::replay_level(true); - demo->PinballTable->Message2(MessageCode::NewGame, static_cast(demo->PinballTable->PlayerCount)); + demo->PinballTable->Message(MessageCode::NewGame, static_cast(demo->PinballTable->PlayerCount)); demo->RestartGameTimer = 0; } diff --git a/SpaceCadetPinball/TDemo.h b/SpaceCadetPinball/TDemo.h index 4525265..920e33f 100644 --- a/SpaceCadetPinball/TDemo.h +++ b/SpaceCadetPinball/TDemo.h @@ -2,11 +2,11 @@ #include "TCollisionComponent.h" class TDemo : - public TCollisionComponent2 + public TCollisionComponent { public: TDemo(TPinballTable* table, int groupIndex); - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void Collision(TBall* ball, vector2* nextPosition, vector2* direction, float distance, TEdgeSegment* edge) override; diff --git a/SpaceCadetPinball/TDrain.cpp b/SpaceCadetPinball/TDrain.cpp index f5c3cc4..2300baa 100644 --- a/SpaceCadetPinball/TDrain.cpp +++ b/SpaceCadetPinball/TDrain.cpp @@ -8,13 +8,13 @@ #include "timer.h" #include "TPinballTable.h" -TDrain::TDrain(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, groupIndex, true) +TDrain::TDrain(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { Timer = 0; TimerTime = *loader::query_float_attribute(groupIndex, 0, 407); } -int TDrain::Message2(MessageCode code, float value) +int TDrain::Message(MessageCode code, float value) { if (code == MessageCode::Reset) { diff --git a/SpaceCadetPinball/TDrain.h b/SpaceCadetPinball/TDrain.h index 0ecdf71..a6839d0 100644 --- a/SpaceCadetPinball/TDrain.h +++ b/SpaceCadetPinball/TDrain.h @@ -2,11 +2,11 @@ #include "TCollisionComponent.h" class TDrain : - public TCollisionComponent2 + public TCollisionComponent { public: TDrain(TPinballTable* table, int groupIndex); - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void Collision(TBall* ball, vector2* nextPosition, vector2* direction, float distance, TEdgeSegment* edge) override; diff --git a/SpaceCadetPinball/TFlagSpinner.cpp b/SpaceCadetPinball/TFlagSpinner.cpp index de0db9d..9e8343b 100644 --- a/SpaceCadetPinball/TFlagSpinner.cpp +++ b/SpaceCadetPinball/TFlagSpinner.cpp @@ -10,7 +10,7 @@ #include "TLine.h" #include "TPinballTable.h" -TFlagSpinner::TFlagSpinner(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, groupIndex, false) +TFlagSpinner::TFlagSpinner(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, false) { visualStruct visual{}; vector2 end{}, start{}; @@ -50,7 +50,7 @@ TFlagSpinner::TFlagSpinner(TPinballTable* table, int groupIndex) : TCollisionCom MinSpeed = *minSpeed; } -int TFlagSpinner::Message2(MessageCode code, float value) +int TFlagSpinner::Message(MessageCode code, float value) { if (code == MessageCode::Reset) { diff --git a/SpaceCadetPinball/TFlagSpinner.h b/SpaceCadetPinball/TFlagSpinner.h index d50b828..2dbff17 100644 --- a/SpaceCadetPinball/TFlagSpinner.h +++ b/SpaceCadetPinball/TFlagSpinner.h @@ -2,11 +2,11 @@ #include "TCollisionComponent.h" class TFlagSpinner : - public TCollisionComponent2 + public TCollisionComponent { public: TFlagSpinner(TPinballTable* table, int groupIndex); - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void Collision(TBall* ball, vector2* nextPosition, vector2* direction, float distance, TEdgeSegment* edge) override; void NextFrame(); diff --git a/SpaceCadetPinball/TFlipper.cpp b/SpaceCadetPinball/TFlipper.cpp index 280a751..2287853 100644 --- a/SpaceCadetPinball/TFlipper.cpp +++ b/SpaceCadetPinball/TFlipper.cpp @@ -10,7 +10,7 @@ #include "timer.h" #include "TPinballTable.h" -TFlipper::TFlipper(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, groupIndex, false) +TFlipper::TFlipper(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, false) { visualStruct visual{}; @@ -58,7 +58,7 @@ TFlipper::~TFlipper() } } -int TFlipper::Message2(MessageCode code, float value) +int TFlipper::Message(MessageCode code, float value) { switch (code) { diff --git a/SpaceCadetPinball/TFlipper.h b/SpaceCadetPinball/TFlipper.h index 10ea8b2..edfed89 100644 --- a/SpaceCadetPinball/TFlipper.h +++ b/SpaceCadetPinball/TFlipper.h @@ -4,12 +4,12 @@ class TFlipperEdge; class TFlipper : - public TCollisionComponent2 + public TCollisionComponent { public: TFlipper(TPinballTable* table, int groupIndex); ~TFlipper() override; - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void port_draw() override; void Collision(TBall* ball, vector2* nextPosition, vector2* direction, float distance, TEdgeSegment* edge) override; diff --git a/SpaceCadetPinball/TGate.cpp b/SpaceCadetPinball/TGate.cpp index 53e0937..44d5893 100644 --- a/SpaceCadetPinball/TGate.cpp +++ b/SpaceCadetPinball/TGate.cpp @@ -6,7 +6,7 @@ #include "loader.h" #include "render.h" -TGate::TGate(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, groupIndex, true) +TGate::TGate(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { visualStruct visual{}; @@ -18,7 +18,7 @@ TGate::TGate(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, control::handler(1024, this); } -int TGate::Message2(MessageCode code, float value) +int TGate::Message(MessageCode code, float value) { switch (code) { diff --git a/SpaceCadetPinball/TGate.h b/SpaceCadetPinball/TGate.h index 3a40723..fa7d0f3 100644 --- a/SpaceCadetPinball/TGate.h +++ b/SpaceCadetPinball/TGate.h @@ -2,11 +2,11 @@ #include "TCollisionComponent.h" class TGate : - public TCollisionComponent2 + public TCollisionComponent { public: TGate(TPinballTable* table, int groupIndex); - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; int SoundIndex4; int SoundIndex3; diff --git a/SpaceCadetPinball/THole.cpp b/SpaceCadetPinball/THole.cpp index 9aa778c..8eade34 100644 --- a/SpaceCadetPinball/THole.cpp +++ b/SpaceCadetPinball/THole.cpp @@ -10,7 +10,7 @@ #include "TPinballTable.h" #include "TTableLayer.h" -THole::THole(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, groupIndex, false) +THole::THole(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, false) { visualStruct visual{}; circle_type circle{}; @@ -57,7 +57,7 @@ THole::THole(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, TTableLayer::edges_insert_circle(&circle, nullptr, &Field); } -int THole::Message2(MessageCode code, float value) +int THole::Message(MessageCode code, float value) { if (code == MessageCode::Reset && BallCapturedFlag) { diff --git a/SpaceCadetPinball/THole.h b/SpaceCadetPinball/THole.h index a0f6596..b05dc4e 100644 --- a/SpaceCadetPinball/THole.h +++ b/SpaceCadetPinball/THole.h @@ -4,11 +4,11 @@ #include "TEdgeManager.h" class THole : - public TCollisionComponent2 + public TCollisionComponent { public: THole(TPinballTable* table, int groupIndex); - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void Collision(TBall* ball, vector2* nextPosition, vector2* direction, float distance, TEdgeSegment* edge) override; int FieldEffect(TBall* ball, vector2* vecDst) override; diff --git a/SpaceCadetPinball/TKickback.cpp b/SpaceCadetPinball/TKickback.cpp index 50bee28..151ab5e 100644 --- a/SpaceCadetPinball/TKickback.cpp +++ b/SpaceCadetPinball/TKickback.cpp @@ -9,7 +9,7 @@ #include "timer.h" #include "TPinballTable.h" -TKickback::TKickback(TPinballTable* table, int groupIndex): TCollisionComponent2(table, groupIndex, true) +TKickback::TKickback(TPinballTable* table, int groupIndex): TCollisionComponent(table, groupIndex, true) { MessageField = 0; Timer = 0; @@ -19,7 +19,7 @@ TKickback::TKickback(TPinballTable* table, int groupIndex): TCollisionComponent2 Threshold = 1000000000.0f; } -int TKickback::Message2(MessageCode code, float value) +int TKickback::Message(MessageCode code, float value) { if ((code == MessageCode::SetTiltLock || code == MessageCode::Reset) && Timer) { diff --git a/SpaceCadetPinball/TKickback.h b/SpaceCadetPinball/TKickback.h index 64c34e0..1aebd4c 100644 --- a/SpaceCadetPinball/TKickback.h +++ b/SpaceCadetPinball/TKickback.h @@ -2,11 +2,11 @@ #include "TCollisionComponent.h" class TKickback : - public TCollisionComponent2 + public TCollisionComponent { public: TKickback(TPinballTable* table, int groupIndex); - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void Collision(TBall* ball, vector2* nextPosition, vector2* direction, float distance, TEdgeSegment* edge) override; diff --git a/SpaceCadetPinball/TKickout.cpp b/SpaceCadetPinball/TKickout.cpp index f07352c..b418274 100644 --- a/SpaceCadetPinball/TKickout.cpp +++ b/SpaceCadetPinball/TKickout.cpp @@ -11,7 +11,7 @@ #include "TPinballTable.h" #include "TTableLayer.h" -TKickout::TKickout(TPinballTable* table, int groupIndex, bool someFlag): TCollisionComponent2( +TKickout::TKickout(TPinballTable* table, int groupIndex, bool someFlag): TCollisionComponent( table, groupIndex, false) { visualStruct visual{}; @@ -60,7 +60,7 @@ TKickout::TKickout(TPinballTable* table, int groupIndex, bool someFlag): TCollis TTableLayer::edges_insert_circle(&circle, nullptr, &Field); } -int TKickout::Message2(MessageCode code, float value) +int TKickout::Message(MessageCode code, float value) { switch (code) { @@ -107,7 +107,7 @@ void TKickout::Collision(TBall* ball, vector2* nextPosition, vector2* direction, ball->Position.Z = CollisionBallSetZ; if (PinballTable->TiltLockFlag) { - Message2(MessageCode::TKickoutRestartTimer, 0.1f); + Message(MessageCode::TKickoutRestartTimer, 0.1f); } else { diff --git a/SpaceCadetPinball/TKickout.h b/SpaceCadetPinball/TKickout.h index 9e64a47..5c98569 100644 --- a/SpaceCadetPinball/TKickout.h +++ b/SpaceCadetPinball/TKickout.h @@ -4,11 +4,11 @@ #include "TEdgeManager.h" class TKickout : - public TCollisionComponent2 + public TCollisionComponent { public: TKickout(TPinballTable* table, int groupIndex, bool someFlag); - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void Collision(TBall* ball, vector2* nextPosition, vector2* direction, float distance, TEdgeSegment* edge) override; int FieldEffect(TBall* ball, vector2* vecDst) override; diff --git a/SpaceCadetPinball/TLight.cpp b/SpaceCadetPinball/TLight.cpp index f4a4ac0..09a2d6e 100644 --- a/SpaceCadetPinball/TLight.cpp +++ b/SpaceCadetPinball/TLight.cpp @@ -8,7 +8,7 @@ #include "timer.h" #include "TPinballTable.h" -TLight::TLight(TPinballTable* table, int groupIndex) : TPinballComponent2(table, groupIndex, true) +TLight::TLight(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, true) { TimeoutTimer = 0; FlasherOnFlag = false; @@ -23,7 +23,7 @@ TLight::TLight(TPinballTable* table, int groupIndex) : TPinballComponent2(table, SourceDelay[1] = *floatArr2; } -int TLight::Message2(MessageCode code, float value) +int TLight::Message(MessageCode code, float value) { int bmpIndex; @@ -57,12 +57,12 @@ int TLight::Message2(MessageCode code, float value) MessageField = playerPtr->MessageField; if (LightOnBmpIndex) { - Message2(MessageCode::TLightSetOnStateBmpIndex, static_cast(LightOnBmpIndex)); + Message(MessageCode::TLightSetOnStateBmpIndex, static_cast(LightOnBmpIndex)); } if (LightOnFlag) - Message2(MessageCode::TLightTurnOn, 0.0); + Message(MessageCode::TLightTurnOn, 0.0); if (FlasherOnFlag) - Message2(MessageCode::TLightFlasherStart, 0.0); + Message(MessageCode::TLightFlasherStart, 0.0); break; } case MessageCode::TLightTurnOff: @@ -164,13 +164,13 @@ int TLight::Message2(MessageCode code, float value) bmpIndex = LightOnBmpIndex + 1; if (bmpIndex >= static_cast(ListBitmap->size())) bmpIndex = static_cast(ListBitmap->size()) - 1; - Message2(MessageCode::TLightSetOnStateBmpIndex, static_cast(bmpIndex)); + Message(MessageCode::TLightSetOnStateBmpIndex, static_cast(bmpIndex)); break; case MessageCode::TLightDecOnStateBmpIndex: bmpIndex = LightOnBmpIndex - 1; if (bmpIndex < 0) bmpIndex = 0; - Message2(MessageCode::TLightSetOnStateBmpIndex, static_cast(bmpIndex)); + Message(MessageCode::TLightSetOnStateBmpIndex, static_cast(bmpIndex)); break; case MessageCode::TLightResetTimed: if (TimeoutTimer) @@ -188,36 +188,36 @@ int TLight::Message2(MessageCode code, float value) if (UndoOverrideTimer) timer::kill(UndoOverrideTimer); UndoOverrideTimer = 0; - Message2(MessageCode::TLightTurnOn, 0.0); - Message2(MessageCode::TLightFlasherStartTimed, value); + Message(MessageCode::TLightTurnOn, 0.0); + Message(MessageCode::TLightFlasherStartTimed, value); break; case MessageCode::TLightFlasherStartTimedThenStayOff: if (UndoOverrideTimer) timer::kill(UndoOverrideTimer); UndoOverrideTimer = 0; - Message2(MessageCode::TLightFlasherStartTimed, value); + Message(MessageCode::TLightFlasherStartTimed, value); TurnOffAfterFlashingFg = true; break; case MessageCode::TLightToggleValue: - Message2(static_cast(floor(value)) ? MessageCode::TLightTurnOn : MessageCode::TLightTurnOff, 0.0); + Message(static_cast(floor(value)) ? MessageCode::TLightTurnOn : MessageCode::TLightTurnOff, 0.0); return LightOnFlag; case MessageCode::TLightResetAndToggleValue: - Message2(MessageCode::TLightToggleValue, value); - Message2(MessageCode::TLightResetTimed, 0.0); + Message(MessageCode::TLightToggleValue, value); + Message(MessageCode::TLightResetTimed, 0.0); return LightOnFlag; case MessageCode::TLightResetAndTurnOn: - Message2(MessageCode::TLightTurnOn, 0.0); - Message2(MessageCode::TLightResetTimed, 0.0); + Message(MessageCode::TLightTurnOn, 0.0); + Message(MessageCode::TLightResetTimed, 0.0); break; case MessageCode::TLightResetAndTurnOff: - Message2(MessageCode::TLightTurnOff, 0.0); - Message2(MessageCode::TLightResetTimed, 0.0); + Message(MessageCode::TLightTurnOff, 0.0); + Message(MessageCode::TLightResetTimed, 0.0); break; case MessageCode::TLightToggle: - Message2(MessageCode::TLightToggleValue, !LightOnFlag); + Message(MessageCode::TLightToggleValue, !LightOnFlag); return LightOnFlag; case MessageCode::TLightResetAndToggle: - Message2(MessageCode::TLightResetAndToggleValue, !LightOnFlag); + Message(MessageCode::TLightResetAndToggleValue, !LightOnFlag); return LightOnFlag; case MessageCode::TLightSetMessageField: MessageField = static_cast(floor(value)); @@ -298,7 +298,7 @@ void TLight::TimerExpired(int timerId, void* caller) if (light->TurnOffAfterFlashingFg) { light->TurnOffAfterFlashingFg = false; - light->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + light->Message(MessageCode::TLightResetAndTurnOff, 0.0); } if (light->Control) control::handler(60, light); @@ -341,5 +341,5 @@ void TLight::flasher_callback(int timerId, void* caller) void TLight::UndoTmpOverride(int timerId, void* caller) { auto light = static_cast(caller); - light->Message2(MessageCode::TLightFtResetOverride, 0.0f); + light->Message(MessageCode::TLightFtResetOverride, 0.0f); } diff --git a/SpaceCadetPinball/TLight.h b/SpaceCadetPinball/TLight.h index 3c88e93..4012900 100644 --- a/SpaceCadetPinball/TLight.h +++ b/SpaceCadetPinball/TLight.h @@ -13,11 +13,11 @@ struct TLight_player_backup class TLight : - public TPinballComponent2 + public TPinballComponent { public: TLight(TPinballTable* table, int groupIndex); - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void Reset(); void schedule_timeout(float time); void flasher_stop(int bmpIndex); diff --git a/SpaceCadetPinball/TLightBargraph.cpp b/SpaceCadetPinball/TLightBargraph.cpp index 62c679d..c90399c 100644 --- a/SpaceCadetPinball/TLightBargraph.cpp +++ b/SpaceCadetPinball/TLightBargraph.cpp @@ -32,7 +32,7 @@ TLightBargraph::~TLightBargraph() delete[] TimerTimeArray; } -int TLightBargraph::Message2(MessageCode code, float value) +int TLightBargraph::Message(MessageCode code, float value) { switch (code) { @@ -51,16 +51,16 @@ int TLightBargraph::Message2(MessageCode code, float value) timeIndex = maxCount - 1; if (timeIndex >= 0) { - TLightGroup::Message2(MessageCode::TLightGroupToggleSplitIndex, static_cast(timeIndex / 2)); + TLightGroup::Message(MessageCode::TLightGroupToggleSplitIndex, static_cast(timeIndex / 2)); if (!(timeIndex & 1)) - TLightGroup::Message2(MessageCode::TLightGroupStartFlasher, 0.0); + TLightGroup::Message(MessageCode::TLightGroupStartFlasher, 0.0); if (TimerTimeArray) TimerBargraph = timer::set(TimerTimeArray[timeIndex], this, BargraphTimerExpired); TimeIndex = timeIndex; } else { - TLightGroup::Message2(MessageCode::TLightResetAndTurnOff, 0.0); + TLightGroup::Message(MessageCode::TLightResetAndTurnOff, 0.0); TimeIndex = 0; } break; @@ -79,7 +79,7 @@ int TLightBargraph::Message2(MessageCode code, float value) TimeIndex = PlayerTimerIndexBackup[static_cast(floor(value))]; if (TimeIndex) { - TLightBargraph::Message2(MessageCode::TLightGroupToggleSplitIndex, static_cast(TimeIndex)); + TLightBargraph::Message(MessageCode::TLightGroupToggleSplitIndex, static_cast(TimeIndex)); } break; case MessageCode::Reset: @@ -92,11 +92,11 @@ int TLightBargraph::Message2(MessageCode code, float value) ++playerPtr; } - TLightGroup::Message2(MessageCode::Reset, value); + TLightGroup::Message(MessageCode::Reset, value); break; } default: - TLightGroup::Message2(code, value); + TLightGroup::Message(code, value); break; } return 0; @@ -119,12 +119,12 @@ void TLightBargraph::BargraphTimerExpired(int timerId, void* caller) bar->TimerBargraph = 0; if (bar->TimeIndex) { - bar->Message2(MessageCode::TLightGroupToggleSplitIndex, static_cast(bar->TimeIndex - 1)); + bar->Message(MessageCode::TLightGroupToggleSplitIndex, static_cast(bar->TimeIndex - 1)); control::handler(60, bar); } else { - bar->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + bar->Message(MessageCode::TLightResetAndTurnOff, 0.0); control::handler(47, bar); } } diff --git a/SpaceCadetPinball/TLightBargraph.h b/SpaceCadetPinball/TLightBargraph.h index c21ba96..8a531ea 100644 --- a/SpaceCadetPinball/TLightBargraph.h +++ b/SpaceCadetPinball/TLightBargraph.h @@ -7,7 +7,7 @@ class TLightBargraph : public: TLightBargraph(TPinballTable* table, int groupIndex); ~TLightBargraph() override; - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void Reset() override; static void BargraphTimerExpired(int timerId, void* caller); diff --git a/SpaceCadetPinball/TLightGroup.cpp b/SpaceCadetPinball/TLightGroup.cpp index 59e2fcd..42213b0 100644 --- a/SpaceCadetPinball/TLightGroup.cpp +++ b/SpaceCadetPinball/TLightGroup.cpp @@ -8,7 +8,7 @@ #include "TLight.h" #include "TPinballTable.h" -TLightGroup::TLightGroup(TPinballTable* table, int groupIndex) : TPinballComponent2(table, groupIndex, false) +TLightGroup::TLightGroup(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) { Timer = 0; NotifyTimer = 0; @@ -28,7 +28,7 @@ TLightGroup::TLightGroup(TPinballTable* table, int groupIndex) : TPinballCompone } } -int TLightGroup::Message2(MessageCode code, float value) +int TLightGroup::Message(MessageCode code, float value) { auto const count = static_cast(List.size()); switch (code) @@ -70,7 +70,7 @@ int TLightGroup::Message2(MessageCode code, float value) break; if (MessageField2 != MessageCode::TLightGroupNull) { - TLightGroup::Message2(MessageCode::TLightGroupReset, 0.0); + TLightGroup::Message(MessageCode::TLightGroupReset, 0.0); } AnimationFlag = 1; MessageField2 = code; @@ -80,11 +80,11 @@ int TLightGroup::Message2(MessageCode code, float value) { auto lightCur = List.at(index); auto lightPrev = List.at(index - 1); - lightCur->Message2(lightPrev->LightOnFlag ? MessageCode::TLightTurnOn : MessageCode::TLightTurnOff, 0.0); + lightCur->Message(lightPrev->LightOnFlag ? MessageCode::TLightTurnOn : MessageCode::TLightTurnOff, 0.0); lightCur->MessageField = lightPrev->MessageField; } auto firstLight = List.at(0); - firstLight->Message2(lastStatus ? MessageCode::TLightTurnOn : MessageCode::TLightTurnOff, 0.0); + firstLight->Message(lastStatus ? MessageCode::TLightTurnOn : MessageCode::TLightTurnOff, 0.0); firstLight->MessageField = lastMessage; reschedule_animation(value); break; @@ -96,7 +96,7 @@ int TLightGroup::Message2(MessageCode code, float value) break; if (MessageField2 != MessageCode::TLightGroupNull) { - TLightGroup::Message2(MessageCode::TLightGroupReset, 0.0); + TLightGroup::Message(MessageCode::TLightGroupReset, 0.0); } auto firstLight = List.at(0); AnimationFlag = 1; @@ -107,10 +107,10 @@ int TLightGroup::Message2(MessageCode code, float value) { auto lightCur = List.at(index); auto lightNext = List.at(index + 1); - lightCur->Message2(lightNext->LightOnFlag ? MessageCode::TLightTurnOn : MessageCode::TLightTurnOff, 0.0); + lightCur->Message(lightNext->LightOnFlag ? MessageCode::TLightTurnOn : MessageCode::TLightTurnOff, 0.0); lightCur->MessageField = lightNext->MessageField; } - lastLight->Message2(firstStatus ? MessageCode::TLightTurnOn : MessageCode::TLightTurnOff, 0.0); + lastLight->Message(firstStatus ? MessageCode::TLightTurnOn : MessageCode::TLightTurnOff, 0.0); lastLight->MessageField = firstMessage; reschedule_animation(value); break; @@ -127,10 +127,10 @@ int TLightGroup::Message2(MessageCode code, float value) { auto lightCur = List.at(i); auto lightPrev = List.at(i - 1); - lightCur->Message2(lightPrev->ToggledOnFlag ? MessageCode::TLightTurnOnTimed : MessageCode::TLightTurnOffTimed, 0.0); + lightCur->Message(lightPrev->ToggledOnFlag ? MessageCode::TLightTurnOnTimed : MessageCode::TLightTurnOffTimed, 0.0); } auto firstLight = List.at(0); - firstLight->Message2(lastStatus ? MessageCode::TLightTurnOnTimed : MessageCode::TLightTurnOffTimed, 0); + firstLight->Message(lastStatus ? MessageCode::TLightTurnOnTimed : MessageCode::TLightTurnOffTimed, 0); reschedule_animation(value); break; } @@ -146,10 +146,10 @@ int TLightGroup::Message2(MessageCode code, float value) { auto lightCur = List.at(i); auto lightNext = List.at(i + 1); - lightCur->Message2(lightNext->ToggledOnFlag ? MessageCode::TLightTurnOnTimed : MessageCode::TLightTurnOffTimed, 0.0); + lightCur->Message(lightNext->ToggledOnFlag ? MessageCode::TLightTurnOnTimed : MessageCode::TLightTurnOffTimed, 0.0); } auto lastLight = List.at(count - 1); - lastLight->Message2(firstStatus ? MessageCode::TLightTurnOnTimed : MessageCode::TLightTurnOffTimed, 0); + lastLight->Message(firstStatus ? MessageCode::TLightTurnOnTimed : MessageCode::TLightTurnOffTimed, 0); reschedule_animation(value); break; } @@ -164,7 +164,7 @@ int TLightGroup::Message2(MessageCode code, float value) if (rand() % 100 > 70) { auto randVal = RandFloat() * value * 3.0f + 0.1f; - light->Message2(MessageCode::TLightTurnOnTimed, randVal); + light->Message(MessageCode::TLightTurnOnTimed, randVal); } } reschedule_animation(value); @@ -179,7 +179,7 @@ int TLightGroup::Message2(MessageCode code, float value) for (auto light : List) { auto randVal = static_cast(rand() % 100 > 70); - light->Message2(MessageCode::TLightResetAndToggleValue, randVal); + light->Message(MessageCode::TLightResetAndToggleValue, randVal); } reschedule_animation(value); break; @@ -201,7 +201,7 @@ int TLightGroup::Message2(MessageCode code, float value) auto light = *it; if (!light->LightOnFlag && randModCount-- == 0) { - light->Message2(MessageCode::TLightTurnOn, 0.0); + light->Message(MessageCode::TLightTurnOn, 0.0); break; } } @@ -227,7 +227,7 @@ int TLightGroup::Message2(MessageCode code, float value) auto light = *it; if (light->LightOnFlag && randModCount-- == 0) { - light->Message2(MessageCode::TLightTurnOff, 0.0); + light->Message(MessageCode::TLightTurnOff, 0.0); break; } } @@ -241,7 +241,7 @@ int TLightGroup::Message2(MessageCode code, float value) auto index = next_light_up(); if (index < 0) break; - List.at(index)->Message2(MessageCode::TLightTurnOn, 0.0); + List.at(index)->Message(MessageCode::TLightTurnOn, 0.0); if (MessageField2 != MessageCode::TLightGroupNull) start_animation(); return 1; @@ -251,7 +251,7 @@ int TLightGroup::Message2(MessageCode code, float value) auto index = next_light_down(); if (index < 0) break; - List.at(index)->Message2(MessageCode::TLightTurnOff, 0.0); + List.at(index)->Message(MessageCode::TLightTurnOff, 0.0); if (MessageField2 != MessageCode::TLightGroupNull) start_animation(); return 1; @@ -263,7 +263,7 @@ int TLightGroup::Message2(MessageCode code, float value) Timer = 0; if (MessageField2 == MessageCode::TLightGroupAnimationBackward || MessageField2 == MessageCode::TLightGroupAnimationForward || MessageField2 == MessageCode::TLightGroupLightShowAnimation) - TLightGroup::Message2(MessageCode::TLightResetTimed, 0.0); + TLightGroup::Message(MessageCode::TLightResetTimed, 0.0); MessageField2 = MessageCode::TLightGroupNull; AnimationFlag = 0; break; @@ -275,7 +275,7 @@ int TLightGroup::Message2(MessageCode code, float value) break; auto light = List.at(index); - light->Message2(MessageCode::TLightTurnOn, 0.0); + light->Message(MessageCode::TLightTurnOn, 0.0); if (MessageField2 != MessageCode::TLightGroupNull) start_animation(); break; @@ -287,7 +287,7 @@ int TLightGroup::Message2(MessageCode code, float value) break; auto light = List.at(index); - light->Message2(MessageCode::TLightTurnOff, 0.0); + light->Message(MessageCode::TLightTurnOff, 0.0); if (MessageField2 != MessageCode::TLightGroupNull) start_animation(); break; @@ -314,8 +314,8 @@ int TLightGroup::Message2(MessageCode code, float value) if (index < 0) break; if (MessageField2 != MessageCode::TLightGroupNull || AnimationFlag) - TLightGroup::Message2(MessageCode::TLightGroupReset, 0.0); - List.at(index)->Message2(MessageCode::TLightFlasherStartTimedThenStayOn, value); + TLightGroup::Message(MessageCode::TLightGroupReset, 0.0); + List.at(index)->Message(MessageCode::TLightFlasherStartTimedThenStayOn, value); return 1; } case MessageCode::TLightGroupResetAndTurnOff: @@ -324,8 +324,8 @@ int TLightGroup::Message2(MessageCode code, float value) if (index < 0) break; if (MessageField2 != MessageCode::TLightGroupNull || AnimationFlag) - TLightGroup::Message2(MessageCode::TLightGroupReset, 0.0); - List.at(index)->Message2(MessageCode::TLightFlasherStartTimedThenStayOff, value); + TLightGroup::Message(MessageCode::TLightGroupReset, 0.0); + List.at(index)->Message(MessageCode::TLightFlasherStartTimedThenStayOff, value); return 1; } case MessageCode::TLightGroupRestartNotifyTimer: @@ -342,8 +342,8 @@ int TLightGroup::Message2(MessageCode code, float value) auto light = *it; if (light->LightOnFlag) { - light->Message2(MessageCode::TLightTurnOff, 0.0); - light->Message2(MessageCode::TLightFlasherStartTimedThenStayOff, value); + light->Message(MessageCode::TLightTurnOff, 0.0); + light->Message(MessageCode::TLightFlasherStartTimedThenStayOff, value); } } @@ -358,13 +358,13 @@ int TLightGroup::Message2(MessageCode code, float value) // Turn off lights (index, end] for (auto i = count - 1; i > index; i--) { - List.at(i)->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + List.at(i)->Message(MessageCode::TLightResetAndTurnOff, 0.0); } // Turn on lights [begin, index] for (auto i = index; i >= 0; i--) { - List.at(i)->Message2(MessageCode::TLightResetAndTurnOn, 0.0); + List.at(i)->Message(MessageCode::TLightResetAndTurnOn, 0.0); } } break; @@ -374,14 +374,14 @@ int TLightGroup::Message2(MessageCode code, float value) auto index = next_light_down(); if (index >= 0) { - List.at(index)->Message2(MessageCode::TLightFlasherStart, 0.0); + List.at(index)->Message(MessageCode::TLightFlasherStart, 0.0); } break; } default: for (auto it = List.rbegin(); it != List.rend(); ++it) { - (*it)->Message2(code, value); + (*it)->Message(code, value); } break; } @@ -423,9 +423,9 @@ void TLightGroup::start_animation() { auto light = *it; if (light->LightOnFlag) - light->Message2(MessageCode::TLightTurnOnTimed, 0.0); + light->Message(MessageCode::TLightTurnOnTimed, 0.0); else - light->Message2(MessageCode::TLightTurnOffTimed, 0.0); + light->Message(MessageCode::TLightTurnOffTimed, 0.0); } } @@ -453,7 +453,7 @@ void TLightGroup::TimerExpired(int timerId, void* caller) { auto group = static_cast(caller); group->Timer = 0; - group->Message2(group->MessageField2, group->Timer1Time); + group->Message(group->MessageField2, group->Timer1Time); } void TLightGroup::NotifyTimerExpired(int timerId, void* caller) diff --git a/SpaceCadetPinball/TLightGroup.h b/SpaceCadetPinball/TLightGroup.h index 44fb30b..17449a0 100644 --- a/SpaceCadetPinball/TLightGroup.h +++ b/SpaceCadetPinball/TLightGroup.h @@ -14,12 +14,12 @@ struct TLightGroup_player_backup class TLightGroup : - public TPinballComponent2 + public TPinballComponent { public: TLightGroup(TPinballTable* table, int groupIndex); ~TLightGroup() override = default; - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; virtual void Reset(); void reschedule_animation(float time); void start_animation(); diff --git a/SpaceCadetPinball/TLightRollover.cpp b/SpaceCadetPinball/TLightRollover.cpp index aa99cba..10806f2 100644 --- a/SpaceCadetPinball/TLightRollover.cpp +++ b/SpaceCadetPinball/TLightRollover.cpp @@ -19,7 +19,7 @@ TLightRollover::TLightRollover(TPinballTable* table, int groupIndex) : TRollover FloatArr = *loader::query_float_attribute(groupIndex, 0, 407); } -int TLightRollover::Message2(MessageCode code, float value) +int TLightRollover::Message(MessageCode code, float value) { if (code == MessageCode::Reset) { diff --git a/SpaceCadetPinball/TLightRollover.h b/SpaceCadetPinball/TLightRollover.h index 5ebd770..624e3a0 100644 --- a/SpaceCadetPinball/TLightRollover.h +++ b/SpaceCadetPinball/TLightRollover.h @@ -7,7 +7,7 @@ class TLightRollover : public: TLightRollover(TPinballTable* table, int groupIndex); ~TLightRollover() override = default; - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void Collision(TBall* ball, vector2* nextPosition, vector2* direction, float distance, TEdgeSegment* edge) override; diff --git a/SpaceCadetPinball/TPinballComponent.cpp b/SpaceCadetPinball/TPinballComponent.cpp index bd36214..0d2dfdf 100644 --- a/SpaceCadetPinball/TPinballComponent.cpp +++ b/SpaceCadetPinball/TPinballComponent.cpp @@ -105,10 +105,10 @@ TPinballComponent::~TPinballComponent() } -int TPinballComponent::Message(int code, float value) +int TPinballComponent::Message(MessageCode code, float value) { - MessageField = code; - if (code == ~MessageCode::Reset) + MessageField = ~code; + if (code == MessageCode::Reset) MessageField = 0; return 0; } diff --git a/SpaceCadetPinball/TPinballComponent.h b/SpaceCadetPinball/TPinballComponent.h index c6dfd3a..baf3040 100644 --- a/SpaceCadetPinball/TPinballComponent.h +++ b/SpaceCadetPinball/TPinballComponent.h @@ -122,13 +122,6 @@ constexpr typename std::enable_if::value, X>::type operator~(T v { return static_cast(value); } -#if defined(__GNUC__) || defined(__clang__) -#define DEPRECATED __attribute__((deprecated)) -#elif defined(_MSC_VER) -#define DEPRECATED __declspec(deprecated) -#else -#define DEPRECATED -#endif class TPinballComponent @@ -136,11 +129,7 @@ class TPinballComponent public: TPinballComponent(TPinballTable* table, int groupIndex, bool loadVisuals); virtual ~TPinballComponent(); - virtual int Message(int code, float value); - virtual int Message2(MessageCode code, float value) - { - return Message(~code, value); - } + virtual int Message(MessageCode code, float value); virtual void port_draw(); int get_scoring(unsigned int index) const; virtual vector2 get_coordinates(); @@ -159,18 +148,3 @@ private: float VisualPosNormX; float VisualPosNormY; }; - - -class TPinballComponent2 : public TPinballComponent -{ -public: - TPinballComponent2(TPinballTable* table, int group_index, bool load_visuals) - : TPinballComponent(table, group_index, load_visuals) - { - } - - DEPRECATED int Message(int code, float value) override - { - return Message2(static_cast(code), value); - } -}; diff --git a/SpaceCadetPinball/TPinballTable.cpp b/SpaceCadetPinball/TPinballTable.cpp index b2b69ec..d4cad28 100644 --- a/SpaceCadetPinball/TPinballTable.cpp +++ b/SpaceCadetPinball/TPinballTable.cpp @@ -42,7 +42,7 @@ int TPinballTable::score_multipliers[5] = {1, 2, 3, 5, 10}; -TPinballTable::TPinballTable(): TPinballComponent2(nullptr, -1, false) +TPinballTable::TPinballTable(): TPinballComponent(nullptr, -1, false) { int shortArrLength; @@ -297,9 +297,9 @@ void TPinballTable::tilt(float time) for (auto component : ComponentList) { - component->Message2(MessageCode::SetTiltLock, time); + component->Message(MessageCode::SetTiltLock, time); } - LightGroup->Message2(MessageCode::TLightTurnOffTimed, 0); + LightGroup->Message(MessageCode::TLightTurnOffTimed, 0); TiltLockFlag = 1; control::table_control_handler(1011); } @@ -314,7 +314,7 @@ void TPinballTable::port_draw() } } -int TPinballTable::Message2(MessageCode code, float value) +int TPinballTable::Message(MessageCode code, float value) { const char* rc_text; @@ -323,41 +323,41 @@ int TPinballTable::Message2(MessageCode code, float value) case MessageCode::LeftFlipperInputPressed: if (!TiltLockFlag) { - FlipperL->Message2(MessageCode::TFlipperExtend, value); + FlipperL->Message(MessageCode::TFlipperExtend, value); } break; case MessageCode::LeftFlipperInputReleased: if (!TiltLockFlag) { - FlipperL->Message2(MessageCode::TFlipperRetract, value); + FlipperL->Message(MessageCode::TFlipperRetract, value); } break; case MessageCode::RightFlipperInputPressed: if (!TiltLockFlag) { - FlipperR->Message2(MessageCode::TFlipperExtend, value); + FlipperR->Message(MessageCode::TFlipperExtend, value); } break; case MessageCode::RightFlipperInputReleased: if (!TiltLockFlag) { - FlipperR->Message2(MessageCode::TFlipperRetract, value); + FlipperR->Message(MessageCode::TFlipperRetract, value); } break; case MessageCode::PlungerInputPressed: case MessageCode::PlungerInputReleased: - Plunger->Message2(code, value); + Plunger->Message(code, value); break; case MessageCode::Pause: case MessageCode::Resume: case MessageCode::LooseFocus: for (auto component : ComponentList) { - component->Message2(code, value); + component->Message(code, value); } break; case MessageCode::ClearTiltLock: - LightGroup->Message2(MessageCode::TLightResetTimed, 0.0); + LightGroup->Message(MessageCode::TLightResetTimed, 0.0); if (TiltLockFlag) { TiltLockFlag = 0; @@ -367,16 +367,16 @@ int TPinballTable::Message2(MessageCode code, float value) } break; case MessageCode::StartGamePlayer1: - LightGroup->Message2(MessageCode::TLightGroupReset, 0.0); - LightGroup->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - Plunger->Message2(MessageCode::PlungerStartFeedTimer, 0.0); + LightGroup->Message(MessageCode::TLightGroupReset, 0.0); + LightGroup->Message(MessageCode::TLightResetAndTurnOff, 0.0); + Plunger->Message(MessageCode::PlungerStartFeedTimer, 0.0); if (Demo && Demo->ActiveFlag) rc_text = pb::get_rc_string(Msg::STRING131); else rc_text = pb::get_rc_string(Msg::STRING127); pb::InfoTextBox->Display(rc_text, -1.0); if (Demo) - Demo->Message2(MessageCode::NewGame, 0.0); + Demo->Message(MessageCode::NewGame, 0.0); break; case MessageCode::NewGame: if (EndGameTimeoutTimer) @@ -389,12 +389,12 @@ int TPinballTable::Message2(MessageCode code, float value) { timer::kill(LightShowTimer); LightShowTimer = 0; - Message2(MessageCode::StartGamePlayer1, 0.0); + Message(MessageCode::StartGamePlayer1, 0.0); } else { CheatsUsed = 0; - Message2(MessageCode::Reset, 0.0); + Message(MessageCode::Reset, 0.0); auto ball = BallList[0]; ball->Position.Y = 0.0; ball->Position.X = 0.0; @@ -446,7 +446,7 @@ int TPinballTable::Message2(MessageCode code, float value) UnknownP71 = 0; pb::InfoTextBox->Clear(); pb::MissTextBox->Clear(); - LightGroup->Message2(MessageCode::TLightGroupLightShowAnimation, 0.2f); + LightGroup->Message(MessageCode::TLightGroupLightShowAnimation, 0.2f); auto time = loader::play_sound(SoundIndex1, nullptr, "TPinballTable2"); if (time < 0) time = 5.0f; @@ -506,7 +506,7 @@ int TPinballTable::Message2(MessageCode code, float value) for (auto component : ComponentList) { - component->Message2(MessageCode::PlayerChanged, static_cast(nextPlayer)); + component->Message(MessageCode::PlayerChanged, static_cast(nextPlayer)); } const char* textboxText = nullptr; @@ -557,7 +557,7 @@ int TPinballTable::Message2(MessageCode code, float value) case MessageCode::Reset: for (auto component : ComponentList) { - component->Message2(MessageCode::Reset, 0); + component->Message(MessageCode::Reset, 0); } if (ReplayTimer) timer::kill(ReplayTimer); @@ -565,7 +565,7 @@ int TPinballTable::Message2(MessageCode code, float value) if (LightShowTimer) { timer::kill(LightShowTimer); - LightGroup->Message2(MessageCode::TLightGroupReset, 0.0); + LightGroup->Message(MessageCode::TLightGroupReset, 0.0); } LightShowTimer = 0; ScoreMultiplier = 0; @@ -658,10 +658,10 @@ void TPinballTable::EndGame_timeout(int timerId, void* caller) for (auto component : table->ComponentList) { - component->Message2(MessageCode::GameOver, 0); + component->Message(MessageCode::GameOver, 0); } if (table->Demo) - table->Demo->Message2(MessageCode::GameOver, 0.0); + table->Demo->Message(MessageCode::GameOver, 0.0); control::handler(67, pb::MissTextBox); pb::InfoTextBox->Display(pb::get_rc_string(Msg::STRING125), -1.0); } @@ -670,7 +670,7 @@ void TPinballTable::LightShow_timeout(int timerId, void* caller) { auto table = static_cast(caller); table->LightShowTimer = 0; - table->Message2(MessageCode::StartGamePlayer1, 0.0); + table->Message(MessageCode::StartGamePlayer1, 0.0); } void TPinballTable::replay_timer_callback(int timerId, void* caller) diff --git a/SpaceCadetPinball/TPinballTable.h b/SpaceCadetPinball/TPinballTable.h index ec25efb..190f334 100644 --- a/SpaceCadetPinball/TPinballTable.h +++ b/SpaceCadetPinball/TPinballTable.h @@ -23,7 +23,7 @@ struct score_struct_super }; -class TPinballTable : public TPinballComponent2 +class TPinballTable : public TPinballComponent { public: TPinballTable(); @@ -34,7 +34,7 @@ public: void ChangeBallCount(int count); void tilt(float time); void port_draw() override; - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; TBall* AddBall(float x, float y); int BallCountInRect(const RectF& rect); diff --git a/SpaceCadetPinball/TPlunger.cpp b/SpaceCadetPinball/TPlunger.cpp index 35a79cf..9a2f997 100644 --- a/SpaceCadetPinball/TPlunger.cpp +++ b/SpaceCadetPinball/TPlunger.cpp @@ -11,7 +11,7 @@ #include "timer.h" #include "TPinballTable.h" -TPlunger::TPlunger(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, groupIndex, true) +TPlunger::TPlunger(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { visualStruct visual{}; @@ -47,7 +47,7 @@ void TPlunger::Collision(TBall* ball, vector2* nextPosition, vector2* direction, maths::basic_collision(ball, nextPosition, direction, Elasticity, Smoothness, 0, boost); if (SomeCounter) SomeCounter--; - Message2(MessageCode::PlungerInputReleased, 0.0); + Message(MessageCode::PlungerInputReleased, 0.0); } else { @@ -56,7 +56,7 @@ void TPlunger::Collision(TBall* ball, vector2* nextPosition, vector2* direction, } } -int TPlunger::Message2(MessageCode code, float value) +int TPlunger::Message(MessageCode code, float value) { switch (code) { @@ -98,7 +98,7 @@ int TPlunger::Message2(MessageCode code, float value) case MessageCode::PlungerLaunchBall: PullbackStartedFlag = true; Boost = MaxPullback; - Message2(MessageCode::PlungerInputReleased, 0.0f); + Message(MessageCode::PlungerInputReleased, 0.0f); break; case MessageCode::PlungerRelaunchBall: SomeCounter++; @@ -175,7 +175,7 @@ int TPlunger::Message2(MessageCode code, float value) void TPlunger::BallFeedTimer(int timerId, void* caller) { auto plunger = static_cast(caller); - plunger->Message2(MessageCode::PlungerFeedBall, 0.0); + plunger->Message(MessageCode::PlungerFeedBall, 0.0); } void TPlunger::PullbackTimer(int timerId, void* caller) diff --git a/SpaceCadetPinball/TPlunger.h b/SpaceCadetPinball/TPlunger.h index 31055dd..86f1eec 100644 --- a/SpaceCadetPinball/TPlunger.h +++ b/SpaceCadetPinball/TPlunger.h @@ -2,14 +2,14 @@ #include "TCollisionComponent.h" class TPlunger : - public TCollisionComponent2 + public TCollisionComponent { public: TPlunger(TPinballTable* table, int groupIndex); ~TPlunger() override = default; void Collision(TBall* ball, vector2* nextPosition, vector2* direction, float distance, TEdgeSegment* edge) override; - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; static void BallFeedTimer(int timerId, void* caller); static void PullbackTimer(int timerId, void* caller); diff --git a/SpaceCadetPinball/TPopupTarget.cpp b/SpaceCadetPinball/TPopupTarget.cpp index a5508c6..8547013 100644 --- a/SpaceCadetPinball/TPopupTarget.cpp +++ b/SpaceCadetPinball/TPopupTarget.cpp @@ -8,13 +8,13 @@ #include "timer.h" #include "TPinballTable.h" -TPopupTarget::TPopupTarget(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, groupIndex, true) +TPopupTarget::TPopupTarget(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { Timer = 0; TimerTime = *loader::query_float_attribute(groupIndex, 0, 407); } -int TPopupTarget::Message2(MessageCode code, float value) +int TPopupTarget::Message(MessageCode code, float value) { switch (code) { @@ -28,7 +28,7 @@ int TPopupTarget::Message2(MessageCode code, float value) case MessageCode::PlayerChanged: PlayerMessagefieldBackup[PinballTable->CurrentPlayer] = MessageField; MessageField = PlayerMessagefieldBackup[static_cast(floor(value))]; - TPopupTarget::Message2(MessageField ? MessageCode::TPopupTargetDisable : MessageCode::TPopupTargetEnable, 0.0); + TPopupTarget::Message(MessageField ? MessageCode::TPopupTargetDisable : MessageCode::TPopupTargetEnable, 0.0); break; case MessageCode::Reset: { @@ -69,7 +69,7 @@ void TPopupTarget::Collision(TBall* ball, vector2* nextPosition, vector2* direct { if (HardHitSoundId) loader::play_sound(HardHitSoundId, this, "TPopupTarget1"); - Message2(MessageCode::TPopupTargetDisable, 0.0); + Message(MessageCode::TPopupTargetDisable, 0.0); control::handler(63, this); } } diff --git a/SpaceCadetPinball/TPopupTarget.h b/SpaceCadetPinball/TPopupTarget.h index 9274c3c..85fa159 100644 --- a/SpaceCadetPinball/TPopupTarget.h +++ b/SpaceCadetPinball/TPopupTarget.h @@ -2,11 +2,11 @@ #include "TCollisionComponent.h" class TPopupTarget : - public TCollisionComponent2 + public TCollisionComponent { public: TPopupTarget(TPinballTable* table, int groupIndex); - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void Collision(TBall* ball, vector2* nextPosition, vector2* direction, float distance, TEdgeSegment* edge) override; diff --git a/SpaceCadetPinball/TRollover.cpp b/SpaceCadetPinball/TRollover.cpp index 0983ce6..6e3220e 100644 --- a/SpaceCadetPinball/TRollover.cpp +++ b/SpaceCadetPinball/TRollover.cpp @@ -11,13 +11,13 @@ #include "timer.h" #include "TPinballTable.h" -TRollover::TRollover(TPinballTable* table, int groupIndex, bool createWall) : TCollisionComponent2( +TRollover::TRollover(TPinballTable* table, int groupIndex, bool createWall) : TCollisionComponent( table, groupIndex, createWall) { } -TRollover::TRollover(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, groupIndex, false) +TRollover::TRollover(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, false) { if (ListBitmap) render::sprite_set_bitmap(RenderSprite, ListBitmap->at(0)); @@ -25,7 +25,7 @@ TRollover::TRollover(TPinballTable* table, int groupIndex) : TCollisionComponent } -int TRollover::Message2(MessageCode code, float value) +int TRollover::Message(MessageCode code, float value) { if (code == MessageCode::Reset) { diff --git a/SpaceCadetPinball/TRollover.h b/SpaceCadetPinball/TRollover.h index 273e4cd..a9e3c22 100644 --- a/SpaceCadetPinball/TRollover.h +++ b/SpaceCadetPinball/TRollover.h @@ -2,14 +2,14 @@ #include "TCollisionComponent.h" class TRollover : - public TCollisionComponent2 + public TCollisionComponent { protected: TRollover(TPinballTable* table, int groupIndex, bool createWall); public: TRollover(TPinballTable* table, int groupIndex); ~TRollover() override = default; - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void Collision(TBall* ball, vector2* nextPosition, vector2* direction, float distance, TEdgeSegment* edge) override; void build_walls(int groupIndex); diff --git a/SpaceCadetPinball/TSink.cpp b/SpaceCadetPinball/TSink.cpp index b29647b..68811e9 100644 --- a/SpaceCadetPinball/TSink.cpp +++ b/SpaceCadetPinball/TSink.cpp @@ -9,7 +9,7 @@ #include "TBall.h" #include "timer.h" -TSink::TSink(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, groupIndex, true) +TSink::TSink(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { visualStruct visual{}; @@ -27,7 +27,7 @@ TSink::TSink(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, TimerTime = *loader::query_float_attribute(groupIndex, 0, 407); } -int TSink::Message2(MessageCode code, float value) +int TSink::Message(MessageCode code, float value) { switch (code) { diff --git a/SpaceCadetPinball/TSink.h b/SpaceCadetPinball/TSink.h index 7dc0d33..d461fca 100644 --- a/SpaceCadetPinball/TSink.h +++ b/SpaceCadetPinball/TSink.h @@ -3,11 +3,11 @@ #include "TCollisionComponent.h" class TSink : - public TCollisionComponent2 + public TCollisionComponent { public: TSink(TPinballTable* table, int groupIndex); - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void Collision(TBall* ball, vector2* nextPosition, vector2* direction, float distance, TEdgeSegment* edge) override; diff --git a/SpaceCadetPinball/TSoloTarget.cpp b/SpaceCadetPinball/TSoloTarget.cpp index c44cf18..d22bde1 100644 --- a/SpaceCadetPinball/TSoloTarget.cpp +++ b/SpaceCadetPinball/TSoloTarget.cpp @@ -8,7 +8,7 @@ #include "timer.h" #include "TPinballTable.h" -TSoloTarget::TSoloTarget(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, groupIndex, true) +TSoloTarget::TSoloTarget(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { visualStruct visual{}; @@ -16,10 +16,10 @@ TSoloTarget::TSoloTarget(TPinballTable* table, int groupIndex) : TCollisionCompo TimerTime = 0.1f; loader::query_visual(groupIndex, 0, &visual); SoundIndex4 = visual.SoundIndex4; - TSoloTarget::Message2(MessageCode::TSoloTargetEnable, 0.0); + TSoloTarget::Message(MessageCode::TSoloTargetEnable, 0.0); } -int TSoloTarget::Message2(MessageCode code, float value) +int TSoloTarget::Message(MessageCode code, float value) { switch (code) { @@ -58,7 +58,7 @@ void TSoloTarget::Collision(TBall* ball, vector2* nextPosition, vector2* directi { if (DefaultCollision(ball, nextPosition, direction)) { - Message2(MessageCode::TSoloTargetDisable, 0.0); + Message(MessageCode::TSoloTargetDisable, 0.0); Timer = timer::set(TimerTime, this, TimerExpired); control::handler(63, this); } @@ -67,6 +67,6 @@ void TSoloTarget::Collision(TBall* ball, vector2* nextPosition, vector2* directi void TSoloTarget::TimerExpired(int timerId, void* caller) { auto target = static_cast(caller); - target->Message2(MessageCode::TSoloTargetEnable, 0.0); + target->Message(MessageCode::TSoloTargetEnable, 0.0); target->Timer = 0; } diff --git a/SpaceCadetPinball/TSoloTarget.h b/SpaceCadetPinball/TSoloTarget.h index d1653f1..6cdf168 100644 --- a/SpaceCadetPinball/TSoloTarget.h +++ b/SpaceCadetPinball/TSoloTarget.h @@ -2,11 +2,11 @@ #include "TCollisionComponent.h" class TSoloTarget : - public TCollisionComponent2 + public TCollisionComponent { public: TSoloTarget(TPinballTable* table, int groupIndex); - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void Collision(TBall* ball, vector2* nextPosition, vector2* direction, float distance, TEdgeSegment* edge) override; diff --git a/SpaceCadetPinball/TTextBox.cpp b/SpaceCadetPinball/TTextBox.cpp index 738d24c..0a53fa1 100644 --- a/SpaceCadetPinball/TTextBox.cpp +++ b/SpaceCadetPinball/TTextBox.cpp @@ -10,7 +10,7 @@ #include "timer.h" -TTextBox::TTextBox(TPinballTable* table, int groupIndex) : TPinballComponent2(table, groupIndex, true) +TTextBox::TTextBox(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, true) { OffsetX = 0; OffsetY = 0; @@ -51,7 +51,7 @@ TTextBox::~TTextBox() } } -int TTextBox::Message2(MessageCode code, float value) +int TTextBox::Message(MessageCode code, float value) { return 0; } diff --git a/SpaceCadetPinball/TTextBox.h b/SpaceCadetPinball/TTextBox.h index c316074..5970ed9 100644 --- a/SpaceCadetPinball/TTextBox.h +++ b/SpaceCadetPinball/TTextBox.h @@ -4,7 +4,7 @@ #include "TTextBoxMessage.h" class TTextBox : - public TPinballComponent2 + public TPinballComponent { public: int OffsetX; @@ -19,7 +19,7 @@ public: TTextBox(TPinballTable* table, int groupIndex); ~TTextBox() override; - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void Clear(); void Display(const char* text, float time); void DrawImGui(); diff --git a/SpaceCadetPinball/TTimer.cpp b/SpaceCadetPinball/TTimer.cpp index 52b2f1c..e1d8d9f 100644 --- a/SpaceCadetPinball/TTimer.cpp +++ b/SpaceCadetPinball/TTimer.cpp @@ -4,12 +4,12 @@ #include "control.h" #include "timer.h" -TTimer::TTimer(TPinballTable* table, int groupIndex) : TPinballComponent2(table, groupIndex, true) +TTimer::TTimer(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, true) { Timer = 0; } -int TTimer::Message2(MessageCode code, float value) +int TTimer::Message(MessageCode code, float value) { switch (code) { diff --git a/SpaceCadetPinball/TTimer.h b/SpaceCadetPinball/TTimer.h index 8e5471b..97daa9b 100644 --- a/SpaceCadetPinball/TTimer.h +++ b/SpaceCadetPinball/TTimer.h @@ -2,11 +2,11 @@ #include "TPinballComponent.h" class TTimer : - public TPinballComponent2 + public TPinballComponent { public: TTimer(TPinballTable* table, int groupIndex); - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; static void TimerExpired(int timerId, void* caller); int Timer; diff --git a/SpaceCadetPinball/TWall.cpp b/SpaceCadetPinball/TWall.cpp index fec1dd5..7959a78 100644 --- a/SpaceCadetPinball/TWall.cpp +++ b/SpaceCadetPinball/TWall.cpp @@ -6,7 +6,7 @@ #include "render.h" #include "timer.h" -TWall::TWall(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, groupIndex, true) +TWall::TWall(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { if (RenderSprite) render::sprite_set_bitmap(RenderSprite, nullptr); @@ -14,7 +14,7 @@ TWall::TWall(TPinballTable* table, int groupIndex) : TCollisionComponent2(table, BmpPtr = ListBitmap->at(0); } -int TWall::Message2(MessageCode code, float value) +int TWall::Message(MessageCode code, float value) { if (code == MessageCode::Reset && Timer) { diff --git a/SpaceCadetPinball/TWall.h b/SpaceCadetPinball/TWall.h index c6d4253..a629abc 100644 --- a/SpaceCadetPinball/TWall.h +++ b/SpaceCadetPinball/TWall.h @@ -5,11 +5,11 @@ struct gdrv_bitmap8; class TWall : - public TCollisionComponent2 + public TCollisionComponent { public: TWall(TPinballTable* table, int groupIndex); - int Message2(MessageCode code, float value) override; + int Message(MessageCode code, float value) override; void Collision(TBall* ball, vector2* nextPosition, vector2* direction, float distance, TEdgeSegment* edge) override; diff --git a/SpaceCadetPinball/control.cpp b/SpaceCadetPinball/control.cpp index 8f31c56..4074c15 100644 --- a/SpaceCadetPinball/control.cpp +++ b/SpaceCadetPinball/control.cpp @@ -966,29 +966,29 @@ void control::table_add_extra_ball(float count) void control::table_set_bonus_hold() { - lite58->Message2(MessageCode::TLightResetAndTurnOn, 0.0); + lite58->Message(MessageCode::TLightResetAndTurnOn, 0.0); info_text_box->Display(pb::get_rc_string(Msg::STRING153), 2.0); } void control::table_set_bonus() { TableG->ScoreSpecial2Flag = 1; - lite59->Message2(MessageCode::TLightTurnOnTimed, 60.0); + lite59->Message(MessageCode::TLightTurnOnTimed, 60.0); info_text_box->Display(pb::get_rc_string(Msg::STRING105), 2.0); } void control::table_set_jackpot() { TableG->ScoreSpecial3Flag = 1; - lite60->Message2(MessageCode::TLightTurnOnTimed, 60.0); + lite60->Message(MessageCode::TLightTurnOnTimed, 60.0); info_text_box->Display(pb::get_rc_string(Msg::STRING116), 2.0); } void control::table_set_flag_lights() { - lite20->Message2(MessageCode::TLightTurnOnTimed, 60.0); - lite19->Message2(MessageCode::TLightTurnOnTimed, 60.0); - lite61->Message2(MessageCode::TLightTurnOnTimed, 60.0); + lite20->Message(MessageCode::TLightTurnOnTimed, 60.0); + lite19->Message(MessageCode::TLightTurnOnTimed, 60.0); + lite61->Message(MessageCode::TLightTurnOnTimed, 60.0); info_text_box->Display(pb::get_rc_string(Msg::STRING152), 2.0); } @@ -997,12 +997,12 @@ void control::table_set_multiball(float time) if (TableG->MultiballCount <= 1) { TableG->MultiballCount += 3; - sink1->Message2(MessageCode::TSinkResetTimer, time); - sink2->Message2(MessageCode::TSinkResetTimer, time); - sink3->Message2(MessageCode::TSinkResetTimer, time); - lite38->Message2(MessageCode::TLightFlasherStartTimed, -1.0f); - lite39->Message2(MessageCode::TLightFlasherStartTimed, -1.0f); - lite40->Message2(MessageCode::TLightFlasherStartTimed, -1.0f); + sink1->Message(MessageCode::TSinkResetTimer, time); + sink2->Message(MessageCode::TSinkResetTimer, time); + sink3->Message(MessageCode::TSinkResetTimer, time); + lite38->Message(MessageCode::TLightFlasherStartTimed, -1.0f); + lite39->Message(MessageCode::TLightFlasherStartTimed, -1.0f); + lite40->Message(MessageCode::TLightFlasherStartTimed, -1.0f); info_text_box->Display(pb::get_rc_string(Msg::STRING117), 2.0); midi::play_track(MidiTracks::Track3, true); } @@ -1024,14 +1024,14 @@ void control::table_bump_ball_sink_lock() TableG->BallLockedCounter = TableG->BallLockedCounter + 1; soundwave44->Play(nullptr, "table_bump_ball_sink_lock"); info_text_box->Display(pb::get_rc_string(Msg::STRING102), 2.0); - TableG->Plunger->Message2(MessageCode::PlungerRelaunchBall, 2.0f); + TableG->Plunger->Message(MessageCode::PlungerRelaunchBall, 2.0f); } } } void control::table_set_replay(float value) { - lite199->Message2(MessageCode::TLightResetAndTurnOn, 0.0); + lite199->Message(MessageCode::TLightResetAndTurnOn, 0.0); info_text_box->Display(pb::get_rc_string(Msg::STRING101), value); } @@ -1039,10 +1039,10 @@ void control::cheat_bump_rank() { char Buffer[64]{}; - auto rank = middle_circle->Message2(MessageCode::TLightGroupGetOnCount, 0.0); + auto rank = middle_circle->Message(MessageCode::TLightGroupGetOnCount, 0.0); if (rank < 9) { - middle_circle->Message2(MessageCode::TLightGroupResetAndTurnOn, 2.0f); + middle_circle->Message(MessageCode::TLightGroupResetAndTurnOn, 2.0f); auto rankText = pb::get_rc_string(RankRcArray[rank]); snprintf(Buffer,sizeof Buffer, pb::get_rc_string(Msg::STRING184), rankText); mission_text_box->Display(Buffer, 8.0); @@ -1077,23 +1077,23 @@ int control::AddRankProgress(int rank) char Buffer[64]; int result = 0; - lite16->Message2(MessageCode::TLightResetAndTurnOn, 0.0); + lite16->Message(MessageCode::TLightResetAndTurnOn, 0.0); for (int index = rank; index; --index) { - outer_circle->Message2(MessageCode::TLightGroupResetAndTurnOn, 2.0); + outer_circle->Message(MessageCode::TLightGroupResetAndTurnOn, 2.0); } - int activeCount = outer_circle->Message2(MessageCode::TLightGroupGetOnCount, 0.0); - int totalCount = outer_circle->Message2(MessageCode::TLightGroupGetLightCount, 0.0); + int activeCount = outer_circle->Message(MessageCode::TLightGroupGetOnCount, 0.0); + int totalCount = outer_circle->Message(MessageCode::TLightGroupGetLightCount, 0.0); if (activeCount == totalCount) { result = 1; - outer_circle->Message2(MessageCode::TLightFlasherStartTimedThenStayOff, 5.0); - middle_circle->Message2(MessageCode::TLightGroupReset, 0.0); - int midActiveCount = middle_circle->Message2(MessageCode::TLightGroupGetOnCount, 0.0); + outer_circle->Message(MessageCode::TLightFlasherStartTimedThenStayOff, 5.0); + middle_circle->Message(MessageCode::TLightGroupReset, 0.0); + int midActiveCount = middle_circle->Message(MessageCode::TLightGroupGetOnCount, 0.0); if (midActiveCount < 9) { - middle_circle->Message2(MessageCode::TLightGroupResetAndTurnOn, 5.0); + middle_circle->Message(MessageCode::TLightGroupResetAndTurnOn, 5.0); auto rankText = pb::get_rc_string(RankRcArray[midActiveCount]); snprintf(Buffer, sizeof Buffer, pb::get_rc_string(Msg::STRING184), rankText); mission_text_box->Display(Buffer, 8.0); @@ -1102,7 +1102,7 @@ int control::AddRankProgress(int rank) } else if (activeCount >= 3 * totalCount / 4) { - middle_circle->Message2(MessageCode::TLightGroupAnimationForward, -1.0); + middle_circle->Message(MessageCode::TLightGroupAnimationForward, -1.0); } return result; } @@ -1122,12 +1122,12 @@ void control::AdvanceWormHoleDestination(int flag) val1 = 1; val2 = 1; } - bsink_arrow_lights->Message2(MessageCode::TLightSetMessageField, static_cast(val2)); - bsink_arrow_lights->Message2(MessageCode::TLightSetOnStateBmpIndex, static_cast(3 - val1)); + bsink_arrow_lights->Message(MessageCode::TLightSetMessageField, static_cast(val2)); + bsink_arrow_lights->Message(MessageCode::TLightSetOnStateBmpIndex, static_cast(3 - val1)); if (!light_on(&control_lite4_tag)) { - worm_hole_lights->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - bsink_arrow_lights->Message2(MessageCode::TLightResetAndTurnOn, 0.0); + worm_hole_lights->Message(MessageCode::TLightResetAndTurnOn, 0.0); + bsink_arrow_lights->Message(MessageCode::TLightResetAndTurnOn, 0.0); } } } @@ -1137,7 +1137,7 @@ void control::FlipperRebounderControl1(int code, TPinballComponent* caller) { if (code == 63) { - lite84->Message2(MessageCode::TLightTurnOnTimed, 0.1f); + lite84->Message(MessageCode::TLightTurnOnTimed, 0.1f); auto score = caller->get_scoring(0); TableG->AddScore(score); } @@ -1147,7 +1147,7 @@ void control::FlipperRebounderControl2(int code, TPinballComponent* caller) { if (code == 63) { - lite85->Message2(MessageCode::TLightTurnOnTimed, 0.1f); + lite85->Message(MessageCode::TLightTurnOnTimed, 0.1f); int score = caller->get_scoring(0); TableG->AddScore(score); } @@ -1172,26 +1172,26 @@ void control::BumperControl(int code, TPinballComponent* caller) void control::LeftKickerControl(int code, TPinballComponent* caller) { if (code == 60) - gate1->Message2(MessageCode::TGateEnable, 0.0); + gate1->Message(MessageCode::TGateEnable, 0.0); } void control::RightKickerControl(int code, TPinballComponent* caller) { if (code == 60) - gate2->Message2(MessageCode::TGateEnable, 0.0); + gate2->Message(MessageCode::TGateEnable, 0.0); } void control::LeftKickerGateControl(int code, TPinballComponent* caller) { if (code == ~MessageCode::TGateDisable) { - lite30->Message2(MessageCode::TLightFlasherStartTimedThenStayOn, 5.0); - lite196->Message2(MessageCode::TLightFlasherStartTimed, 5.0); + lite30->Message(MessageCode::TLightFlasherStartTimedThenStayOn, 5.0); + lite196->Message(MessageCode::TLightFlasherStartTimed, 5.0); } else if (code == ~MessageCode::TGateEnable) { - lite30->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite196->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite30->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite196->Message(MessageCode::TLightResetAndTurnOff, 0.0); } } @@ -1199,13 +1199,13 @@ void control::RightKickerGateControl(int code, TPinballComponent* caller) { if (code == ~MessageCode::TGateDisable) { - lite29->Message2(MessageCode::TLightFlasherStartTimedThenStayOn, 5.0); - lite195->Message2(MessageCode::TLightFlasherStartTimed, 5.0); + lite29->Message(MessageCode::TLightFlasherStartTimedThenStayOn, 5.0); + lite195->Message(MessageCode::TLightFlasherStartTimed, 5.0); } else if (code == ~MessageCode::TGateEnable) { - lite29->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite195->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite29->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite195->Message(MessageCode::TLightResetAndTurnOff, 0.0); } } @@ -1214,7 +1214,7 @@ void control::DeploymentChuteToEscapeChuteOneWayControl(int code, TPinballCompon char Buffer[64]; if (code == 63) { - int count = skill_shot_lights->Message2(MessageCode::TLightGroupGetOnCount, 0.0); + int count = skill_shot_lights->Message(MessageCode::TLightGroupGetOnCount, 0.0); if (count) { soundwave3->Play(nullptr, "DeploymentChuteToEscapeChuteOneWayControl"); @@ -1223,12 +1223,12 @@ void control::DeploymentChuteToEscapeChuteOneWayControl(int code, TPinballCompon info_text_box->Display(Buffer, 2.0); if (!light_on(&control_lite56_tag)) { - l_trek_lights->Message2(MessageCode::TLightGroupReset, 0.0); - l_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - r_trek_lights->Message2(MessageCode::TLightGroupReset, 0.0); - r_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + l_trek_lights->Message(MessageCode::TLightGroupReset, 0.0); + l_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + r_trek_lights->Message(MessageCode::TLightGroupReset, 0.0); + r_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); } - skill_shot_lights->Message2(MessageCode::TLightGroupFlashWhenOn, 1.0); + skill_shot_lights->Message(MessageCode::TLightGroupFlashWhenOn, 1.0); } } } @@ -1236,7 +1236,7 @@ void control::DeploymentChuteToEscapeChuteOneWayControl(int code, TPinballCompon void control::DeploymentChuteToTableOneWayControl(int code, TPinballComponent* caller) { if (code == 63) - skill_shot_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + skill_shot_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); } void control::DrainBallBlockerControl(int code, TPinballComponent* caller) @@ -1249,7 +1249,7 @@ void control::DrainBallBlockerControl(int code, TPinballComponent* caller) { block->MessageField = 1; blockerDuration = static_cast(block->InitialDuration); - block->Message2(MessageCode::TBlockerEnable, blockerDuration); + block->Message(MessageCode::TBlockerEnable, blockerDuration); lightMessage = MessageCode::TLightTurnOnTimed; } else @@ -1259,15 +1259,15 @@ void control::DrainBallBlockerControl(int code, TPinballComponent* caller) if (block->MessageField != 1) { block->MessageField = 0; - block->Message2(MessageCode::TBlockerDisable, 0.0); + block->Message(MessageCode::TBlockerDisable, 0.0); return; } block->MessageField = 2; blockerDuration = static_cast(block->ExtendedDuration); - block->Message2(MessageCode::TBlockerRestartTimeout, blockerDuration); + block->Message(MessageCode::TBlockerRestartTimeout, blockerDuration); lightMessage = MessageCode::TLightFlasherStartTimed; } - lite1->Message2(lightMessage, blockerDuration); + lite1->Message(lightMessage, blockerDuration); } void control::LaunchRampControl(int code, TPinballComponent* caller) @@ -1316,15 +1316,15 @@ void control::LaunchRampControl(int code, TPinballComponent* caller) void control::LaunchRampHoleControl(int code, TPinballComponent* caller) { if (code == 58) - lite54->Message2(MessageCode::TLightFlasherStartTimed, 5.0); + lite54->Message(MessageCode::TLightFlasherStartTimed, 5.0); } void control::SpaceWarpRolloverControl(int code, TPinballComponent* caller) { if (code == 63) { - lite27->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - lite28->Message2(MessageCode::TLightResetAndTurnOn, 0.0); + lite27->Message(MessageCode::TLightResetAndTurnOn, 0.0); + lite28->Message(MessageCode::TLightResetAndTurnOn, 0.0); } } @@ -1332,12 +1332,12 @@ void control::ReentryLanesRolloverControl(int code, TPinballComponent* caller) { if (code == 63) { - if (!light_on(&control_lite56_tag) && l_trek_lights->Message2(MessageCode::TLightGroupGetMessage2, 0.0)) + if (!light_on(&control_lite56_tag) && l_trek_lights->Message(MessageCode::TLightGroupGetMessage2, 0.0)) { - l_trek_lights->Message2(MessageCode::TLightGroupReset, 0.0); - l_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - r_trek_lights->Message2(MessageCode::TLightGroupReset, 0.0); - r_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + l_trek_lights->Message(MessageCode::TLightGroupReset, 0.0); + l_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + r_trek_lights->Message(MessageCode::TLightGroupReset, 0.0); + r_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); } TLight* light; @@ -1355,22 +1355,22 @@ void control::ReentryLanesRolloverControl(int code, TPinballComponent* caller) { if (light->LightOnFlag) { - light->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + light->Message(MessageCode::TLightResetAndTurnOff, 0.0); } else { - light->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - int activeCount = bmpr_inc_lights->Message2(MessageCode::TLightGroupGetOnCount, 0.0); - if (activeCount == bmpr_inc_lights->Message2(MessageCode::TLightGroupGetLightCount, 0.0)) + light->Message(MessageCode::TLightResetAndTurnOn, 0.0); + int activeCount = bmpr_inc_lights->Message(MessageCode::TLightGroupGetOnCount, 0.0); + if (activeCount == bmpr_inc_lights->Message(MessageCode::TLightGroupGetLightCount, 0.0)) { - bmpr_inc_lights->Message2(MessageCode::TLightFlasherStartTimed, 5.0); - bmpr_inc_lights->Message2(MessageCode::TLightTurnOff, 0.0); + bmpr_inc_lights->Message(MessageCode::TLightFlasherStartTimed, 5.0); + bmpr_inc_lights->Message(MessageCode::TLightTurnOff, 0.0); if (bump1->BmpIndex < 3) { - attack_bump->Message2(MessageCode::TBumperIncBmpIndex, 0.0); + attack_bump->Message(MessageCode::TBumperIncBmpIndex, 0.0); info_text_box->Display(pb::get_rc_string(Msg::STRING106), 2.0); } - attack_bump->Message2(MessageCode::TComponentGroupResetNotifyTimer, 60.0); + attack_bump->Message(MessageCode::TComponentGroupResetNotifyTimer, 60.0); } } } @@ -1382,8 +1382,8 @@ void control::BumperGroupControl(int code, TPinballComponent* caller) { if (code == 61) { - caller->Message2(MessageCode::TComponentGroupResetNotifyTimer, 60.0); - caller->Message2(MessageCode::TBumperDecBmpIndex, 0.0); + caller->Message(MessageCode::TComponentGroupResetNotifyTimer, 60.0); + caller->Message(MessageCode::TBumperDecBmpIndex, 0.0); } } @@ -1407,22 +1407,22 @@ void control::LaunchLanesRolloverControl(int code, TPinballComponent* caller) { if (light->LightOnFlag) { - light->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + light->Message(MessageCode::TLightResetAndTurnOff, 0.0); } else { - light->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - int msg1 = ramp_bmpr_inc_lights->Message2(MessageCode::TLightGroupGetOnCount, 0.0); - if (msg1 == ramp_bmpr_inc_lights->Message2(MessageCode::TLightGroupGetLightCount, 0.0)) + light->Message(MessageCode::TLightResetAndTurnOn, 0.0); + int msg1 = ramp_bmpr_inc_lights->Message(MessageCode::TLightGroupGetOnCount, 0.0); + if (msg1 == ramp_bmpr_inc_lights->Message(MessageCode::TLightGroupGetLightCount, 0.0)) { - ramp_bmpr_inc_lights->Message2(MessageCode::TLightFlasherStartTimed, 5.0); - ramp_bmpr_inc_lights->Message2(MessageCode::TLightTurnOff, 0.0); + ramp_bmpr_inc_lights->Message(MessageCode::TLightFlasherStartTimed, 5.0); + ramp_bmpr_inc_lights->Message(MessageCode::TLightTurnOff, 0.0); if (bump5->BmpIndex < 3) { - launch_bump->Message2(MessageCode::TBumperIncBmpIndex, 0.0); + launch_bump->Message(MessageCode::TBumperIncBmpIndex, 0.0); info_text_box->Display(pb::get_rc_string(Msg::STRING107), 2.0); } - launch_bump->Message2(MessageCode::TComponentGroupResetNotifyTimer, 60.0); + launch_bump->Message(MessageCode::TComponentGroupResetNotifyTimer, 60.0); } } } @@ -1437,8 +1437,8 @@ void control::OutLaneRolloverControl(int code, TPinballComponent* caller) if (light_on(&control_lite17_tag) || light_on(&control_lite18_tag)) { table_add_extra_ball(2.0); - lite17->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite18->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite17->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite18->Message(MessageCode::TLightResetAndTurnOff, 0.0); } else { @@ -1448,14 +1448,14 @@ void control::OutLaneRolloverControl(int code, TPinballComponent* caller) { if (light_on(&control_lite30_tag)) { - lite30->Message2(MessageCode::TLightFlasherStart, 0.0); - lite196->Message2(MessageCode::TLightFlasherStart, 0.0); + lite30->Message(MessageCode::TLightFlasherStart, 0.0); + lite196->Message(MessageCode::TLightFlasherStart, 0.0); } } else if (light_on(&control_lite29_tag)) { - lite29->Message2(MessageCode::TLightFlasherStart, 0.0); - lite195->Message2(MessageCode::TLightFlasherStart, 0.0); + lite29->Message(MessageCode::TLightFlasherStart, 0.0); + lite195->Message(MessageCode::TLightFlasherStart, 0.0); } TableG->AddScore(caller->get_scoring(0)); } @@ -1465,16 +1465,16 @@ void control::ExtraBallLightControl(int code, TPinballComponent* caller) { if (code == 19) { - lite17->Message2(MessageCode::TLightTurnOnTimed, 55.0); - lite18->Message2(MessageCode::TLightTurnOnTimed, 55.0); + lite17->Message(MessageCode::TLightTurnOnTimed, 55.0); + lite18->Message(MessageCode::TLightTurnOnTimed, 55.0); extraball_light_flag = 1; } else if (code == 60) { if (extraball_light_flag) { - lite17->Message2(MessageCode::TLightFlasherStartTimed, 5.0); - lite18->Message2(MessageCode::TLightFlasherStartTimed, 5.0); + lite17->Message(MessageCode::TLightFlasherStartTimed, 5.0); + lite18->Message(MessageCode::TLightFlasherStartTimed, 5.0); extraball_light_flag = 0; } } @@ -1488,8 +1488,8 @@ void control::ReturnLaneRolloverControl(int code, TPinballComponent* caller) { if (light_on(&control_lite27_tag)) { - lite59->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite27->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite59->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite27->Message(MessageCode::TLightResetAndTurnOff, 0.0); TableG->AddScore(caller->get_scoring(1)); } else @@ -1499,8 +1499,8 @@ void control::ReturnLaneRolloverControl(int code, TPinballComponent* caller) { if (light_on(&control_lite28_tag)) { - lite59->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite28->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite59->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite28->Message(MessageCode::TLightResetAndTurnOff, 0.0); TableG->AddScore(caller->get_scoring(1)); } else @@ -1520,7 +1520,7 @@ void control::BonusLaneRolloverControl(int code, TPinballComponent* caller) int addedScore = SpecialAddScore(TableG->ScoreSpecial2); snprintf(Buffer, sizeof Buffer, pb::get_rc_string(Msg::STRING104), addedScore); info_text_box->Display(Buffer, 2.0); - lite16->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite16->Message(MessageCode::TLightResetAndTurnOff, 0.0); soundwave50_1->Play(caller, "BonusLaneRolloverControl1"); } else @@ -1529,7 +1529,7 @@ void control::BonusLaneRolloverControl(int code, TPinballComponent* caller) soundwave25->Play(caller, "BonusLaneRolloverControl2"); info_text_box->Display(pb::get_rc_string(Msg::STRING145), 2.0); } - fuel_bargraph->Message2(MessageCode::TLightGroupToggleSplitIndex, 11.0); + fuel_bargraph->Message(MessageCode::TLightGroupToggleSplitIndex, 11.0); } } @@ -1537,13 +1537,13 @@ void control::FuelRollover1Control(int code, TPinballComponent* caller) { if (code == 63) { - if (fuel_bargraph->Message2(MessageCode::TLightGroupGetOnCount, 0.0) > 1) + if (fuel_bargraph->Message(MessageCode::TLightGroupGetOnCount, 0.0) > 1) { - literoll179->Message2(MessageCode::TLightTurnOffTimed, 0.05f); + literoll179->Message(MessageCode::TLightTurnOffTimed, 0.05f); } else { - fuel_bargraph->Message2(MessageCode::TLightGroupToggleSplitIndex, 1.0); + fuel_bargraph->Message(MessageCode::TLightGroupToggleSplitIndex, 1.0); info_text_box->Display(pb::get_rc_string(Msg::STRING145), 2.0); } TableG->AddScore(caller->get_scoring(0)); @@ -1554,13 +1554,13 @@ void control::FuelRollover2Control(int code, TPinballComponent* caller) { if (code == 63) { - if (fuel_bargraph->Message2(MessageCode::TLightGroupGetOnCount, 0.0) > 3) + if (fuel_bargraph->Message(MessageCode::TLightGroupGetOnCount, 0.0) > 3) { - literoll180->Message2(MessageCode::TLightTurnOffTimed, 0.05f); + literoll180->Message(MessageCode::TLightTurnOffTimed, 0.05f); } else { - fuel_bargraph->Message2(MessageCode::TLightGroupToggleSplitIndex, 3.0); + fuel_bargraph->Message(MessageCode::TLightGroupToggleSplitIndex, 3.0); info_text_box->Display(pb::get_rc_string(Msg::STRING145), 2.0); } TableG->AddScore(caller->get_scoring(0)); @@ -1571,13 +1571,13 @@ void control::FuelRollover3Control(int code, TPinballComponent* caller) { if (code == 63) { - if (fuel_bargraph->Message2(MessageCode::TLightGroupGetOnCount, 0.0) > 5) + if (fuel_bargraph->Message(MessageCode::TLightGroupGetOnCount, 0.0) > 5) { - literoll181->Message2(MessageCode::TLightTurnOffTimed, 0.05f); + literoll181->Message(MessageCode::TLightTurnOffTimed, 0.05f); } else { - fuel_bargraph->Message2(MessageCode::TLightGroupToggleSplitIndex, 5.0); + fuel_bargraph->Message(MessageCode::TLightGroupToggleSplitIndex, 5.0); info_text_box->Display(pb::get_rc_string(Msg::STRING145), 2.0); } TableG->AddScore(caller->get_scoring(0)); @@ -1588,13 +1588,13 @@ void control::FuelRollover4Control(int code, TPinballComponent* caller) { if (code == 63) { - if (fuel_bargraph->Message2(MessageCode::TLightGroupGetOnCount, 0.0) > 7) + if (fuel_bargraph->Message(MessageCode::TLightGroupGetOnCount, 0.0) > 7) { - literoll182->Message2(MessageCode::TLightTurnOffTimed, 0.05f); + literoll182->Message(MessageCode::TLightTurnOffTimed, 0.05f); } else { - fuel_bargraph->Message2(MessageCode::TLightGroupToggleSplitIndex, 7.0); + fuel_bargraph->Message(MessageCode::TLightGroupToggleSplitIndex, 7.0); info_text_box->Display(pb::get_rc_string(Msg::STRING145), 2.0); } TableG->AddScore(caller->get_scoring(0)); @@ -1605,13 +1605,13 @@ void control::FuelRollover5Control(int code, TPinballComponent* caller) { if (code == 63) { - if (fuel_bargraph->Message2(MessageCode::TLightGroupGetOnCount, 0.0) > 9) + if (fuel_bargraph->Message(MessageCode::TLightGroupGetOnCount, 0.0) > 9) { - literoll183->Message2(MessageCode::TLightTurnOffTimed, 0.05f); + literoll183->Message(MessageCode::TLightTurnOffTimed, 0.05f); } else { - fuel_bargraph->Message2(MessageCode::TLightGroupToggleSplitIndex, 9.0); + fuel_bargraph->Message(MessageCode::TLightGroupToggleSplitIndex, 9.0); info_text_box->Display(pb::get_rc_string(Msg::STRING145), 2.0); } TableG->AddScore(caller->get_scoring(0)); @@ -1622,13 +1622,13 @@ void control::FuelRollover6Control(int code, TPinballComponent* caller) { if (code == 63) { - if (fuel_bargraph->Message2(MessageCode::TLightGroupGetOnCount, 0.0) > 11) + if (fuel_bargraph->Message(MessageCode::TLightGroupGetOnCount, 0.0) > 11) { - literoll184->Message2(MessageCode::TLightTurnOffTimed, 0.05f); + literoll184->Message(MessageCode::TLightTurnOffTimed, 0.05f); } else { - fuel_bargraph->Message2(MessageCode::TLightGroupToggleSplitIndex, 11.0); + fuel_bargraph->Message(MessageCode::TLightGroupToggleSplitIndex, 11.0); info_text_box->Display(pb::get_rc_string(Msg::STRING145), 2.0); } TableG->AddScore(caller->get_scoring(0)); @@ -1640,16 +1640,16 @@ void control::HyperspaceLightGroupControl(int code, TPinballComponent* caller) switch (code) { case 0: - caller->Message2(MessageCode::TLightTurnOff, 0.0); + caller->Message(MessageCode::TLightTurnOff, 0.0); break; case 41: - caller->Message2(MessageCode::TLightGroupResetAndTurnOn, 2.0); - caller->Message2(MessageCode::TLightGroupRestartNotifyTimer, 60.0); + caller->Message(MessageCode::TLightGroupResetAndTurnOn, 2.0); + caller->Message(MessageCode::TLightGroupRestartNotifyTimer, 60.0); break; case 61: - caller->Message2(MessageCode::TLightGroupOffsetAnimationBackward, 0.0); - if (caller->Message2(MessageCode::TLightGroupGetOnCount, 0.0)) - caller->Message2(MessageCode::TLightGroupRestartNotifyTimer, 60.0); + caller->Message(MessageCode::TLightGroupOffsetAnimationBackward, 0.0); + if (caller->Message(MessageCode::TLightGroupGetOnCount, 0.0)) + caller->Message(MessageCode::TLightGroupRestartNotifyTimer, 60.0); break; default: break; } @@ -1673,9 +1673,9 @@ void control::WormHoleControl(int code, TPinballComponent* caller) if (lite4Msg) { lite4->MessageField = 0; - worm_hole_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - bsink_arrow_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite110->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + worm_hole_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + bsink_arrow_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite110->Message(MessageCode::TLightResetAndTurnOff, 0.0); if (lite4Msg == sinkFlag + 1) { if (TableG->MultiballFlag) @@ -1700,10 +1700,10 @@ void control::WormHoleControl(int code, TPinballComponent* caller) } info_text_box->Display(pb::get_rc_string(Msg::STRING150), 2.0); - wormhole_tag_array2[sinkFlag].get()->Message2(MessageCode::TLightFlasherStartTimedThenStayOff, sink->TimerTime); - wormhole_tag_array3[sinkFlag].get()->Message2(MessageCode::TLightSetOnStateBmpIndex, static_cast(2 - sinkFlag)); - wormhole_tag_array3[sinkFlag].get()->Message2(MessageCode::TLightFlasherStartTimedThenStayOff, sink->TimerTime); - wormhole_tag_array1[sinkFlag].get()->Message2(MessageCode::TSinkResetTimer, sink->TimerTime); + wormhole_tag_array2[sinkFlag].get()->Message(MessageCode::TLightFlasherStartTimedThenStayOff, sink->TimerTime); + wormhole_tag_array3[sinkFlag].get()->Message(MessageCode::TLightSetOnStateBmpIndex, static_cast(2 - sinkFlag)); + wormhole_tag_array3[sinkFlag].get()->Message(MessageCode::TLightFlasherStartTimedThenStayOff, sink->TimerTime); + wormhole_tag_array1[sinkFlag].get()->Message(MessageCode::TSinkResetTimer, sink->TimerTime); return; } TableG->AddScore(sink->get_scoring(2)); @@ -1715,10 +1715,10 @@ void control::WormHoleControl(int code, TPinballComponent* caller) sinkFlag2 = sinkFlag; } - wormhole_tag_array2[sinkFlag2].get()->Message2(MessageCode::TLightFlasherStartTimedThenStayOff, sink->TimerTime); - wormhole_tag_array3[sinkFlag2].get()->Message2(MessageCode::TLightSetOnStateBmpIndex, static_cast(2 - sinkFlag2)); - wormhole_tag_array3[sinkFlag2].get()->Message2(MessageCode::TLightFlasherStartTimedThenStayOff, sink->TimerTime); - wormhole_tag_array1[sinkFlag2].get()->Message2(MessageCode::TSinkResetTimer, sink->TimerTime); + wormhole_tag_array2[sinkFlag2].get()->Message(MessageCode::TLightFlasherStartTimedThenStayOff, sink->TimerTime); + wormhole_tag_array3[sinkFlag2].get()->Message(MessageCode::TLightSetOnStateBmpIndex, static_cast(2 - sinkFlag2)); + wormhole_tag_array3[sinkFlag2].get()->Message(MessageCode::TLightFlasherStartTimedThenStayOff, sink->TimerTime); + wormhole_tag_array1[sinkFlag2].get()->Message(MessageCode::TSinkResetTimer, sink->TimerTime); info_text_box->Display(pb::get_rc_string(Msg::STRING150), 2.0); } } @@ -1727,8 +1727,8 @@ void control::LeftFlipperControl(int code, TPinballComponent* caller) { if (code == 1) { - bmpr_inc_lights->Message2(MessageCode::TLightGroupStepBackward, 0.0); - ramp_bmpr_inc_lights->Message2(MessageCode::TLightGroupStepBackward, 0.0); + bmpr_inc_lights->Message(MessageCode::TLightGroupStepBackward, 0.0); + ramp_bmpr_inc_lights->Message(MessageCode::TLightGroupStepBackward, 0.0); } } @@ -1736,8 +1736,8 @@ void control::RightFlipperControl(int code, TPinballComponent* caller) { if (code == 1) { - bmpr_inc_lights->Message2(MessageCode::TLightGroupStepForward, 0.0); - ramp_bmpr_inc_lights->Message2(MessageCode::TLightGroupStepForward, 0.0); + bmpr_inc_lights->Message(MessageCode::TLightGroupStepForward, 0.0); + ramp_bmpr_inc_lights->Message(MessageCode::TLightGroupStepForward, 0.0); } } @@ -1808,11 +1808,11 @@ void control::BoosterTargetControl(int code, TPinballComponent* caller) sound->Play(caller, "BoosterTargetControl"); target1->MessageField = 0; - target1->Message2(MessageCode::TPopupTargetEnable, 0.0); + target1->Message(MessageCode::TPopupTargetEnable, 0.0); target2->MessageField = 0; - target2->Message2(MessageCode::TPopupTargetEnable, 0.0); + target2->Message(MessageCode::TPopupTargetEnable, 0.0); target3->MessageField = 0; - target3->Message2(MessageCode::TPopupTargetEnable, 0.0); + target3->Message(MessageCode::TPopupTargetEnable, 0.0); TableG->AddScore(caller->get_scoring(1)); } } @@ -1822,16 +1822,16 @@ void control::MedalLightGroupControl(int code, TPinballComponent* caller) switch (code) { case 0: - caller->Message2(MessageCode::TLightTurnOff, 0.0); + caller->Message(MessageCode::TLightTurnOff, 0.0); break; case 41: - caller->Message2(MessageCode::TLightGroupResetAndTurnOn, 2.0); - caller->Message2(MessageCode::TLightGroupRestartNotifyTimer, 30.0); + caller->Message(MessageCode::TLightGroupResetAndTurnOn, 2.0); + caller->Message(MessageCode::TLightGroupRestartNotifyTimer, 30.0); break; case 61: - caller->Message2(MessageCode::TLightGroupOffsetAnimationBackward, 0.0); - if (caller->Message2(MessageCode::TLightGroupGetOnCount, 0.0)) - caller->Message2(MessageCode::TLightGroupRestartNotifyTimer, 30.0); + caller->Message(MessageCode::TLightGroupOffsetAnimationBackward, 0.0); + if (caller->Message(MessageCode::TLightGroupGetOnCount, 0.0)) + caller->Message(MessageCode::TLightGroupRestartNotifyTimer, 30.0); break; default: break; } @@ -1842,29 +1842,29 @@ void control::MultiplierLightGroupControl(int code, TPinballComponent* caller) switch (code) { case 0: - caller->Message2(MessageCode::TLightTurnOff, 0.0); + caller->Message(MessageCode::TLightTurnOff, 0.0); break; case 41: - caller->Message2(MessageCode::TLightGroupResetAndTurnOn, 2.0); - caller->Message2(MessageCode::TLightGroupRestartNotifyTimer, 30.0); + caller->Message(MessageCode::TLightGroupResetAndTurnOn, 2.0); + caller->Message(MessageCode::TLightGroupRestartNotifyTimer, 30.0); break; case 61: if (TableG->ScoreMultiplier) TableG->ScoreMultiplier = TableG->ScoreMultiplier - 1; - caller->Message2(MessageCode::TLightGroupOffsetAnimationBackward, 0.0); - if (caller->Message2(MessageCode::TLightGroupGetOnCount, 0.0)) - caller->Message2(MessageCode::TLightGroupRestartNotifyTimer, 30.0); + caller->Message(MessageCode::TLightGroupOffsetAnimationBackward, 0.0); + if (caller->Message(MessageCode::TLightGroupGetOnCount, 0.0)) + caller->Message(MessageCode::TLightGroupRestartNotifyTimer, 30.0); break; case 64: TableG->ScoreMultiplier = 4; - caller->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - caller->Message2(MessageCode::TLightGroupRestartNotifyTimer, 30.0); + caller->Message(MessageCode::TLightResetAndTurnOn, 0.0); + caller->Message(MessageCode::TLightGroupRestartNotifyTimer, 30.0); info_text_box->Display(pb::get_rc_string(Msg::STRING160), 2.0); break; case 65: TableG->ScoreMultiplier = 0; - caller->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - caller->Message2(MessageCode::TLightGroupRestartNotifyTimer, -1.0); + caller->Message(MessageCode::TLightResetAndTurnOff, 0.0); + caller->Message(MessageCode::TLightGroupRestartNotifyTimer, -1.0); break; default: break; @@ -1887,12 +1887,12 @@ void control::FuelSpotTargetControl(int code, TPinballComponent* caller) if (target11 != caller) liteComp = lite72; } - liteComp->Message2(MessageCode::TLightFlasherStartTimedThenStayOn, 2.0); + liteComp->Message(MessageCode::TLightFlasherStartTimedThenStayOn, 2.0); TableG->AddScore(caller->get_scoring(0)); - if (top_circle_tgt_lights->Message2(MessageCode::TLightGroupGetOnCount, 0.0) == 3) + if (top_circle_tgt_lights->Message(MessageCode::TLightGroupGetOnCount, 0.0) == 3) { - top_circle_tgt_lights->Message2(MessageCode::TLightFlasherStartTimedThenStayOff, 2.0); - fuel_bargraph->Message2(MessageCode::TLightGroupToggleSplitIndex, 11.0); + top_circle_tgt_lights->Message(MessageCode::TLightFlasherStartTimedThenStayOff, 2.0); + fuel_bargraph->Message(MessageCode::TLightGroupToggleSplitIndex, 11.0); soundwave25->Play(caller, "FuelSpotTargetControl1"); info_text_box->Display(pb::get_rc_string(Msg::STRING145), 2.0); } @@ -1923,7 +1923,7 @@ void control::MissionSpotTargetControl(int code, TPinballComponent* caller) lite101->MessageField |= 4u; lite = lite103; } - lite->Message2(MessageCode::TLightFlasherStartTimedThenStayOn, 2.0); + lite->Message(MessageCode::TLightFlasherStartTimedThenStayOn, 2.0); TSound* sound; if (!light_on(&control_lite198_tag) || lite198->FlasherOnFlag) @@ -1934,8 +1934,8 @@ void control::MissionSpotTargetControl(int code, TPinballComponent* caller) sound = soundwave49D; sound->Play(caller, "MissionSpotTargetControl"); TableG->AddScore(caller->get_scoring(0)); - if (ramp_tgt_lights->Message2(MessageCode::TLightGroupGetOnCount, 0.0) == 3) - ramp_tgt_lights->Message2(MessageCode::TLightFlasherStartTimedThenStayOff, 2.0); + if (ramp_tgt_lights->Message(MessageCode::TLightGroupGetOnCount, 0.0) == 3) + ramp_tgt_lights->Message(MessageCode::TLightFlasherStartTimedThenStayOff, 2.0); } } @@ -1960,13 +1960,13 @@ void control::LeftHazardSpotTargetControl(int code, TPinballComponent* caller) lite104->MessageField |= 4u; lite = lite106; } - lite->Message2(MessageCode::TLightFlasherStartTimedThenStayOn, 2.0); + lite->Message(MessageCode::TLightFlasherStartTimedThenStayOn, 2.0); TableG->AddScore(caller->get_scoring(0)); - if (lchute_tgt_lights->Message2(MessageCode::TLightGroupGetOnCount, 0.0) == 3) + if (lchute_tgt_lights->Message(MessageCode::TLightGroupGetOnCount, 0.0) == 3) { soundwave14_1->Play(caller, "LeftHazardSpotTargetControl1"); - gate1->Message2(MessageCode::TGateDisable, 0.0); - lchute_tgt_lights->Message2(MessageCode::TLightFlasherStartTimedThenStayOff, 2.0); + gate1->Message(MessageCode::TGateDisable, 0.0); + lchute_tgt_lights->Message(MessageCode::TLightFlasherStartTimedThenStayOff, 2.0); } else { @@ -1996,13 +1996,13 @@ void control::RightHazardSpotTargetControl(int code, TPinballComponent* caller) lite107->MessageField |= 4u; light = lite109; } - light->Message2(MessageCode::TLightFlasherStartTimedThenStayOn, 2.0); + light->Message(MessageCode::TLightFlasherStartTimedThenStayOn, 2.0); TableG->AddScore(caller->get_scoring(0)); - if (bpr_solotgt_lights->Message2(MessageCode::TLightGroupGetOnCount, 0.0) == 3) + if (bpr_solotgt_lights->Message(MessageCode::TLightGroupGetOnCount, 0.0) == 3) { soundwave14_1->Play(caller, "RightHazardSpotTargetControl1"); - gate2->Message2(MessageCode::TGateDisable, 0.0); - bpr_solotgt_lights->Message2(MessageCode::TLightFlasherStartTimedThenStayOff, 2.0); + gate2->Message(MessageCode::TGateDisable, 0.0); + bpr_solotgt_lights->Message(MessageCode::TLightFlasherStartTimedThenStayOff, 2.0); } else { @@ -2017,7 +2017,7 @@ void control::WormHoleDestinationControl(int code, TPinballComponent* caller) { if (!light_on(&control_lite110_tag)) { - lite110->Message2(MessageCode::TLightFlasherStartTimedThenStayOn, 3.0); + lite110->Message(MessageCode::TLightFlasherStartTimedThenStayOn, 3.0); info_text_box->Display(pb::get_rc_string(Msg::STRING194), 2.0); } TableG->AddScore(caller->get_scoring(0)); @@ -2034,7 +2034,7 @@ void control::BlackHoleKickoutControl(int code, TPinballComponent* caller) int addedScore = TableG->AddScore(caller->get_scoring(0)); snprintf(Buffer, sizeof Buffer, pb::get_rc_string(Msg::STRING181), addedScore); info_text_box->Display(Buffer, 2.0); - caller->Message2(MessageCode::TKickoutRestartTimer, -1.0); + caller->Message(MessageCode::TKickoutRestartTimer, -1.0); } } @@ -2062,10 +2062,10 @@ void control::GravityWellKickoutControl(int code, TPinballComponent* caller) auto addedScore = TableG->AddScore(caller->get_scoring(0)); snprintf(Buffer, sizeof Buffer, pb::get_rc_string(Msg::STRING182), addedScore); info_text_box->Display(Buffer, 2.0); - lite62->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite62->Message(MessageCode::TLightResetAndTurnOff, 0.0); caller->ActiveFlag = 0; auto duration = soundwave7->Play(lite62, "GravityWellKickoutControl"); - caller->Message2(MessageCode::TKickoutRestartTimer, duration); + caller->Message(MessageCode::TKickoutRestartTimer, duration); break; } case 64: @@ -2080,7 +2080,7 @@ void control::GravityWellKickoutControl(int code, TPinballComponent* caller) snprintf(Buffer, sizeof Buffer, "%s", pb::get_rc_string(Msg::STRING146)); } info_text_box->Display(Buffer, 2.0); - lite62->Message2(MessageCode::TLightFlasherStart, 0.0); + lite62->Message(MessageCode::TLightFlasherStart, 0.0); kickout1->ActiveFlag = 1; break; } @@ -2094,15 +2094,15 @@ void control::SkillShotGate1Control(int code, TPinballComponent* caller) { if (code == 63) { - lite200->Message2(MessageCode::TLightTurnOnTimed, 5.0); + lite200->Message(MessageCode::TLightTurnOnTimed, 5.0); if (light_on(&control_lite67_tag)) { - skill_shot_lights->Message2(MessageCode::TLightGroupReset, 0.0); - skill_shot_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite67->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - lite54->Message2(MessageCode::TLightFlasherStartTimed, 5.0); - lite25->Message2(MessageCode::TLightFlasherStartTimed, 5.0); - fuel_bargraph->Message2(MessageCode::TLightGroupToggleSplitIndex, 11.0); + skill_shot_lights->Message(MessageCode::TLightGroupReset, 0.0); + skill_shot_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite67->Message(MessageCode::TLightResetAndTurnOn, 0.0); + lite54->Message(MessageCode::TLightFlasherStartTimed, 5.0); + lite25->Message(MessageCode::TLightFlasherStartTimed, 5.0); + fuel_bargraph->Message(MessageCode::TLightGroupToggleSplitIndex, 11.0); soundwave14_2->Play(lite67, "SkillShotGate1Control"); } } @@ -2114,7 +2114,7 @@ void control::SkillShotGate2Control(int code, TPinballComponent* caller) { if (light_on(&control_lite67_tag)) { - lite68->Message2(MessageCode::TLightResetAndTurnOn, 0.0); + lite68->Message(MessageCode::TLightResetAndTurnOn, 0.0); soundwave14_2->Play(lite68, "SkillShotGate2Control"); } } @@ -2126,7 +2126,7 @@ void control::SkillShotGate3Control(int code, TPinballComponent* caller) { if (light_on(&control_lite67_tag)) { - lite69->Message2(MessageCode::TLightResetAndTurnOn, 0.0); + lite69->Message(MessageCode::TLightResetAndTurnOn, 0.0); soundwave14_2->Play(lite69, "SkillShotGate3Control"); } } @@ -2138,7 +2138,7 @@ void control::SkillShotGate4Control(int code, TPinballComponent* caller) { if (light_on(&control_lite67_tag)) { - lite131->Message2(MessageCode::TLightResetAndTurnOn, 0.0); + lite131->Message(MessageCode::TLightResetAndTurnOn, 0.0); soundwave14_2->Play(lite131, "SkillShotGate4Control"); } } @@ -2150,7 +2150,7 @@ void control::SkillShotGate5Control(int code, TPinballComponent* caller) { if (light_on(&control_lite67_tag)) { - lite132->Message2(MessageCode::TLightResetAndTurnOn, 0.0); + lite132->Message(MessageCode::TLightResetAndTurnOn, 0.0); soundwave14_2->Play(lite132, "SkillShotGate5Control"); } } @@ -2162,7 +2162,7 @@ void control::SkillShotGate6Control(int code, TPinballComponent* caller) { if (light_on(&control_lite67_tag)) { - lite133->Message2(MessageCode::TLightResetAndTurnOn, 0.0); + lite133->Message(MessageCode::TLightResetAndTurnOn, 0.0); soundwave14_2->Play(lite133, "SkillShotGate6Control"); } } @@ -2178,7 +2178,7 @@ void control::ShootAgainLightControl(int code, TPinballComponent* caller) } else { - caller->Message2(MessageCode::TLightFlasherStartTimedThenStayOff, 5.0); + caller->Message(MessageCode::TLightFlasherStartTimedThenStayOff, 5.0); caller->MessageField = 1; } } @@ -2188,7 +2188,7 @@ void control::EscapeChuteSinkControl(int code, TPinballComponent* caller) { if (code == 63) { - caller->Message2(MessageCode::TSinkResetTimer, -1.0f); + caller->Message(MessageCode::TSinkResetTimer, -1.0f); } } @@ -2203,10 +2203,10 @@ void control::MissionControl(int code, TPinballComponent* caller) case 47: if (fuel_bargraph == caller && lite198Msg > 1) { - l_trek_lights->Message2(MessageCode::TLightGroupReset, 0.0); - l_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - r_trek_lights->Message2(MessageCode::TLightGroupReset, 0.0); - r_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + l_trek_lights->Message(MessageCode::TLightGroupReset, 0.0); + l_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + r_trek_lights->Message(MessageCode::TLightGroupReset, 0.0); + r_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); mission_text_box->Display(pb::get_rc_string(Msg::STRING210), 4.0); lite198->MessageField = 1; MissionControl(66, nullptr); @@ -2215,7 +2215,7 @@ void control::MissionControl(int code, TPinballComponent* caller) case 60: if (fuel_bargraph == caller && lite198Msg) { - if (fuel_bargraph->Message2(MessageCode::TLightGroupGetOnCount, 0.0) == 1) + if (fuel_bargraph->Message(MessageCode::TLightGroupGetOnCount, 0.0) == 1) { mission_text_box->Display(pb::get_rc_string(Msg::STRING217), 4.0); } @@ -2342,7 +2342,7 @@ void control::HyperspaceKickOutControl(int code, TPinballComponent* caller) if (code != 63) return; - auto activeCount = hyper_lights->Message2(MessageCode::TLightGroupGetOnCount, 0.0); + auto activeCount = hyper_lights->Message(MessageCode::TLightGroupGetOnCount, 0.0); HyperspaceLightGroupControl(41, hyper_lights); switch (activeCount) { @@ -2379,7 +2379,7 @@ void control::HyperspaceKickOutControl(int code, TPinballComponent* caller) } case 4: { - hyper_lights->Message2(MessageCode::TLightTurnOff, 0.0); + hyper_lights->Message(MessageCode::TLightTurnOff, 0.0); size_t addedScore = TableG->AddScore(caller->get_scoring(4)); GravityWellKickoutControl(64, reinterpret_cast(addedScore)); break; @@ -2401,15 +2401,15 @@ void control::HyperspaceKickOutControl(int code, TPinballComponent* caller) if (light_on(&control_lite130_tag)) { someFlag |= 4u; - lite130->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite130->Message(MessageCode::TLightResetAndTurnOff, 0.0); MultiplierLightGroupControl(64, top_target_lights); - bumber_target_lights->Message2(MessageCode::TLightResetAndTurnOn, 0.0); + bumber_target_lights->Message(MessageCode::TLightResetAndTurnOn, 0.0); table_set_jackpot(); table_set_bonus(); table_set_flag_lights(); table_set_bonus_hold(); - lite27->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - lite28->Message2(MessageCode::TLightResetAndTurnOn, 0.0); + lite27->Message(MessageCode::TLightResetAndTurnOn, 0.0); + lite28->Message(MessageCode::TLightResetAndTurnOn, 0.0); ExtraBallLightControl(19, nullptr); DrainBallBlockerControl(52, block1); @@ -2439,8 +2439,8 @@ void control::HyperspaceKickOutControl(int code, TPinballComponent* caller) auto duration = soundwave41->Play(lite24, "HyperspaceKickOutControl1"); soundwave36_1->Play(lite24, "HyperspaceKickOutControl2"); soundwave50_2->Play(lite24, "HyperspaceKickOutControl3"); - lite25->Message2(MessageCode::TLightFlasherStartTimed, 5.0); - caller->Message2(MessageCode::TKickoutRestartTimer, duration); + lite25->Message(MessageCode::TLightFlasherStartTimed, 5.0); + caller->Message(MessageCode::TKickoutRestartTimer, duration); return; } sound = soundwave40; @@ -2468,8 +2468,8 @@ void control::HyperspaceKickOutControl(int code, TPinballComponent* caller) } } auto duration = sound->Play(lite24, "HyperspaceKickOutControl4"); - lite25->Message2(MessageCode::TLightFlasherStartTimed, 5.0); - caller->Message2(MessageCode::TKickoutRestartTimer, duration); + lite25->Message(MessageCode::TLightFlasherStartTimed, 5.0); + caller->Message(MessageCode::TKickoutRestartTimer, duration); } void control::PlungerControl(int code, TPinballComponent* caller) @@ -2481,25 +2481,25 @@ void control::PlungerControl(int code, TPinballComponent* caller) else if (code == 1016) { table_unlimited_balls = false; - if (!middle_circle->Message2(MessageCode::TLightGroupGetOnCount, 0.0)) - middle_circle->Message2(MessageCode::TLightGroupOffsetAnimationForward, 0.0); + if (!middle_circle->Message(MessageCode::TLightGroupGetOnCount, 0.0)) + middle_circle->Message(MessageCode::TLightGroupOffsetAnimationForward, 0.0); if (!light_on(&control_lite200_tag)) { - skill_shot_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite67->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - skill_shot_lights->Message2(MessageCode::TLightGroupAnimationBackward, 0.25f); - l_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - l_trek_lights->Message2(MessageCode::TLightGroupOffsetAnimationForward, 0.2f); - l_trek_lights->Message2(MessageCode::TLightGroupAnimationBackward, 0.2f); - r_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - r_trek_lights->Message2(MessageCode::TLightGroupOffsetAnimationForward, 0.2f); - r_trek_lights->Message2(MessageCode::TLightGroupAnimationBackward, 0.2f); + skill_shot_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite67->Message(MessageCode::TLightResetAndTurnOn, 0.0); + skill_shot_lights->Message(MessageCode::TLightGroupAnimationBackward, 0.25f); + l_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + l_trek_lights->Message(MessageCode::TLightGroupOffsetAnimationForward, 0.2f); + l_trek_lights->Message(MessageCode::TLightGroupAnimationBackward, 0.2f); + r_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + r_trek_lights->Message(MessageCode::TLightGroupOffsetAnimationForward, 0.2f); + r_trek_lights->Message(MessageCode::TLightGroupAnimationBackward, 0.2f); TableG->ScoreSpecial1 = 25000; MultiplierLightGroupControl(65, top_target_lights); - fuel_bargraph->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - lite200->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - gate1->Message2(MessageCode::TGateDisable, 0.0); - gate2->Message2(MessageCode::TGateDisable, 0.0); + fuel_bargraph->Message(MessageCode::TLightResetAndTurnOn, 0.0); + lite200->Message(MessageCode::TLightResetAndTurnOn, 0.0); + gate1->Message(MessageCode::TGateDisable, 0.0); + gate2->Message(MessageCode::TGateDisable, 0.0); } lite200->MessageField = 0; } @@ -2515,7 +2515,7 @@ void control::MedalTargetControl(int code, TPinballComponent* caller) + target4->MessageField == 3) { MedalLightGroupControl(41, bumber_target_lights); - int activeCount = bumber_target_lights->Message2(MessageCode::TLightGroupGetOnCount, 0.0) - 1; + int activeCount = bumber_target_lights->Message(MessageCode::TLightGroupGetOnCount, 0.0) - 1; const char* text; switch (activeCount) { @@ -2534,11 +2534,11 @@ void control::MedalTargetControl(int code, TPinballComponent* caller) } info_text_box->Display(text, 2.0); target6->MessageField = 0; - target6->Message2(MessageCode::TPopupTargetEnable, 0.0); + target6->Message(MessageCode::TPopupTargetEnable, 0.0); target5->MessageField = 0; - target5->Message2(MessageCode::TPopupTargetEnable, 0.0); + target5->Message(MessageCode::TPopupTargetEnable, 0.0); target4->MessageField = 0; - target4->Message2(MessageCode::TPopupTargetEnable, 0.0); + target4->Message(MessageCode::TPopupTargetEnable, 0.0); return; } TableG->AddScore(caller->get_scoring(0)); @@ -2554,7 +2554,7 @@ void control::MultiplierTargetControl(int code, TPinballComponent* caller) { TableG->AddScore(caller->get_scoring(1)); MultiplierLightGroupControl(41, top_target_lights); - int activeCount = top_target_lights->Message2(MessageCode::TLightGroupGetOnCount, 0.0); + int activeCount = top_target_lights->Message(MessageCode::TLightGroupGetOnCount, 0.0); const char* text; switch (activeCount) { @@ -2578,11 +2578,11 @@ void control::MultiplierTargetControl(int code, TPinballComponent* caller) info_text_box->Display(text, 2.0); target9->MessageField = 0; - target9->Message2(MessageCode::TPopupTargetEnable, 0.0); + target9->Message(MessageCode::TPopupTargetEnable, 0.0); target8->MessageField = 0; - target8->Message2(MessageCode::TPopupTargetEnable, 0.0); + target8->Message(MessageCode::TPopupTargetEnable, 0.0); target7->MessageField = 0; - target7->Message2(MessageCode::TPopupTargetEnable, 0.0); + target7->Message(MessageCode::TPopupTargetEnable, 0.0); } else { @@ -2599,46 +2599,46 @@ void control::BallDrainControl(int code, TPinballComponent* caller) { if (lite199->MessageField) { - TableG->Message2(MessageCode::GameOver, 0.0); + TableG->Message(MessageCode::GameOver, 0.0); if (pb::chk_highscore()) { soundwave3->Play(nullptr, "BallDrainControl1"); - TableG->LightGroup->Message2(MessageCode::TLightFlasherStartTimedThenStayOff, 3.0); + TableG->LightGroup->Message(MessageCode::TLightFlasherStartTimedThenStayOff, 3.0); mission_text_box->Display(pb::get_rc_string(Msg::STRING277), -1.0); } } else { - plunger->Message2(MessageCode::PlungerStartFeedTimer, 0.0); + plunger->Message(MessageCode::PlungerStartFeedTimer, 0.0); } } else if (code == 63) { if (table_unlimited_balls) { - drain->Message2(MessageCode::Reset, 0.0); - sink3->Message2(MessageCode::TSinkResetTimer, 0.0); + drain->Message(MessageCode::Reset, 0.0); + sink3->Message(MessageCode::TSinkResetTimer, 0.0); } else { if (TableG->TiltLockFlag) { - lite200->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite199->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite200->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite199->Message(MessageCode::TLightResetAndTurnOff, 0.0); midi::play_track(MidiTracks::Track1, false); } if (light_on(&control_lite200_tag)) { soundwave27->Play(nullptr, "BallDrainControl2"); - lite200->Message2(MessageCode::TLightResetAndTurnOn, 0.0); + lite200->Message(MessageCode::TLightResetAndTurnOn, 0.0); info_text_box->Display(pb::get_rc_string(Msg::STRING197), -1.0); soundwave59->Play(nullptr, "BallDrainControl3"); } else if (light_on(&control_lite199_tag)) { soundwave27->Play(nullptr, "BallDrainControl4"); - lite199->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite200->Message2(MessageCode::TLightResetAndTurnOn, 0.0); + lite199->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite200->Message(MessageCode::TLightResetAndTurnOn, 0.0); info_text_box->Display(pb::get_rc_string(Msg::STRING196), 2.0); soundwave59->Play(nullptr, "BallDrainControl5"); --TableG->UnknownP78; @@ -2647,13 +2647,13 @@ void control::BallDrainControl(int code, TPinballComponent* caller) { if (TableG->MultiballCount == 1) { - lite38->Message2(MessageCode::TLightResetAndTurnOff, 0.0f); - lite39->Message2(MessageCode::TLightResetAndTurnOff, 0.0f); + lite38->Message(MessageCode::TLightResetAndTurnOff, 0.0f); + lite39->Message(MessageCode::TLightResetAndTurnOff, 0.0f); midi::play_track(MidiTracks::Track1, false); } else if (TableG->MultiballCount == 2) { - lite40->Message2(MessageCode::TLightResetAndTurnOff, 0.0f); + lite40->Message(MessageCode::TLightResetAndTurnOff, 0.0f); } } else @@ -2693,7 +2693,7 @@ void control::BallDrainControl(int code, TPinballComponent* caller) TableG->ChangeBallCount(TableG->BallCount - 1); if (TableG->CurrentPlayer + 1 != TableG->PlayerCount || TableG->BallCount) { - TableG->Message2(MessageCode::SwitchToNextPlayer, 0.0); + TableG->Message(MessageCode::SwitchToNextPlayer, 0.0); lite199->MessageField = 0; } else @@ -2702,77 +2702,77 @@ void control::BallDrainControl(int code, TPinballComponent* caller) } soundwave27->Play(nullptr, "BallDrainControl8"); } - bmpr_inc_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - ramp_bmpr_inc_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite30->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite29->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite1->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite54->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite55->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite56->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite17->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite18->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite27->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite28->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite16->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite20->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - hyper_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite25->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite26->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite130->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite19->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - worm_hole_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - bsink_arrow_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - l_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - r_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite60->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite59->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite61->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - bumber_target_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - top_target_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - top_circle_tgt_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - ramp_tgt_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lchute_tgt_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - bpr_solotgt_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite110->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - skill_shot_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite77->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite198->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite196->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite195->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - fuel_bargraph->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - fuel_bargraph->Message2(MessageCode::Reset, 0.0); + bmpr_inc_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + ramp_bmpr_inc_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite30->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite29->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite1->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite54->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite55->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite56->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite17->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite18->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite27->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite28->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite16->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite20->Message(MessageCode::TLightResetAndTurnOff, 0.0); + hyper_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite25->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite26->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite130->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite19->Message(MessageCode::TLightResetAndTurnOff, 0.0); + worm_hole_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + bsink_arrow_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + l_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + r_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite60->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite59->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite61->Message(MessageCode::TLightResetAndTurnOff, 0.0); + bumber_target_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + top_target_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + top_circle_tgt_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + ramp_tgt_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lchute_tgt_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + bpr_solotgt_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite110->Message(MessageCode::TLightResetAndTurnOff, 0.0); + skill_shot_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite77->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite198->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite196->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite195->Message(MessageCode::TLightResetAndTurnOff, 0.0); + fuel_bargraph->Message(MessageCode::TLightResetAndTurnOff, 0.0); + fuel_bargraph->Message(MessageCode::Reset, 0.0); GravityWellKickoutControl(1024, nullptr); - lite62->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite62->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite4->MessageField = 0; lite101->MessageField = 0; lite102->MessageField = 0; lite103->MessageField = 0; ramp_tgt_lights->MessageField = 0; - outer_circle->Message2(MessageCode::TLightGroupReset, 0.0); - middle_circle->Message2(MessageCode::TLightGroupReset, 0.0); - attack_bump->Message2(MessageCode::Reset, 0.0); - launch_bump->Message2(MessageCode::Reset, 0.0); - gate1->Message2(MessageCode::Reset, 0.0); - gate2->Message2(MessageCode::Reset, 0.0); - block1->Message2(MessageCode::Reset, 0.0); - target1->Message2(MessageCode::Reset, 0.0); - target2->Message2(MessageCode::Reset, 0.0); - target3->Message2(MessageCode::Reset, 0.0); - target6->Message2(MessageCode::Reset, 0.0); - target5->Message2(MessageCode::Reset, 0.0); - target4->Message2(MessageCode::Reset, 0.0); - target9->Message2(MessageCode::Reset, 0.0); - target8->Message2(MessageCode::Reset, 0.0); - target7->Message2(MessageCode::Reset, 0.0); + outer_circle->Message(MessageCode::TLightGroupReset, 0.0); + middle_circle->Message(MessageCode::TLightGroupReset, 0.0); + attack_bump->Message(MessageCode::Reset, 0.0); + launch_bump->Message(MessageCode::Reset, 0.0); + gate1->Message(MessageCode::Reset, 0.0); + gate2->Message(MessageCode::Reset, 0.0); + block1->Message(MessageCode::Reset, 0.0); + target1->Message(MessageCode::Reset, 0.0); + target2->Message(MessageCode::Reset, 0.0); + target3->Message(MessageCode::Reset, 0.0); + target6->Message(MessageCode::Reset, 0.0); + target5->Message(MessageCode::Reset, 0.0); + target4->Message(MessageCode::Reset, 0.0); + target9->Message(MessageCode::Reset, 0.0); + target8->Message(MessageCode::Reset, 0.0); + target7->Message(MessageCode::Reset, 0.0); if (lite199->MessageField) lite198->MessageField = 32; else lite198->MessageField = 0; MissionControl(66, nullptr); - TableG->Message2(MessageCode::ClearTiltLock, 0.0); + TableG->Message(MessageCode::ClearTiltLock, 0.0); if (light_on(&control_lite58_tag)) - lite58->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite58->Message(MessageCode::TLightResetAndTurnOff, 0.0); else TableG->ScoreSpecial2 = 25000; } @@ -2786,7 +2786,7 @@ void control::table_control_handler(int code) if (code == 1011) { table_unlimited_balls = false; - lite77->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite77->Message(MessageCode::TLightFlasherStartTimed, 0.0); } } @@ -2797,14 +2797,14 @@ void control::AlienMenaceController(int code, TPinballComponent* caller) { if (code == 66) { - attack_bump->Message2(MessageCode::TBumperSetBmpIndex, 0.0); - l_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - l_trek_lights->Message2(MessageCode::TLightGroupOffsetAnimationForward, 0.2f); - l_trek_lights->Message2(MessageCode::TLightGroupAnimationBackward, 0.2f); - r_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - r_trek_lights->Message2(MessageCode::TLightGroupOffsetAnimationForward, 0.2f); - r_trek_lights->Message2(MessageCode::TLightGroupAnimationBackward, 0.2f); - lite307->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + attack_bump->Message(MessageCode::TBumperSetBmpIndex, 0.0); + l_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + l_trek_lights->Message(MessageCode::TLightGroupOffsetAnimationForward, 0.2f); + l_trek_lights->Message(MessageCode::TLightGroupAnimationBackward, 0.2f); + r_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + r_trek_lights->Message(MessageCode::TLightGroupOffsetAnimationForward, 0.2f); + r_trek_lights->Message(MessageCode::TLightGroupAnimationBackward, 0.2f); + lite307->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -2817,7 +2817,7 @@ void control::AlienMenaceController(int code, TPinballComponent* caller) { if (bump1->BmpIndex) { - lite307->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite307->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 20; MissionControl(66, nullptr); } @@ -2833,12 +2833,12 @@ void control::AlienMenacePartTwoController(int code, TPinballComponent* caller) if (code == 66) { lite56->MessageField = 8; - l_trek_lights->Message2(MessageCode::TLightGroupReset, 0.0); - l_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - r_trek_lights->Message2(MessageCode::TLightGroupReset, 0.0); - r_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite308->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite311->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + l_trek_lights->Message(MessageCode::TLightGroupReset, 0.0); + l_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + r_trek_lights->Message(MessageCode::TLightGroupReset, 0.0); + r_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite308->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite311->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -2861,8 +2861,8 @@ void control::AlienMenacePartTwoController(int code, TPinballComponent* caller) } else { - lite308->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite311->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite308->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite311->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 1; MissionControl(66, nullptr); mission_text_box->Display(pb::get_rc_string(Msg::STRING231), 4.0); @@ -2892,9 +2892,9 @@ void control::BlackHoleThreatController(int code, TPinballComponent* caller) && bump5->BmpIndex) { if (light_on(&control_lite316_tag)) - lite316->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite316->Message(MessageCode::TLightResetAndTurnOff, 0.0); if (light_on(&control_lite314_tag)) - lite314->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite314->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 1; MissionControl(66, nullptr); mission_text_box->Display(pb::get_rc_string(Msg::STRING225), 4.0); @@ -2911,7 +2911,7 @@ void control::BlackHoleThreatController(int code, TPinballComponent* caller) { if (code == 66) { - launch_bump->Message2(MessageCode::TBumperSetBmpIndex, 0.0); + launch_bump->Message(MessageCode::TBumperSetBmpIndex, 0.0); } else if (code != 67) { @@ -2921,20 +2921,20 @@ void control::BlackHoleThreatController(int code, TPinballComponent* caller) { mission_text_box->Display(pb::get_rc_string(Msg::STRING224), -1.0); if (light_on(&control_lite316_tag)) - lite316->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite316->Message(MessageCode::TLightResetAndTurnOff, 0.0); if (!light_on(&control_lite314_tag)) { - lite314->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite314->Message(MessageCode::TLightFlasherStartTimed, 0.0); } } else { mission_text_box->Display(pb::get_rc_string(Msg::STRING223), -1.0); if (light_on(&control_lite314_tag)) - lite314->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite314->Message(MessageCode::TLightResetAndTurnOff, 0.0); if (!light_on(&control_lite316_tag)) { - lite316->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite316->Message(MessageCode::TLightFlasherStartTimed, 0.0); } } } @@ -2950,32 +2950,32 @@ void control::BugHuntController(int code, TPinballComponent* caller) { lite56->MessageField = 15; target1->MessageField = 0; - target1->Message2(MessageCode::TPopupTargetEnable, 0.0); + target1->Message(MessageCode::TPopupTargetEnable, 0.0); target2->MessageField = 0; - target2->Message2(MessageCode::TPopupTargetEnable, 0.0); + target2->Message(MessageCode::TPopupTargetEnable, 0.0); target3->MessageField = 0; - target3->Message2(MessageCode::TPopupTargetEnable, 0.0); + target3->Message(MessageCode::TPopupTargetEnable, 0.0); target6->MessageField = 0; - target6->Message2(MessageCode::TPopupTargetEnable, 0.0); + target6->Message(MessageCode::TPopupTargetEnable, 0.0); target5->MessageField = 0; - target5->Message2(MessageCode::TPopupTargetEnable, 0.0); + target5->Message(MessageCode::TPopupTargetEnable, 0.0); target4->MessageField = 0; - target4->Message2(MessageCode::TPopupTargetEnable, 0.0); + target4->Message(MessageCode::TPopupTargetEnable, 0.0); target9->MessageField = 0; - target9->Message2(MessageCode::TPopupTargetEnable, 0.0); + target9->Message(MessageCode::TPopupTargetEnable, 0.0); target8->MessageField = 0; - target8->Message2(MessageCode::TPopupTargetEnable, 0.0); + target8->Message(MessageCode::TPopupTargetEnable, 0.0); target7->MessageField = 0; - target7->Message2(MessageCode::TPopupTargetEnable, 0.0); - top_circle_tgt_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - ramp_tgt_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lchute_tgt_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - bpr_solotgt_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite306->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite308->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite310->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite313->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite319->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + target7->Message(MessageCode::TPopupTargetEnable, 0.0); + top_circle_tgt_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + ramp_tgt_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lchute_tgt_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + bpr_solotgt_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite306->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite308->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite310->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite313->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite319->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -3015,11 +3015,11 @@ void control::BugHuntController(int code, TPinballComponent* caller) } else { - lite306->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite308->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite310->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite313->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite319->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite306->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite308->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite310->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite313->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite319->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 1; MissionControl(66, nullptr); mission_text_box->Display(pb::get_rc_string(Msg::STRING227), 4.0); @@ -3043,10 +3043,10 @@ void control::CosmicPlagueController(int code, TPinballComponent* caller) if (code == 66) { lite56->MessageField = 75; - lite20->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - lite19->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - lite305->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite312->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite20->Message(MessageCode::TLightResetAndTurnOn, 0.0); + lite19->Message(MessageCode::TLightResetAndTurnOn, 0.0); + lite305->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite312->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -3065,12 +3065,12 @@ void control::CosmicPlagueController(int code, TPinballComponent* caller) } else { - lite305->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite312->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite305->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite312->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 21; MissionControl(66, nullptr); - lite20->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite19->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite20->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite19->Message(MessageCode::TLightResetAndTurnOff, 0.0); } } } @@ -3083,7 +3083,7 @@ void control::CosmicPlaguePartTwoController(int code, TPinballComponent* caller) { if (code == 66) { - lite310->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite310->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -3094,7 +3094,7 @@ void control::CosmicPlaguePartTwoController(int code, TPinballComponent* caller) } if (roll9 == caller) { - lite310->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite310->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 1; MissionControl(66, nullptr); mission_text_box->Display(pb::get_rc_string(Msg::STRING242), 4.0); @@ -3117,8 +3117,8 @@ void control::DoomsdayMachineController(int code, TPinballComponent* caller) if (code == 66) { lite56->MessageField = 3; - lite301->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite320->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite301->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite320->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -3137,8 +3137,8 @@ void control::DoomsdayMachineController(int code, TPinballComponent* caller) } else { - lite301->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite320->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite301->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite320->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 1; MissionControl(66, nullptr); mission_text_box->Display(pb::get_rc_string(Msg::STRING239), 4.0); @@ -3159,10 +3159,10 @@ void control::GameoverController(int code, TPinballComponent* caller) if (code == 66) { - goal_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + goal_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); pb::mode_change(GameModes::GameOver); - flip1->Message2(MessageCode::GameOver, 0.0); - flip2->Message2(MessageCode::GameOver, 0.0); + flip1->Message(MessageCode::GameOver, 0.0); + flip2->Message(MessageCode::GameOver, 0.0); mission_text_box->MessageField = 0; midi::play_track(MidiTracks::Track1, false); return; @@ -3259,7 +3259,7 @@ void control::LaunchTrainingController(int code, TPinballComponent* caller) { if (code == 66) { - lite317->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite317->Message(MessageCode::TLightFlasherStartTimed, 0.0); lite56->MessageField = 3; } else if (code != 67) @@ -3279,7 +3279,7 @@ void control::LaunchTrainingController(int code, TPinballComponent* caller) } else { - lite317->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite317->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 1; MissionControl(66, nullptr); mission_text_box->Display(pb::get_rc_string(Msg::STRING212), 4.0); @@ -3303,9 +3303,9 @@ void control::MaelstromController(int code, TPinballComponent* caller) if (code == 66) { lite56->MessageField = 3; - lite303->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite309->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite315->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite303->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite309->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite315->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -3332,9 +3332,9 @@ void control::MaelstromController(int code, TPinballComponent* caller) } else { - lite303->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite309->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite315->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite303->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite309->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite315->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 25; MissionControl(66, nullptr); } @@ -3349,8 +3349,8 @@ void control::MaelstromPartEightController(int code, TPinballComponent* caller) { if (code == 66) { - lite130->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - lite304->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite130->Message(MessageCode::TLightResetAndTurnOn, 0.0); + lite304->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -3361,8 +3361,8 @@ void control::MaelstromPartEightController(int code, TPinballComponent* caller) } if (kickout2 == caller) { - lite304->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite130->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite304->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite130->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 1; MissionControl(66, nullptr); int addedScore = SpecialAddScore(5000000); @@ -3382,7 +3382,7 @@ void control::MaelstromPartFiveController(int code, TPinballComponent* caller) { if (code == 66) { - lite317->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite317->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -3393,7 +3393,7 @@ void control::MaelstromPartFiveController(int code, TPinballComponent* caller) } if (ramp == caller) { - lite317->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite317->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 29; MissionControl(66, nullptr); } @@ -3406,7 +3406,7 @@ void control::MaelstromPartFourController(int code, TPinballComponent* caller) if (code == 66) { lite56->MessageField = 0; - lite318->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite318->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -3417,7 +3417,7 @@ void control::MaelstromPartFourController(int code, TPinballComponent* caller) } if (roll184 == caller) { - lite318->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite318->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 28; MissionControl(66, nullptr); } @@ -3430,9 +3430,9 @@ void control::MaelstromPartSevenController(int code, TPinballComponent* caller) if (code == 66) { AdvanceWormHoleDestination(1); - sink1->Message2(MessageCode::TSinkUnknown7, 0.0); - sink2->Message2(MessageCode::TSinkUnknown7, 0.0); - sink3->Message2(MessageCode::TSinkUnknown7, 0.0); + sink1->Message(MessageCode::TSinkUnknown7, 0.0); + sink2->Message(MessageCode::TSinkUnknown7, 0.0); + sink3->Message(MessageCode::TSinkUnknown7, 0.0); } else if (code != 67) { @@ -3456,10 +3456,10 @@ void control::MaelstromPartSixController(int code, TPinballComponent* caller) { if (code == 66) { - lite20->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - lite19->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - lite305->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite312->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite20->Message(MessageCode::TLightResetAndTurnOn, 0.0); + lite19->Message(MessageCode::TLightResetAndTurnOn, 0.0); + lite305->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite312->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -3470,12 +3470,12 @@ void control::MaelstromPartSixController(int code, TPinballComponent* caller) } if (flag1 == caller || flag2 == caller) { - lite305->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite312->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite305->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite312->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 30; MissionControl(66, nullptr); - lite20->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite19->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite20->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite19->Message(MessageCode::TLightResetAndTurnOff, 0.0); } } @@ -3488,12 +3488,12 @@ void control::MaelstromPartThreeController(int code, TPinballComponent* caller) if (code == 66) { lite56->MessageField = 5; - lite301->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite302->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite307->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite316->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite320->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite321->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite301->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite302->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite307->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite316->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite320->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite321->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -3522,12 +3522,12 @@ void control::MaelstromPartThreeController(int code, TPinballComponent* caller) } else { - lite301->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite302->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite307->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite316->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite320->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite321->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite301->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite302->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite307->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite316->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite320->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite321->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 27; MissionControl(66, nullptr); } @@ -3543,11 +3543,11 @@ void control::MaelstromPartTwoController(int code, TPinballComponent* caller) if (code == 66) { lite56->MessageField = 3; - lite306->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite308->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite310->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite313->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite319->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite306->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite308->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite310->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite313->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite319->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -3578,11 +3578,11 @@ void control::MaelstromPartTwoController(int code, TPinballComponent* caller) } else { - lite306->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite308->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite310->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite313->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite319->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite306->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite308->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite310->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite313->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite319->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 26; MissionControl(66, nullptr); } @@ -3597,8 +3597,8 @@ void control::PracticeMissionController(int code, TPinballComponent* caller) { if (code == 66) { - lite308->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite311->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite308->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite311->Message(MessageCode::TLightFlasherStartTimed, 0.0); lite56->MessageField = 8; } else if (code != 67) @@ -3622,8 +3622,8 @@ void control::PracticeMissionController(int code, TPinballComponent* caller) } else { - lite308->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite311->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite308->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite311->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 1; MissionControl(66, nullptr); mission_text_box->Display(pb::get_rc_string(Msg::STRING209), 4.0); @@ -3647,12 +3647,12 @@ void control::ReconnaissanceController(int code, TPinballComponent* caller) if (code == 66) { lite56->MessageField = 15; - lite301->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite302->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite307->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite316->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite320->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite321->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite301->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite302->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite307->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite316->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite320->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite321->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -3681,12 +3681,12 @@ void control::ReconnaissanceController(int code, TPinballComponent* caller) } else { - lite301->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite302->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite307->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite316->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite320->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite321->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite301->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite302->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite307->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite316->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite320->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite321->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 1; MissionControl(66, nullptr); mission_text_box->Display(pb::get_rc_string(Msg::STRING237), 4.0); @@ -3710,13 +3710,13 @@ void control::ReentryTrainingController(int code, TPinballComponent* caller) if (code == 66) { lite56->MessageField = 3; - l_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - l_trek_lights->Message2(MessageCode::TLightGroupOffsetAnimationForward, 0.2f); - l_trek_lights->Message2(MessageCode::TLightGroupAnimationBackward, 0.2f); - r_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - r_trek_lights->Message2(MessageCode::TLightGroupOffsetAnimationForward, 0.2f); - r_trek_lights->Message2(MessageCode::TLightGroupAnimationBackward, 0.2f); - lite307->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + l_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + l_trek_lights->Message(MessageCode::TLightGroupOffsetAnimationForward, 0.2f); + l_trek_lights->Message(MessageCode::TLightGroupAnimationBackward, 0.2f); + r_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + r_trek_lights->Message(MessageCode::TLightGroupOffsetAnimationForward, 0.2f); + r_trek_lights->Message(MessageCode::TLightGroupAnimationBackward, 0.2f); + lite307->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -3737,7 +3737,7 @@ void control::ReentryTrainingController(int code, TPinballComponent* caller) } else { - lite307->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite307->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 1; MissionControl(66, nullptr); mission_text_box->Display(pb::get_rc_string(Msg::STRING214), 4.0); @@ -3776,9 +3776,9 @@ void control::RescueMissionController(int code, TPinballComponent* caller) return; } if (light_on(&control_lite303_tag)) - lite303->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite303->Message(MessageCode::TLightResetAndTurnOff, 0.0); if (light_on(&control_lite304_tag)) - lite304->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite304->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 1; MissionControl(66, nullptr); mission_text_box->Display(pb::get_rc_string(Msg::STRING230), 4.0); @@ -3792,8 +3792,8 @@ void control::RescueMissionController(int code, TPinballComponent* caller) break; } case 66: - lite20->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite19->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite20->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite19->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite56->MessageField = 1; break; case 67: @@ -3801,20 +3801,20 @@ void control::RescueMissionController(int code, TPinballComponent* caller) { mission_text_box->Display(pb::get_rc_string(Msg::STRING229), -1.0); if (light_on(&control_lite303_tag)) - lite303->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite303->Message(MessageCode::TLightResetAndTurnOff, 0.0); if (!light_on(&control_lite304_tag)) { - lite304->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite304->Message(MessageCode::TLightFlasherStartTimed, 0.0); } } else { mission_text_box->Display(pb::get_rc_string(Msg::STRING228), -1.0); if (light_on(&control_lite304_tag)) - lite304->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite304->Message(MessageCode::TLightResetAndTurnOff, 0.0); if (!light_on(&control_lite303_tag)) { - lite303->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite303->Message(MessageCode::TLightFlasherStartTimed, 0.0); } } break; @@ -3832,7 +3832,7 @@ void control::SatelliteController(int code, TPinballComponent* caller) if (code == 66) { lite56->MessageField = 3; - lite308->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite308->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -3851,7 +3851,7 @@ void control::SatelliteController(int code, TPinballComponent* caller) } else { - lite308->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite308->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 1; MissionControl(66, nullptr); mission_text_box->Display(pb::get_rc_string(Msg::STRING234), 4.0); @@ -3876,26 +3876,26 @@ void control::ScienceMissionController(int code, TPinballComponent* caller) { lite56->MessageField = 9; target1->MessageField = 0; - target1->Message2(MessageCode::TPopupTargetEnable, 0.0); + target1->Message(MessageCode::TPopupTargetEnable, 0.0); target2->MessageField = 0; - target2->Message2(MessageCode::TPopupTargetEnable, 0.0); + target2->Message(MessageCode::TPopupTargetEnable, 0.0); target3->MessageField = 0; - target3->Message2(MessageCode::TPopupTargetEnable, 0.0); + target3->Message(MessageCode::TPopupTargetEnable, 0.0); target6->MessageField = 0; - target6->Message2(MessageCode::TPopupTargetEnable, 0.0); + target6->Message(MessageCode::TPopupTargetEnable, 0.0); target5->MessageField = 0; - target5->Message2(MessageCode::TPopupTargetEnable, 0.0); + target5->Message(MessageCode::TPopupTargetEnable, 0.0); target4->MessageField = 0; - target4->Message2(MessageCode::TPopupTargetEnable, 0.0); + target4->Message(MessageCode::TPopupTargetEnable, 0.0); target9->MessageField = 0; - target9->Message2(MessageCode::TPopupTargetEnable, 0.0); + target9->Message(MessageCode::TPopupTargetEnable, 0.0); target8->MessageField = 0; - target8->Message2(MessageCode::TPopupTargetEnable, 0.0); + target8->Message(MessageCode::TPopupTargetEnable, 0.0); target7->MessageField = 0; - target7->Message2(MessageCode::TPopupTargetEnable, 0.0); - lite303->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite309->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite315->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + target7->Message(MessageCode::TPopupTargetEnable, 0.0); + lite303->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite309->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite315->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -3922,9 +3922,9 @@ void control::ScienceMissionController(int code, TPinballComponent* caller) } else { - lite303->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite309->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite315->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite303->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite309->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite315->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 1; MissionControl(66, nullptr); mission_text_box->Display(pb::get_rc_string(Msg::STRING216), 4.0); @@ -3947,10 +3947,10 @@ void control::SecretMissionGreenController(int code, TPinballComponent* caller) { if (code == 66) { - lite6->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - lite2->Message2(MessageCode::TLightSetOnStateBmpIndex, 1.0); - lite2->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - lite2->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite6->Message(MessageCode::TLightResetAndTurnOn, 0.0); + lite2->Message(MessageCode::TLightSetOnStateBmpIndex, 1.0); + lite2->Message(MessageCode::TLightResetAndTurnOn, 0.0); + lite2->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -3981,10 +3981,10 @@ void control::SecretMissionRedController(int code, TPinballComponent* caller) { if (code == 66) { - lite5->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - lite4->Message2(MessageCode::TLightSetOnStateBmpIndex, 2.0); - lite4->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - lite4->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite5->Message(MessageCode::TLightResetAndTurnOn, 0.0); + lite4->Message(MessageCode::TLightSetOnStateBmpIndex, 2.0); + lite4->Message(MessageCode::TLightResetAndTurnOn, 0.0); + lite4->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -4006,14 +4006,14 @@ void control::SecretMissionYellowController(int code, TPinballComponent* caller) { if (code == 66) { - worm_hole_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - bsink_arrow_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - bsink_arrow_lights->Message2(MessageCode::TLightSetMessageField, 0.0); - lite110->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite7->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - lite3->Message2(MessageCode::TLightSetOnStateBmpIndex, 0.0); - lite3->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - lite3->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + worm_hole_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + bsink_arrow_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + bsink_arrow_lights->Message(MessageCode::TLightSetMessageField, 0.0); + lite110->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite7->Message(MessageCode::TLightResetAndTurnOn, 0.0); + lite3->Message(MessageCode::TLightSetOnStateBmpIndex, 0.0); + lite3->Message(MessageCode::TLightResetAndTurnOn, 0.0); + lite3->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -4054,17 +4054,17 @@ void control::SelectMissionController(int code, TPinballComponent* caller) { if (ramp == caller && light_on(&control_lite56_tag) - && fuel_bargraph->Message2(MessageCode::TLightGroupGetOnCount, 0.0)) + && fuel_bargraph->Message(MessageCode::TLightGroupGetOnCount, 0.0)) { - lite56->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite198->Message2(MessageCode::TLightResetAndTurnOn, 0.0); - outer_circle->Message2(MessageCode::TLightGroupAnimationBackward, -1.0); + lite56->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite198->Message(MessageCode::TLightResetAndTurnOn, 0.0); + outer_circle->Message(MessageCode::TLightGroupAnimationBackward, -1.0); if (light_on(&control_lite317_tag)) - lite317->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite317->Message(MessageCode::TLightResetAndTurnOff, 0.0); if (light_on(&control_lite318_tag)) - lite318->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite318->Message(MessageCode::TLightResetAndTurnOff, 0.0); if (light_on(&control_lite319_tag)) - lite319->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite319->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = lite56->MessageField; auto scoreId = lite56->MessageField - 2; MissionControl(66, nullptr); @@ -4083,7 +4083,7 @@ void control::SelectMissionController(int code, TPinballComponent* caller) } int missionId; - auto activeCount = middle_circle->Message2(MessageCode::TLightGroupGetOnCount, 0.0); + auto activeCount = middle_circle->Message(MessageCode::TLightGroupGetOnCount, 0.0); switch (activeCount) { case 1: @@ -4179,25 +4179,25 @@ void control::SelectMissionController(int code, TPinballComponent* caller) return; } lite56->MessageField = missionId; - lite56->Message2(MessageCode::TLightFlasherStartTimedThenStayOn, 2.0); - lite198->Message2(MessageCode::TLightFlasherStart, 0.0); + lite56->Message(MessageCode::TLightFlasherStartTimedThenStayOn, 2.0); + lite198->Message(MessageCode::TLightFlasherStart, 0.0); MissionControl(67, caller); return; } case 66: midi::play_track(MidiTracks::Track1, false); - lite198->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - outer_circle->Message2(MessageCode::TLightGroupReset, 0.0); - ramp_tgt_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite198->Message(MessageCode::TLightResetAndTurnOff, 0.0); + outer_circle->Message(MessageCode::TLightGroupReset, 0.0); + ramp_tgt_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite56->MessageField = 0; lite101->MessageField = 0; - l_trek_lights->Message2(MessageCode::TLightGroupReset, 0.0); - l_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - r_trek_lights->Message2(MessageCode::TLightGroupReset, 0.0); - r_trek_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - goal_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - worm_hole_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - bsink_arrow_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + l_trek_lights->Message(MessageCode::TLightGroupReset, 0.0); + l_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + r_trek_lights->Message(MessageCode::TLightGroupReset, 0.0); + r_trek_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + goal_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + worm_hole_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); + bsink_arrow_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); break; case 67: break; @@ -4205,7 +4205,7 @@ void control::SelectMissionController(int code, TPinballComponent* caller) return; } - if (fuel_bargraph->Message2(MessageCode::TLightGroupGetOnCount, 0.0)) + if (fuel_bargraph->Message(MessageCode::TLightGroupGetOnCount, 0.0)) { if (light_on(&control_lite56_tag)) { @@ -4213,22 +4213,22 @@ void control::SelectMissionController(int code, TPinballComponent* caller) snprintf(Buffer, sizeof Buffer, pb::get_rc_string(Msg::STRING207), missionText); mission_text_box->Display(Buffer, -1.0); if (light_on(&control_lite318_tag)) - lite318->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite318->Message(MessageCode::TLightResetAndTurnOff, 0.0); if (light_on(&control_lite319_tag)) - lite319->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite319->Message(MessageCode::TLightResetAndTurnOff, 0.0); if (!light_on(&control_lite317_tag)) - lite317->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite317->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else { mission_text_box->Display(pb::get_rc_string(Msg::STRING205), -1.0); if (light_on(&control_lite317_tag)) - lite317->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite317->Message(MessageCode::TLightResetAndTurnOff, 0.0); if (light_on(&control_lite318_tag)) - lite318->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite318->Message(MessageCode::TLightResetAndTurnOff, 0.0); if (!light_on(&control_lite319_tag)) { - lite319->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite319->Message(MessageCode::TLightFlasherStartTimed, 0.0); } } } @@ -4236,12 +4236,12 @@ void control::SelectMissionController(int code, TPinballComponent* caller) { mission_text_box->Display(pb::get_rc_string(Msg::STRING206), -1.0); if (light_on(&control_lite317_tag)) - lite317->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite317->Message(MessageCode::TLightResetAndTurnOff, 0.0); if (light_on(&control_lite319_tag)) - lite319->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite319->Message(MessageCode::TLightResetAndTurnOff, 0.0); if (!light_on(&control_lite318_tag)) { - lite318->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite318->Message(MessageCode::TLightFlasherStartTimed, 0.0); } } } @@ -4259,8 +4259,8 @@ void control::SpaceRadiationController(int code, TPinballComponent* caller) if (lite104->MessageField == 7) { lite104->MessageField = 15; - bsink_arrow_lights->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite313->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + bsink_arrow_lights->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite313->Message(MessageCode::TLightResetAndTurnOff, 0.0); MissionControl(67, caller); AdvanceWormHoleDestination(1); } @@ -4286,9 +4286,9 @@ void control::SpaceRadiationController(int code, TPinballComponent* caller) { if (code == 66) { - lchute_tgt_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lchute_tgt_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite104->MessageField = 0; - lite313->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite313->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code == 67) { @@ -4314,15 +4314,15 @@ void control::StrayCometController(int code, TPinballComponent* caller) { if (lite107->MessageField == 7) { - lite306->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite304->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite306->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite304->Message(MessageCode::TLightFlasherStartTimed, 0.0); lite107->MessageField = 15; MissionControl(67, caller); } } else if (kickout2 == caller && lite107->MessageField == 15) { - lite304->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite304->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 1; MissionControl(66, nullptr); mission_text_box->Display(pb::get_rc_string(Msg::STRING220), 4.0); @@ -4339,9 +4339,9 @@ void control::StrayCometController(int code, TPinballComponent* caller) { if (code == 66) { - bpr_solotgt_lights->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + bpr_solotgt_lights->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite107->MessageField = 0; - lite306->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite306->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code == 67) { @@ -4364,8 +4364,8 @@ void control::TimeWarpController(int code, TPinballComponent* caller) if (code == 66) { lite56->MessageField = 25; - lite300->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite322->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite300->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite322->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -4387,8 +4387,8 @@ void control::TimeWarpController(int code, TPinballComponent* caller) } else { - lite300->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite322->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite300->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite322->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 24; MissionControl(66, nullptr); } @@ -4403,10 +4403,10 @@ void control::TimeWarpPartTwoController(int code, TPinballComponent* caller) { if (code == 66) { - lite55->Message2(MessageCode::TLightFlasherStartTimed, -1.0); - lite26->Message2(MessageCode::TLightFlasherStartTimed, -1.0); - lite304->Message2(MessageCode::TLightFlasherStartTimed, 0.0); - lite317->Message2(MessageCode::TLightFlasherStartTimed, 0.0); + lite55->Message(MessageCode::TLightFlasherStartTimed, -1.0); + lite26->Message(MessageCode::TLightFlasherStartTimed, -1.0); + lite304->Message(MessageCode::TLightFlasherStartTimed, 0.0); + lite317->Message(MessageCode::TLightFlasherStartTimed, 0.0); } else if (code != 67) { @@ -4418,10 +4418,10 @@ void control::TimeWarpPartTwoController(int code, TPinballComponent* caller) if (kickout2 == caller) { mission_text_box->Display(pb::get_rc_string(Msg::STRING148), 4.0); - if (middle_circle->Message2(MessageCode::TLightGroupGetOnCount, 0.0) > 1) + if (middle_circle->Message(MessageCode::TLightGroupGetOnCount, 0.0) > 1) { - middle_circle->Message2(MessageCode::TLightGroupOffsetAnimationBackward, 5.0); - int rank = middle_circle->Message2(MessageCode::TLightGroupGetOnCount, 0.0); + middle_circle->Message(MessageCode::TLightGroupOffsetAnimationBackward, 5.0); + int rank = middle_circle->Message(MessageCode::TLightGroupGetOnCount, 0.0); snprintf(Buffer, sizeof Buffer, pb::get_rc_string(Msg::STRING274), pb::get_rc_string(RankRcArray[rank - 1])); mission_text_box->Display(Buffer, 8.0); } @@ -4431,10 +4431,10 @@ void control::TimeWarpPartTwoController(int code, TPinballComponent* caller) if (ramp != caller) return; mission_text_box->Display(pb::get_rc_string(Msg::STRING147), 4.0); - if (middle_circle->Message2(MessageCode::TLightGroupGetOnCount, 0.0) < 9) + if (middle_circle->Message(MessageCode::TLightGroupGetOnCount, 0.0) < 9) { - int rank = middle_circle->Message2(MessageCode::TLightGroupGetOnCount, 0.0); - middle_circle->Message2(MessageCode::TLightGroupResetAndTurnOn, 5.0); + int rank = middle_circle->Message(MessageCode::TLightGroupGetOnCount, 0.0); + middle_circle->Message(MessageCode::TLightGroupResetAndTurnOn, 5.0); snprintf(Buffer, sizeof Buffer, pb::get_rc_string(Msg::STRING273), pb::get_rc_string(RankRcArray[rank])); } if (!AddRankProgress(12)) @@ -4444,10 +4444,10 @@ void control::TimeWarpPartTwoController(int code, TPinballComponent* caller) } } SpecialAddScore(2000000); - lite55->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite26->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite304->Message2(MessageCode::TLightResetAndTurnOff, 0.0); - lite317->Message2(MessageCode::TLightResetAndTurnOff, 0.0); + lite55->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite26->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite304->Message(MessageCode::TLightResetAndTurnOff, 0.0); + lite317->Message(MessageCode::TLightResetAndTurnOff, 0.0); lite198->MessageField = 1; MissionControl(66, nullptr); // SpecialAddScore sets the score dirty flag. So next tick it will be redrawn. diff --git a/SpaceCadetPinball/pb.cpp b/SpaceCadetPinball/pb.cpp index 00be232..983ff34 100644 --- a/SpaceCadetPinball/pb.cpp +++ b/SpaceCadetPinball/pb.cpp @@ -170,7 +170,7 @@ void pb::SelectDatFile(const std::vector& dataSearchPaths) void pb::reset_table() { if (MainTable) - MainTable->Message2(MessageCode::Reset, 0.0); + MainTable->Message(MessageCode::Reset, 0.0); } @@ -215,7 +215,7 @@ void pb::mode_change(GameModes mode) winmain::DemoActive = false; } if (MainTable && MainTable->LightGroup) - MainTable->LightGroup->Message2(MessageCode::TLightGroupGameOverAnimation, 1.4f); + MainTable->LightGroup->Message(MessageCode::TLightGroupGameOverAnimation, 1.4f); break; } game_mode = mode; @@ -226,7 +226,7 @@ void pb::toggle_demo() if (demo_mode) { demo_mode = false; - MainTable->Message2(MessageCode::Reset, 0.0); + MainTable->Message(MessageCode::Reset, 0.0); mode_change(GameModes::GameOver); MissTextBox->Clear(); InfoTextBox->Display(get_rc_string(Msg::STRING125), -1.0); @@ -243,7 +243,7 @@ void pb::replay_level(bool demoMode) mode_change(GameModes::InGame); if (options::Options.Music) midi::music_play(); - MainTable->Message2(MessageCode::NewGame, static_cast(options::Options.Players)); + MainTable->Message(MessageCode::NewGame, static_cast(options::Options.Players)); } void pb::ballset(float dx, float dy) @@ -374,7 +374,7 @@ void pb::pause_continue() if (winmain::single_step) { if (MainTable) - MainTable->Message2(MessageCode::Pause, time_now); + MainTable->Message(MessageCode::Pause, time_now); InfoTextBox->Display(get_rc_string(Msg::STRING123), -1.0); midi::music_stop(); Sound::Deactivate(); @@ -382,7 +382,7 @@ void pb::pause_continue() else { if (MainTable) - MainTable->Message2(MessageCode::Resume, 0.0); + MainTable->Message(MessageCode::Resume, 0.0); if (!demo_mode) { const char* text; @@ -408,7 +408,7 @@ void pb::pause_continue() void pb::loose_focus() { if (MainTable) - MainTable->Message2(MessageCode::LooseFocus, time_now); + MainTable->Message(MessageCode::LooseFocus, time_now); } void pb::InputUp(GameInput input) @@ -418,15 +418,15 @@ void pb::InputUp(GameInput input) if (AnyBindingMatchesInput(options::Options.Key.LeftFlipper, input)) { - MainTable->Message2(MessageCode::LeftFlipperInputReleased, time_now); + MainTable->Message(MessageCode::LeftFlipperInputReleased, time_now); } if (AnyBindingMatchesInput(options::Options.Key.RightFlipper, input)) { - MainTable->Message2(MessageCode::RightFlipperInputReleased, time_now); + MainTable->Message(MessageCode::RightFlipperInputReleased, time_now); } if (AnyBindingMatchesInput(options::Options.Key.Plunger, input)) { - MainTable->Message2(MessageCode::PlungerInputReleased, time_now); + MainTable->Message(MessageCode::PlungerInputReleased, time_now); } if (AnyBindingMatchesInput(options::Options.Key.LeftTableBump, input)) { @@ -453,15 +453,15 @@ void pb::InputDown(GameInput input) if (AnyBindingMatchesInput(options::Options.Key.LeftFlipper, input)) { - MainTable->Message2(MessageCode::LeftFlipperInputPressed, time_now); + MainTable->Message(MessageCode::LeftFlipperInputPressed, time_now); } if (AnyBindingMatchesInput(options::Options.Key.RightFlipper, input)) { - MainTable->Message2(MessageCode::RightFlipperInputPressed, time_now); + MainTable->Message(MessageCode::RightFlipperInputPressed, time_now); } if (AnyBindingMatchesInput(options::Options.Key.Plunger, input)) { - MainTable->Message2(MessageCode::PlungerInputPressed, time_now); + MainTable->Message(MessageCode::PlungerInputPressed, time_now); } if (AnyBindingMatchesInput(options::Options.Key.LeftTableBump, input)) { @@ -504,10 +504,10 @@ void pb::InputDown(GameInput input) MainTable->port_draw(); break; case 'i': - MainTable->LightGroup->Message2(MessageCode::TLightFtTmpOverrideOn, 1.0f); + MainTable->LightGroup->Message(MessageCode::TLightFtTmpOverrideOn, 1.0f); break; case 'j': - MainTable->LightGroup->Message2(MessageCode::TLightFtTmpOverrideOff, 1.0f); + MainTable->LightGroup->Message(MessageCode::TLightFtTmpOverrideOff, 1.0f); break; } } @@ -515,7 +515,7 @@ void pb::InputDown(GameInput input) void pb::launch_ball() { - MainTable->Plunger->Message2(MessageCode::PlungerLaunchBall, 0.0f); + MainTable->Plunger->Message(MessageCode::PlungerLaunchBall, 0.0f); } void pb::end_game()