diff --git a/SpaceCadetPinball/SpaceCadetPinball.cpp b/SpaceCadetPinball/SpaceCadetPinball.cpp index a31a780..6654938 100644 --- a/SpaceCadetPinball/SpaceCadetPinball.cpp +++ b/SpaceCadetPinball/SpaceCadetPinball.cpp @@ -26,6 +26,8 @@ int main() auto dib = gdrv::DibCreate(8, 1, 1); gdrv::DibSetUsage(dib, 0, 1); + render::init(0, 1, 2, 800, 600); + objlist_class d = objlist_class(2, 4); for (int i = 0; i < 100; i++) { diff --git a/SpaceCadetPinball/SpaceCadetPinball.vcxproj b/SpaceCadetPinball/SpaceCadetPinball.vcxproj index ccbfe7e..fbbd5a2 100644 --- a/SpaceCadetPinball/SpaceCadetPinball.vcxproj +++ b/SpaceCadetPinball/SpaceCadetPinball.vcxproj @@ -203,6 +203,7 @@ + @@ -263,6 +264,7 @@ + diff --git a/SpaceCadetPinball/SpaceCadetPinball.vcxproj.filters b/SpaceCadetPinball/SpaceCadetPinball.vcxproj.filters index 08f0e7d..52e0826 100644 --- a/SpaceCadetPinball/SpaceCadetPinball.vcxproj.filters +++ b/SpaceCadetPinball/SpaceCadetPinball.vcxproj.filters @@ -13,12 +13,6 @@ {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - {9ee086c2-1a95-48fb-92d8-4b7e7f6682ff} - - - {33813da8-81ac-449c-b19a-9756272519b9} - {0aa40751-a44a-400e-8809-ee817161e8e0} @@ -31,6 +25,12 @@ {7ed2796a-da4b-4edd-8783-53e45d8d1c88} + + {9ee086c2-1a95-48fb-92d8-4b7e7f6682ff} + + + {33813da8-81ac-449c-b19a-9756272519b9} + @@ -54,101 +54,38 @@ Header Files - - Header Files\PinballComponents - - - Header Files\PinballComponents - - Header Files\PinballComponents - - - Header Files\PinballComponents - - - Header Files\PinballComponents + Header Files\TPinballComponent - Header Files\PinballComponents + Header Files\TPinballComponent Header Files - - Header Files\PinballComponents - - - Header Files\PinballComponents - - Header Files\PinballComponents - - - Header Files\PinballComponents - - - Header Files\PinballComponents - - - Header Files\PinballComponents - - - Header Files\PinballComponents - - - Header Files\PinballComponents - - - Header Files\PinballComponents + Header Files\TPinballComponent - Header Files\PinballComponents + Header Files\TPinballComponent - Header Files\PinballComponents + Header Files\TPinballComponent - Header Files\PinballComponents - - - Header Files\PinballComponents - - - Header Files\PinballComponents - - - Header Files\PinballComponents - - - Header Files\PinballComponents - - - Header Files\PinballComponents - - - Header Files\PinballComponents - - - Header Files\PinballComponents + Header Files\TPinballComponent - Header Files\PinballComponents - - - Header Files\PinballComponents + Header Files\TPinballComponent - Header Files\PinballComponents + Header Files\TPinballComponent - Header Files\PinballComponents - - - Header Files\PinballComponents + Header Files\TPinballComponent - Header Files\PinballComponents + Header Files\TPinballComponent Header Files @@ -192,6 +129,72 @@ Header Files\TEdgeSegment + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + + + Header Files\TPinballComponent + + + Header Files\TCollisionComponent + + + Header Files\TCollisionComponent + @@ -218,95 +221,35 @@ Source Files - - Source Files\PinballComponents - - - Source Files\PinballComponents - - Source Files\PinballComponents + Source Files\TPinballComponent - Source Files\PinballComponents - - - Source Files\PinballComponents + Source Files\TPinballComponent - Source Files\PinballComponents - - - Source Files\PinballComponents - - - Source Files\PinballComponents + Source Files\TPinballComponent - Source Files\PinballComponents - - - Source Files\PinballComponents - - - Source Files\PinballComponents - - - Source Files\PinballComponents - - - Source Files\PinballComponents - - - Source Files\PinballComponents - - - Source Files\PinballComponents + Source Files\TPinballComponent - Source Files\PinballComponents + Source Files\TPinballComponent - Source Files\PinballComponents + Source Files\TPinballComponent - Source Files\PinballComponents - - - Source Files\PinballComponents - - - Source Files\PinballComponents - - - Source Files\PinballComponents - - - Source Files\PinballComponents - - - Source Files\PinballComponents - - - Source Files\PinballComponents - - - Source Files\PinballComponents + Source Files\TPinballComponent - Source Files\PinballComponents - - - Source Files\PinballComponents + Source Files\TPinballComponent - Source Files\PinballComponents + Source Files\TPinballComponent - Source Files\PinballComponents - - - Source Files\PinballComponents + Source Files\TPinballComponent Source Files @@ -350,6 +293,69 @@ Source Files\TEdgeSegment + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + + + Source Files\TCollisionComponent + diff --git a/SpaceCadetPinball/TBlocker.h b/SpaceCadetPinball/TBlocker.h index ba82ab9..a8f97ec 100644 --- a/SpaceCadetPinball/TBlocker.h +++ b/SpaceCadetPinball/TBlocker.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" + class TBlocker : - public TPinballComponent + public TCollisionComponent { public: - TBlocker(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TBlocker(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { } }; - diff --git a/SpaceCadetPinball/TBumper.h b/SpaceCadetPinball/TBumper.h index 4667158..ecda7f7 100644 --- a/SpaceCadetPinball/TBumper.h +++ b/SpaceCadetPinball/TBumper.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" + class TBumper : - public TPinballComponent + public TCollisionComponent { public: - TBumper(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TBumper(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { } }; - diff --git a/SpaceCadetPinball/TCollisionComponent.cpp b/SpaceCadetPinball/TCollisionComponent.cpp index 4115f0c..1dc273e 100644 --- a/SpaceCadetPinball/TCollisionComponent.cpp +++ b/SpaceCadetPinball/TCollisionComponent.cpp @@ -5,7 +5,7 @@ #include "TPinballTable.h" -TCollisionComponent::TCollisionComponent(TPinballTable* table, int groupIndex, int someFlag) : TPinballComponent( +TCollisionComponent::TCollisionComponent(TPinballTable* table, int groupIndex, bool createWall) : TPinballComponent( table, groupIndex, true) { visualStruct visual{}; @@ -21,9 +21,9 @@ TCollisionComponent::TCollisionComponent(TPinballTable* table, int groupIndex, i else { loader::query_visual(groupIndex, 0, &visual); - if (someFlag) + if (createWall) { - float offset = table->UnknownP61F; + float offset = table->CollisionCompOffset; float* floatArr = loader::query_float_attribute(groupIndex, 0, 600); TEdgeSegment::install_wall(floatArr, this, &UnknownBaseFlag2, visual.Flag, offset, 0); } diff --git a/SpaceCadetPinball/TCollisionComponent.h b/SpaceCadetPinball/TCollisionComponent.h index 77c4bd7..b31b30d 100644 --- a/SpaceCadetPinball/TCollisionComponent.h +++ b/SpaceCadetPinball/TCollisionComponent.h @@ -15,6 +15,6 @@ public: int SoundIndex2; int SoundIndex1; - TCollisionComponent(TPinballTable* table, int groupIndex, int someFlag); + TCollisionComponent(TPinballTable* table, int groupIndex, bool createWall); ~TCollisionComponent(); }; diff --git a/SpaceCadetPinball/TDemo.h b/SpaceCadetPinball/TDemo.h index 8e79156..d848cf0 100644 --- a/SpaceCadetPinball/TDemo.h +++ b/SpaceCadetPinball/TDemo.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" + class TDemo : - public TPinballComponent + public TCollisionComponent { public: - TDemo(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TDemo(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, false) { } }; - diff --git a/SpaceCadetPinball/TDrain.h b/SpaceCadetPinball/TDrain.h index f8885a0..5e530ee 100644 --- a/SpaceCadetPinball/TDrain.h +++ b/SpaceCadetPinball/TDrain.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" + class TDrain : - public TPinballComponent + public TCollisionComponent { public: - TDrain(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TDrain(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { } }; - diff --git a/SpaceCadetPinball/TEdgeSegment.cpp b/SpaceCadetPinball/TEdgeSegment.cpp index 6708d8a..8669db5 100644 --- a/SpaceCadetPinball/TEdgeSegment.cpp +++ b/SpaceCadetPinball/TEdgeSegment.cpp @@ -16,18 +16,18 @@ TEdgeSegment* TEdgeSegment::install_wall(float* floatArr, TCollisionComponent* c float offset, int someValue) { vector_type center{}, start{}, end{}, prevCenter{}, vec1{}, vec2{}, dstVec{}; - TEdgeSegment* edge1; + TEdgeSegment* edge = nullptr; - wall_type wallType = static_cast(static_cast(floor(*floatArr) - 1.0)); + wall_type wallType = static_cast(static_cast(floor(*floatArr) - 1.0f)); switch (wallType) { case wall_type::Circle: { center.X = floatArr[1]; center.Y = floatArr[2]; - auto radius = offset + floatArr[3]; auto circle = new TCircle(collComp, flagPtr, visual_flag, ¢er, radius); + edge = circle; if (circle) { @@ -36,7 +36,7 @@ TEdgeSegment* TEdgeSegment::install_wall(float* floatArr, TCollisionComponent* c } collComp->EdgeList->Add(circle); - return circle; + break; } case wall_type::Line: { @@ -44,8 +44,8 @@ TEdgeSegment* TEdgeSegment::install_wall(float* floatArr, TCollisionComponent* c start.Y = floatArr[2]; end.X = floatArr[3]; end.Y = floatArr[4]; - auto line = new TLine(collComp, flagPtr, visual_flag, &start, &end); + edge = line; if (line) { @@ -54,7 +54,7 @@ TEdgeSegment* TEdgeSegment::install_wall(float* floatArr, TCollisionComponent* c line->place_in_grid(); collComp->EdgeList->Add(line); } - return line; + break; } default: { @@ -91,7 +91,7 @@ TEdgeSegment* TEdgeSegment::install_wall(float* floatArr, TCollisionComponent* c if (dstVec.Z > 0.0 && offset > 0.0 || dstVec.Z < 0.0 && offset < 0.0) { - auto radius = offset * 1.001; + float radius = offset * 1.001f; auto circle = new TCircle(collComp, flagPtr, visual_flag, ¢er, radius); if (circle) @@ -108,6 +108,8 @@ TEdgeSegment* TEdgeSegment::install_wall(float* floatArr, TCollisionComponent* c end.X = floatArrPtr[2]; end.Y = floatArrPtr[3]; auto line = new TLine(collComp, flagPtr, visual_flag, &start, &end); + edge = line; + if (line) { line->WallValue = someValue; @@ -121,5 +123,5 @@ TEdgeSegment* TEdgeSegment::install_wall(float* floatArr, TCollisionComponent* c } } - return nullptr; + return edge; } diff --git a/SpaceCadetPinball/TEdgeSegment.h b/SpaceCadetPinball/TEdgeSegment.h index 8d45078..e652f7c 100644 --- a/SpaceCadetPinball/TEdgeSegment.h +++ b/SpaceCadetPinball/TEdgeSegment.h @@ -3,7 +3,7 @@ #include "maths.h" #include "TBall.h" -enum class wall_type +enum class wall_type : int { Circle = 0, Line = 1, diff --git a/SpaceCadetPinball/TFlagSpinner.h b/SpaceCadetPinball/TFlagSpinner.h index f9a52f6..06f98ba 100644 --- a/SpaceCadetPinball/TFlagSpinner.h +++ b/SpaceCadetPinball/TFlagSpinner.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" + class TFlagSpinner : - public TPinballComponent + public TCollisionComponent { public: - TFlagSpinner(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TFlagSpinner(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, false) { } }; - diff --git a/SpaceCadetPinball/TFlipper.h b/SpaceCadetPinball/TFlipper.h index ba53225..ebd59bd 100644 --- a/SpaceCadetPinball/TFlipper.h +++ b/SpaceCadetPinball/TFlipper.h @@ -1,12 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" class TFlipper : - public TPinballComponent + public TCollisionComponent { public: - TFlipper(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TFlipper(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, false) { } }; - diff --git a/SpaceCadetPinball/TGate.h b/SpaceCadetPinball/TGate.h index b89f084..ac762f2 100644 --- a/SpaceCadetPinball/TGate.h +++ b/SpaceCadetPinball/TGate.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" + class TGate : - public TPinballComponent + public TCollisionComponent { public: - TGate(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TGate(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { } }; - diff --git a/SpaceCadetPinball/THole.h b/SpaceCadetPinball/THole.h index 7d34ab9..abfe91a 100644 --- a/SpaceCadetPinball/THole.h +++ b/SpaceCadetPinball/THole.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" + class THole : - public TPinballComponent + public TCollisionComponent { public: - THole(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + THole(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, false) { } }; - diff --git a/SpaceCadetPinball/TKickback.h b/SpaceCadetPinball/TKickback.h index 25c8a99..4e72835 100644 --- a/SpaceCadetPinball/TKickback.h +++ b/SpaceCadetPinball/TKickback.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" + class TKickback : - public TPinballComponent + public TCollisionComponent { public: - TKickback(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TKickback(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { } }; - diff --git a/SpaceCadetPinball/TKickout.h b/SpaceCadetPinball/TKickout.h index 04b4d95..d77512b 100644 --- a/SpaceCadetPinball/TKickout.h +++ b/SpaceCadetPinball/TKickout.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" + class TKickout : - public TPinballComponent + public TCollisionComponent { public: - TKickout(TPinballTable* table, int groupIndex,int vectorType) : TPinballComponent(table, groupIndex, false) + TKickout(TPinballTable* table, int groupIndex, int vectorType) : TCollisionComponent(table, groupIndex, false) { } }; - diff --git a/SpaceCadetPinball/TLightBargraph.h b/SpaceCadetPinball/TLightBargraph.h index e042eb2..d8fd59a 100644 --- a/SpaceCadetPinball/TLightBargraph.h +++ b/SpaceCadetPinball/TLightBargraph.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TLightGroup.h" + class TLightBargraph : - public TPinballComponent + public TLightGroup { public: - TLightBargraph(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TLightBargraph(TPinballTable* table, int groupIndex) : TLightGroup(table, groupIndex) { } }; - diff --git a/SpaceCadetPinball/TLightRollover.h b/SpaceCadetPinball/TLightRollover.h index 07c21a3..886e1ac 100644 --- a/SpaceCadetPinball/TLightRollover.h +++ b/SpaceCadetPinball/TLightRollover.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TRollover.h" + class TLightRollover : - public TPinballComponent + public TRollover { public: - TLightRollover(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TLightRollover(TPinballTable* table, int groupIndex) : TRollover(table, groupIndex) { } }; - diff --git a/SpaceCadetPinball/TOneway.h b/SpaceCadetPinball/TOneway.h index 75884af..fa20778 100644 --- a/SpaceCadetPinball/TOneway.h +++ b/SpaceCadetPinball/TOneway.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" + class TOneway : - public TPinballComponent + public TCollisionComponent { public: - TOneway(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TOneway(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, false) { } }; - diff --git a/SpaceCadetPinball/TPinballTable.cpp b/SpaceCadetPinball/TPinballTable.cpp index 8a87c05..c64ebf2 100644 --- a/SpaceCadetPinball/TPinballTable.cpp +++ b/SpaceCadetPinball/TPinballTable.cpp @@ -30,6 +30,7 @@ #include "TTextBox.h" #include "TTimer.h" #include "TTripwire.h" +#include "TWall.h" TPinballTable::TPinballTable(): TPinballComponent(nullptr, -1, false) { @@ -88,7 +89,7 @@ TPinballTable::TPinballTable(): TPinballComponent(nullptr, -1, false) { case 1000: case 1010: - // auto wall = new TWall( this, groupIndex); + new TWall( this, groupIndex); break; case 1001: this->Plunger = new TPlunger(this, groupIndex); diff --git a/SpaceCadetPinball/TPinballTable.h b/SpaceCadetPinball/TPinballTable.h index 8b3cc74..2b648b1 100644 --- a/SpaceCadetPinball/TPinballTable.h +++ b/SpaceCadetPinball/TPinballTable.h @@ -73,7 +73,7 @@ public: int UnknownP58; int UnknownP59; int UnknownP60; - float UnknownP61F; + float CollisionCompOffset; int UnknownP62; int UnknownP63; int UnknownP64; diff --git a/SpaceCadetPinball/TPlunger.h b/SpaceCadetPinball/TPlunger.h index 3d917de..bd7ae7a 100644 --- a/SpaceCadetPinball/TPlunger.h +++ b/SpaceCadetPinball/TPlunger.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" class TPlunger : - public TPinballComponent + public TCollisionComponent { public: - TPlunger(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TPlunger(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { } }; diff --git a/SpaceCadetPinball/TPopupTarget.h b/SpaceCadetPinball/TPopupTarget.h index 3793d4f..13f1e71 100644 --- a/SpaceCadetPinball/TPopupTarget.h +++ b/SpaceCadetPinball/TPopupTarget.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" + class TPopupTarget : - public TPinballComponent + public TCollisionComponent { public: - TPopupTarget(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TPopupTarget(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { } }; - diff --git a/SpaceCadetPinball/TRamp.h b/SpaceCadetPinball/TRamp.h index 29c9249..bf57c9f 100644 --- a/SpaceCadetPinball/TRamp.h +++ b/SpaceCadetPinball/TRamp.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" + class TRamp : - public TPinballComponent + public TCollisionComponent { public: - TRamp(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TRamp(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, false) { } }; - diff --git a/SpaceCadetPinball/TRollover.h b/SpaceCadetPinball/TRollover.h index b2e5859..cf993a5 100644 --- a/SpaceCadetPinball/TRollover.h +++ b/SpaceCadetPinball/TRollover.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" + class TRollover : - public TPinballComponent + public TCollisionComponent { public: - TRollover(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TRollover(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { } }; - diff --git a/SpaceCadetPinball/TSink.h b/SpaceCadetPinball/TSink.h index c4b007a..38fe23b 100644 --- a/SpaceCadetPinball/TSink.h +++ b/SpaceCadetPinball/TSink.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" + class TSink : - public TPinballComponent + public TCollisionComponent { public: - TSink(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TSink(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { } }; - diff --git a/SpaceCadetPinball/TSoloTarget.h b/SpaceCadetPinball/TSoloTarget.h index c290ef6..07cd27e 100644 --- a/SpaceCadetPinball/TSoloTarget.h +++ b/SpaceCadetPinball/TSoloTarget.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" + class TSoloTarget : - public TPinballComponent + public TCollisionComponent { public: - TSoloTarget(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TSoloTarget(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) { } }; - diff --git a/SpaceCadetPinball/TTableLayer.h b/SpaceCadetPinball/TTableLayer.h index 7ed6e70..70ba35c 100644 --- a/SpaceCadetPinball/TTableLayer.h +++ b/SpaceCadetPinball/TTableLayer.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TCollisionComponent.h" + class TTableLayer : - public TPinballComponent + public TCollisionComponent { public: - TTableLayer(TPinballTable* table) : TPinballComponent(table, -1, false) + TTableLayer(TPinballTable* table) : TCollisionComponent(table, -1, false) { } }; - diff --git a/SpaceCadetPinball/TTripwire.h b/SpaceCadetPinball/TTripwire.h index f000939..3b156e3 100644 --- a/SpaceCadetPinball/TTripwire.h +++ b/SpaceCadetPinball/TTripwire.h @@ -1,11 +1,11 @@ #pragma once -#include "TPinballComponent.h" +#include "TRollover.h" + class TTripwire : - public TPinballComponent + public TRollover { public: - TTripwire(TPinballTable* table, int groupIndex) : TPinballComponent(table, groupIndex, false) + TTripwire(TPinballTable* table, int groupIndex) : TRollover(table, groupIndex) { } }; - diff --git a/SpaceCadetPinball/TWall.cpp b/SpaceCadetPinball/TWall.cpp new file mode 100644 index 0000000..0d082dd --- /dev/null +++ b/SpaceCadetPinball/TWall.cpp @@ -0,0 +1,2 @@ +#include "pch.h" +#include "TWall.h" diff --git a/SpaceCadetPinball/TWall.h b/SpaceCadetPinball/TWall.h new file mode 100644 index 0000000..8913f1b --- /dev/null +++ b/SpaceCadetPinball/TWall.h @@ -0,0 +1,11 @@ +#pragma once +#include "TCollisionComponent.h" + +class TWall : + public TCollisionComponent +{ +public: + TWall(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, true) + { + } +}; diff --git a/SpaceCadetPinball/TZmapList.h b/SpaceCadetPinball/TZmapList.h index fdb970d..764ded4 100644 --- a/SpaceCadetPinball/TZmapList.h +++ b/SpaceCadetPinball/TZmapList.h @@ -1,10 +1,15 @@ #pragma once #include "objlist_class.h" -class TZmapList : - public objlist_class + +class TZmapList : // TImageList, template? + public objlist_class { public: - TZmapList(int SizeInt, int growSize):objlist_class(SizeInt,growSize){}; - ~TZmapList(){}; -}; + TZmapList(int SizeInt, int growSize): objlist_class(SizeInt, growSize) + { + }; + ~TZmapList() + { + }; +};