From 261457a95909bf297f55eafdd33bd4cf4f6fda5a Mon Sep 17 00:00:00 2001 From: Muzychenko Andrey <33288308+k4zmu2a@users.noreply.github.com> Date: Sat, 2 Oct 2021 18:58:54 +0300 Subject: [PATCH] TPinballComponent: replaced calloc operator new with member initialization. --- SpaceCadetPinball/TBall.h | 15 +++--- SpaceCadetPinball/TBumper.h | 4 +- SpaceCadetPinball/TCircle.h | 2 +- SpaceCadetPinball/TEdgeManager.h | 2 +- SpaceCadetPinball/TEdgeSegment.h | 2 +- SpaceCadetPinball/TFlagSpinner.h | 8 +-- SpaceCadetPinball/TFlipper.h | 6 +-- SpaceCadetPinball/TFlipperEdge.h | 24 ++++----- SpaceCadetPinball/THole.h | 6 +-- SpaceCadetPinball/TKickback.cpp | 14 ++--- SpaceCadetPinball/TKickback.h | 2 +- SpaceCadetPinball/TKickout.h | 12 ++--- SpaceCadetPinball/TLight.h | 19 ++++--- SpaceCadetPinball/TLightBargraph.h | 6 +-- SpaceCadetPinball/TLightGroup.cpp | 4 -- SpaceCadetPinball/TLightGroup.h | 10 ++-- SpaceCadetPinball/TLine.h | 2 +- SpaceCadetPinball/TOneway.h | 2 +- SpaceCadetPinball/TPinballComponent.cpp | 10 ---- SpaceCadetPinball/TPinballComponent.h | 3 -- SpaceCadetPinball/TPinballTable.h | 68 ++++++++++++------------- SpaceCadetPinball/TPopupTarget.h | 4 +- SpaceCadetPinball/TRamp.h | 4 +- SpaceCadetPinball/TRollover.cpp | 1 - SpaceCadetPinball/TRollover.h | 4 +- SpaceCadetPinball/TSink.h | 8 +-- SpaceCadetPinball/TSoloTarget.h | 5 +- SpaceCadetPinball/TTableLayer.h | 3 +- SpaceCadetPinball/TWall.cpp | 1 - SpaceCadetPinball/TWall.h | 10 ++-- 30 files changed, 119 insertions(+), 142 deletions(-) diff --git a/SpaceCadetPinball/TBall.h b/SpaceCadetPinball/TBall.h index 74f117b..421610c 100644 --- a/SpaceCadetPinball/TBall.h +++ b/SpaceCadetPinball/TBall.h @@ -17,21 +17,20 @@ public : static void throw_ball(TBall* ball, struct vector_type* acceleration, float angleMult, float speedMult1, float speedMult2); - vector_type Position; - vector_type Acceleration; + vector_type Position{}; + vector_type Acceleration{}; float Speed; float RayMaxDistance; float TimeDelta; float TimeNow; - vector_type InvAcceleration; - vector_type RampFieldForce; + vector_type InvAcceleration{}; + vector_type RampFieldForce{}; TCollisionComponent* CollisionComp; int FieldFlag; - TEdgeSegment* Collisions[5]; + TEdgeSegment* Collisions[5]{}; int EdgeCollisionCount; - vector_type CollisionOffset; + vector_type CollisionOffset{}; int CollisionFlag; float Offset; - int Unknown29; - float VisualZArray[50]; + float VisualZArray[50]{}; }; diff --git a/SpaceCadetPinball/TBumper.h b/SpaceCadetPinball/TBumper.h index 59325b2..24705f9 100644 --- a/SpaceCadetPinball/TBumper.h +++ b/SpaceCadetPinball/TBumper.h @@ -28,6 +28,6 @@ public: float OriginalThreshold; int SoundIndex4; int SoundIndex3; - int Scores[4]; - TBumper_player_backup PlayerData[4]; + int Scores[4]{}; + TBumper_player_backup PlayerData[4]{}; }; diff --git a/SpaceCadetPinball/TCircle.h b/SpaceCadetPinball/TCircle.h index d2b4cfb..8e1cdee 100644 --- a/SpaceCadetPinball/TCircle.h +++ b/SpaceCadetPinball/TCircle.h @@ -6,7 +6,7 @@ class TCircle : public TEdgeSegment { public: - circle_type Circle; + circle_type Circle{}; TCircle(TCollisionComponent* collComp, char* activeFlag, unsigned int collisionGroup, vector_type* center, float radius); diff --git a/SpaceCadetPinball/TEdgeManager.h b/SpaceCadetPinball/TEdgeManager.h index 00fb1b2..5e1b482 100644 --- a/SpaceCadetPinball/TEdgeManager.h +++ b/SpaceCadetPinball/TEdgeManager.h @@ -35,5 +35,5 @@ public: float X; float Y; TEdgeBox* BoxArray; - TEdgeSegment* EdgeArray[1000]; + TEdgeSegment* EdgeArray[1000]{}; }; diff --git a/SpaceCadetPinball/TEdgeSegment.h b/SpaceCadetPinball/TEdgeSegment.h index b54d9de..d68f526 100644 --- a/SpaceCadetPinball/TEdgeSegment.h +++ b/SpaceCadetPinball/TEdgeSegment.h @@ -16,7 +16,7 @@ public: TCollisionComponent* CollisionComponent; char* ActiveFlag; char ProcessedFlag; - void* WallValue; + void* WallValue{}; unsigned int CollisionGroup; TEdgeSegment(TCollisionComponent* collComp, char* activeFlag, unsigned int collisionGroup); diff --git a/SpaceCadetPinball/TFlagSpinner.h b/SpaceCadetPinball/TFlagSpinner.h index b47632e..dbf5e52 100644 --- a/SpaceCadetPinball/TFlagSpinner.h +++ b/SpaceCadetPinball/TFlagSpinner.h @@ -15,14 +15,14 @@ public: static void SpinTimer(int timerId, void* caller); - float Speed; + float Speed{}; float MaxSpeed; float MinSpeed; float SpeedDecrement; - int SpinDirection; - int BmpIndex; + int SpinDirection{}; + int BmpIndex{}; int Timer; TEdgeSegment* PrevCollider; - int Scores[2]; + int Scores[2]{}; }; diff --git a/SpaceCadetPinball/TFlipper.h b/SpaceCadetPinball/TFlipper.h index 1f830d2..d176d8f 100644 --- a/SpaceCadetPinball/TFlipper.h +++ b/SpaceCadetPinball/TFlipper.h @@ -19,8 +19,8 @@ public: int BmpIndex; TFlipperEdge* FlipperEdge; int Timer; - float BmpCoef1; - float BmpCoef2; - float TimerTime; + float BmpCoef1{}; + float BmpCoef2{}; + float TimerTime{}; float InputTime; }; diff --git a/SpaceCadetPinball/TFlipperEdge.h b/SpaceCadetPinball/TFlipperEdge.h index b874a25..6a8d35c 100644 --- a/SpaceCadetPinball/TFlipperEdge.h +++ b/SpaceCadetPinball/TFlipperEdge.h @@ -23,7 +23,7 @@ public: int FlipperFlag; float Elasticity; float Smoothness; - vector_type RotOrigin; + vector_type RotOrigin{}; float CirclebaseRadius; float CircleT1Radius; float CirclebaseRadiusSq; @@ -31,28 +31,28 @@ public: float CirclebaseRadiusMSq; float CircleT1RadiusMSq; float AngleMax; - float Angle2; + float Angle2{}; float Angle1; int CollisionFlag1; - int CollisionFlag2; - vector_type CollisionLinePerp; - vector_type A1Src; - vector_type A2Src; - vector_type B1Src; - vector_type B2Src; + int CollisionFlag2{}; + vector_type CollisionLinePerp{}; + vector_type A1Src{}; + vector_type A2Src{}; + vector_type B1Src{}; + vector_type B2Src{}; float CollisionMult; - vector_type T1Src; - vector_type T2Src; + vector_type T1Src{}; + vector_type T2Src{}; float DistanceDivSq; float CollisionTimeAdvance; - vector_type CollisionDirection; + vector_type CollisionDirection{}; int EdgeCollisionFlag; float InputTime; float AngleStopTime; float AngleMult; float BmpCoef1; float BmpCoef2; - vector_type NextBallPosition; + vector_type NextBallPosition{}; static float flipper_sin_angle, flipper_cos_angle; static vector_type A1, A2, B1, B2, T1; diff --git a/SpaceCadetPinball/THole.h b/SpaceCadetPinball/THole.h index 7171238..3d3937c 100644 --- a/SpaceCadetPinball/THole.h +++ b/SpaceCadetPinball/THole.h @@ -16,7 +16,7 @@ public: static void TimerExpired(int timerId, void* caller); int BallCapturedFlag; - int BallCapturedSecondStage; + int BallCapturedSecondStage{}; int Timer; float Unknown3; float Unknown4; @@ -24,6 +24,6 @@ public: float ZSetValue; int FieldFlag; float GravityPull; - circle_type Circle; - field_effect_type Field; + circle_type Circle{}; + field_effect_type Field{}; }; diff --git a/SpaceCadetPinball/TKickback.cpp b/SpaceCadetPinball/TKickback.cpp index 5aa486a..e082ad0 100644 --- a/SpaceCadetPinball/TKickback.cpp +++ b/SpaceCadetPinball/TKickback.cpp @@ -13,8 +13,8 @@ TKickback::TKickback(TPinballTable* table, int groupIndex): TCollisionComponent( { MessageField = 0; Timer = 0; - ActiveFlag = 0; - TimerTime = 0.69999999f; + KickActiveFlag = 0; + TimerTime = 0.7f; TimerTime2 = 0.1f; Threshold = 1000000000.0f; } @@ -27,7 +27,7 @@ int TKickback::Message(int code, float value) if (ListBitmap) render::sprite_set_bitmap(RenderSprite, nullptr); Timer = 0; - ActiveFlag = 0; + KickActiveFlag = 0; Threshold = 1000000000.0; } return 0; @@ -43,14 +43,14 @@ void TKickback::Collision(TBall* ball, vector_type* nextPosition, vector_type* d } else { - if (!ActiveFlag) + if (!KickActiveFlag) { Threshold = 1000000000.0; - ActiveFlag = 1; + KickActiveFlag = 1; Timer = timer::set(TimerTime, this, TimerExpired); } if (DefaultCollision(ball, nextPosition, direction)) - ActiveFlag = 0; + KickActiveFlag = 0; } } @@ -58,7 +58,7 @@ void TKickback::TimerExpired(int timerId, void* caller) { auto kick = static_cast(caller); - if (kick->ActiveFlag) + if (kick->KickActiveFlag) { kick->Threshold = 0.0; kick->Timer = timer::set(kick->TimerTime2, kick, TimerExpired); diff --git a/SpaceCadetPinball/TKickback.h b/SpaceCadetPinball/TKickback.h index 4c610cf..a688c12 100644 --- a/SpaceCadetPinball/TKickback.h +++ b/SpaceCadetPinball/TKickback.h @@ -15,5 +15,5 @@ public: float TimerTime; float TimerTime2; int Timer; - int ActiveFlag; + int KickActiveFlag; }; diff --git a/SpaceCadetPinball/TKickout.h b/SpaceCadetPinball/TKickout.h index d027d81..fa2baab 100644 --- a/SpaceCadetPinball/TKickout.h +++ b/SpaceCadetPinball/TKickout.h @@ -24,14 +24,14 @@ public: float TimerTime1; float TimerTime2; float CollisionBallSetZ; - TBall* Ball; + TBall* Ball{}; float FieldMult; - circle_type Circle; - float OriginalBallZ; - vector_type BallAcceleration; + circle_type Circle{}; + float OriginalBallZ{}; + vector_type BallAcceleration{}; float ThrowAngleMult; float ThrowSpeedMult1; float ThrowSpeedMult2; - field_effect_type Field; - int Scores[5]; + field_effect_type Field{}; + int Scores[5]{}; }; diff --git a/SpaceCadetPinball/TLight.h b/SpaceCadetPinball/TLight.h index d48d089..7ea2280 100644 --- a/SpaceCadetPinball/TLight.h +++ b/SpaceCadetPinball/TLight.h @@ -40,17 +40,16 @@ public: static void flasher_start(struct flasher_type* flash, int bmpIndex); static void flasher_callback(int timerId, void* caller); - flasher_type Flasher; - int BmpIndex1; + flasher_type Flasher{}; + int BmpIndex1{}; int FlasherActive; - int FlasherFlag1; - int FlasherFlag2; - int TurnOffAfterFlashingFg; - int BmpIndex2; - float FlasherDelay[2]; + int FlasherFlag1{}; + int FlasherFlag2{}; + int TurnOffAfterFlashingFg{}; + int BmpIndex2{}; + float FlasherDelay[2]{}; int Timer1; int Timer2; - int Unknown19; - float Unknown20F; - TLight_player_backup PlayerData[4]; + float Unknown20F{}; + TLight_player_backup PlayerData[4]{}; }; diff --git a/SpaceCadetPinball/TLightBargraph.h b/SpaceCadetPinball/TLightBargraph.h index 1db136d..faf9807 100644 --- a/SpaceCadetPinball/TLightBargraph.h +++ b/SpaceCadetPinball/TLightBargraph.h @@ -13,7 +13,7 @@ public: static void BargraphTimerExpired(int timerId, void* caller); float* TimerTimeArray; - int TimerBargraph; - int TimeIndex; - int PlayerTimerIndexBackup[4]; + int TimerBargraph{}; + int TimeIndex{}; + int PlayerTimerIndexBackup[4]{}; }; diff --git a/SpaceCadetPinball/TLightGroup.cpp b/SpaceCadetPinball/TLightGroup.cpp index e6d91ae..4999775 100644 --- a/SpaceCadetPinball/TLightGroup.cpp +++ b/SpaceCadetPinball/TLightGroup.cpp @@ -28,10 +28,6 @@ TLightGroup::TLightGroup(TPinballTable* table, int groupIndex) : TPinballCompone } } -TLightGroup::~TLightGroup() -{ -} - int TLightGroup::Message(int code, float value) { auto count = static_cast(List.size()); diff --git a/SpaceCadetPinball/TLightGroup.h b/SpaceCadetPinball/TLightGroup.h index 1d4129e..0156952 100644 --- a/SpaceCadetPinball/TLightGroup.h +++ b/SpaceCadetPinball/TLightGroup.h @@ -18,7 +18,7 @@ class TLightGroup : { public: TLightGroup(TPinballTable* table, int groupIndex); - ~TLightGroup() override; + ~TLightGroup() override = default; int Message(int code, float value) override; virtual void Reset(); void reschedule_animation(float time); @@ -30,11 +30,11 @@ public: static void NotifyTimerExpired(int timerId, void* caller); std::vector List; - float Timer1Time; + float Timer1Time{}; float Timer1TimeDefault; - int MessageField2; - int AnimationFlag; + int MessageField2{}; + int AnimationFlag{}; int NotifyTimer; int Timer; - TLightGroup_player_backup PlayerData[4]; + TLightGroup_player_backup PlayerData[4]{}; }; diff --git a/SpaceCadetPinball/TLine.h b/SpaceCadetPinball/TLine.h index c00f9b2..cd1082c 100644 --- a/SpaceCadetPinball/TLine.h +++ b/SpaceCadetPinball/TLine.h @@ -6,7 +6,7 @@ class TLine : public TEdgeSegment { public: - line_type Line; + line_type Line{}; float X0, Y0, X1, Y1; TLine(TCollisionComponent* collCmp, char* activeFlag, unsigned int collisionGroup, float x0, float y0, float x1, float y1); TLine(TCollisionComponent* collCmp, char* activeFlag, unsigned int collisionGroup, vector_type* start, vector_type* end); diff --git a/SpaceCadetPinball/TOneway.h b/SpaceCadetPinball/TOneway.h index ea9f316..8501e0a 100644 --- a/SpaceCadetPinball/TOneway.h +++ b/SpaceCadetPinball/TOneway.h @@ -14,5 +14,5 @@ public: int get_scoring(int index) override; TLine* Line; - int Scores[6]; + int Scores[6]{}; }; diff --git a/SpaceCadetPinball/TPinballComponent.cpp b/SpaceCadetPinball/TPinballComponent.cpp index d23d412..16ee2c9 100644 --- a/SpaceCadetPinball/TPinballComponent.cpp +++ b/SpaceCadetPinball/TPinballComponent.cpp @@ -111,13 +111,3 @@ int TPinballComponent::get_scoring(int index) { return 0; } - -void* TPinballComponent::operator new(size_t Size) -{ - return calloc(1u, Size); -} - -void TPinballComponent::operator delete(void* p) -{ - free(p); /*Original does not have this*/ -} diff --git a/SpaceCadetPinball/TPinballComponent.h b/SpaceCadetPinball/TPinballComponent.h index a3040da..8c01f2e 100644 --- a/SpaceCadetPinball/TPinballComponent.h +++ b/SpaceCadetPinball/TPinballComponent.h @@ -24,9 +24,6 @@ public: virtual void put_scoring(int index, int score); virtual int get_scoring(int index); - void* operator new(size_t Size); - void operator delete(void* p); - char UnusedBaseFlag; char ActiveFlag; int MessageField; diff --git a/SpaceCadetPinball/TPinballTable.h b/SpaceCadetPinball/TPinballTable.h index 031955d..c0d3f73 100644 --- a/SpaceCadetPinball/TPinballTable.h +++ b/SpaceCadetPinball/TPinballTable.h @@ -45,54 +45,54 @@ public: scoreStruct* CurScoreStruct; scoreStruct* ScoreBallcount; scoreStruct* ScorePlayerNumber1; - int CheatsUsed; - int SoundIndex1; - int SoundIndex2; - int SoundIndex3; + int CheatsUsed{}; + int SoundIndex1{}; + int SoundIndex2{}; + int SoundIndex3{}; int BallInSink; - int CurScore; - int CurScoreE9; + int CurScore{}; + int CurScoreE9{}; int LightShowTimer; int EndGameTimeoutTimer; int TiltTimeoutTimer; - score_struct_super PlayerScores[4]; + score_struct_super PlayerScores[4]{}; int PlayerCount; int CurrentPlayer; TPlunger* Plunger; TDrain* Drain; - TDemo* Demo; - int XOffset; - int YOffset; - int Width; - int Height; + TDemo* Demo{}; + int XOffset{}; + int YOffset{}; + int Width{}; + int Height{}; std::vector ComponentList; std::vector BallList; TLightGroup* LightGroup; - float GravityDirVectMult; - float GravityAngleX; - float GravityAnglY; - float CollisionCompOffset; - float PlungerPositionX; - float PlungerPositionY; - int ScoreMultiplier; - int ScoreAdded; - int ScoreSpecial1; - int ScoreSpecial2; - int ScoreSpecial2Flag; - int ScoreSpecial3; - int ScoreSpecial3Flag; - int UnknownP71; - int BallCount; + float GravityDirVectMult{}; + float GravityAngleX{}; + float GravityAnglY{}; + float CollisionCompOffset{}; + float PlungerPositionX{}; + float PlungerPositionY{}; + int ScoreMultiplier{}; + int ScoreAdded{}; + int ScoreSpecial1{}; + int ScoreSpecial2{}; + int ScoreSpecial2Flag{}; + int ScoreSpecial3{}; + int ScoreSpecial3Flag{}; + int UnknownP71{}; + int BallCount{}; int MaxBallCount; - int ExtraBalls; - int UnknownP75; - int BallLockedCounter; + int ExtraBalls{}; + int UnknownP75{}; + int BallLockedCounter{}; int MultiballFlag; - int UnknownP78; - int ReplayActiveFlag; + int UnknownP78{}; + int ReplayActiveFlag{}; int ReplayTimer; - int UnknownP81; - int UnknownP82; + int UnknownP81{}; + int UnknownP82{}; int TiltLockFlag; private: diff --git a/SpaceCadetPinball/TPopupTarget.h b/SpaceCadetPinball/TPopupTarget.h index 208a3f2..7d8950b 100644 --- a/SpaceCadetPinball/TPopupTarget.h +++ b/SpaceCadetPinball/TPopupTarget.h @@ -16,6 +16,6 @@ public: int Timer; float TimerTime; - int Scores[3]; - int PlayerMessagefieldBackup[4]; + int Scores[3]{}; + int PlayerMessagefieldBackup[4]{}; }; diff --git a/SpaceCadetPinball/TRamp.h b/SpaceCadetPinball/TRamp.h index 4ad1d2b..345ce5b 100644 --- a/SpaceCadetPinball/TRamp.h +++ b/SpaceCadetPinball/TRamp.h @@ -17,8 +17,8 @@ public: int FieldEffect(TBall* ball, vector_type* vecDst) override; void port_draw() override; - int Scores[4]; - field_effect_type Field; + int Scores[4]{}; + field_effect_type Field{}; int CollisionGroup; int RampFlag1; int RampPlaneCount; diff --git a/SpaceCadetPinball/TRollover.cpp b/SpaceCadetPinball/TRollover.cpp index ef77575..d11ad79 100644 --- a/SpaceCadetPinball/TRollover.cpp +++ b/SpaceCadetPinball/TRollover.cpp @@ -19,7 +19,6 @@ TRollover::TRollover(TPinballTable* table, int groupIndex, bool createWall) : TC TRollover::TRollover(TPinballTable* table, int groupIndex) : TCollisionComponent(table, groupIndex, false) { - RolloverFlag = 0; if (ListBitmap) render::sprite_set_bitmap(RenderSprite, ListBitmap->at(0)); build_walls(groupIndex); diff --git a/SpaceCadetPinball/TRollover.h b/SpaceCadetPinball/TRollover.h index b6ac262..30b0118 100644 --- a/SpaceCadetPinball/TRollover.h +++ b/SpaceCadetPinball/TRollover.h @@ -18,6 +18,6 @@ public: static void TimerExpired(int timerId, void* caller); - char RolloverFlag; - int Scores[2]; + char RolloverFlag{}; + int Scores[2]{}; }; diff --git a/SpaceCadetPinball/TSink.h b/SpaceCadetPinball/TSink.h index b31b6ca..f53e39f 100644 --- a/SpaceCadetPinball/TSink.h +++ b/SpaceCadetPinball/TSink.h @@ -17,13 +17,13 @@ public: int Timer; float TimerTime; - vector_type BallPosition; - vector_type BallAcceleration; + vector_type BallPosition{}; + vector_type BallAcceleration{}; float ThrowAngleMult; float ThrowSpeedMult1; float ThrowSpeedMult2; int SoundIndex4; int SoundIndex3; - int Scores[3]; - int PlayerMessagefieldBackup[4]; + int Scores[3]{}; + int PlayerMessagefieldBackup[4]{}; }; diff --git a/SpaceCadetPinball/TSoloTarget.h b/SpaceCadetPinball/TSoloTarget.h index 32813f9..78ec01c 100644 --- a/SpaceCadetPinball/TSoloTarget.h +++ b/SpaceCadetPinball/TSoloTarget.h @@ -13,10 +13,9 @@ public: TEdgeSegment* edge) override; static void TimerExpired(int timerId, void* caller); - - int Unknown0; + int Timer; float TimerTime; int SoundIndex4; - int Scores[1]; + int Scores[1]{}; }; diff --git a/SpaceCadetPinball/TTableLayer.h b/SpaceCadetPinball/TTableLayer.h index 52d53d8..f847b32 100644 --- a/SpaceCadetPinball/TTableLayer.h +++ b/SpaceCadetPinball/TTableLayer.h @@ -27,9 +27,8 @@ public: float Unknown4F; float GraityDirX; float GraityDirY; - int Unknown7; float GraityMult; - field_effect_type Field; + field_effect_type Field{}; static TEdgeManager* edge_manager; }; diff --git a/SpaceCadetPinball/TWall.cpp b/SpaceCadetPinball/TWall.cpp index 4ed3106..ef464f8 100644 --- a/SpaceCadetPinball/TWall.cpp +++ b/SpaceCadetPinball/TWall.cpp @@ -12,7 +12,6 @@ TWall::TWall(TPinballTable* table, int groupIndex) : TCollisionComponent(table, render::sprite_set_bitmap(RenderSprite, nullptr); if (ListBitmap) BmpPtr = ListBitmap->at(0); - Timer = 0; } int TWall::Message(int code, float value) diff --git a/SpaceCadetPinball/TWall.h b/SpaceCadetPinball/TWall.h index 01c0ba7..c55c5c7 100644 --- a/SpaceCadetPinball/TWall.h +++ b/SpaceCadetPinball/TWall.h @@ -11,13 +11,13 @@ public: TWall(TPinballTable* table, int groupIndex); int Message(int code, float value) override; void Collision(TBall* ball, vector_type* nextPosition, vector_type* direction, float coef, - TEdgeSegment* edge) override; + TEdgeSegment* edge) override; void put_scoring(int index, int score) override; - int get_scoring(int index) override; + int get_scoring(int index) override; static void TimerExpired(int timerId, void* caller); - int Timer; - gdrv_bitmap8* BmpPtr; - int Scores[1]; + int Timer{}; + gdrv_bitmap8* BmpPtr{}; + int Scores[1]{}; };