Merge pull request #380 from avaraline/constructions

Reconvert IAbstractActor to normal constructor
avaraline · Jan 4, 2024 · e7657df · e7657df
2 parents 6343522 + 321dbc2
commit e7657df
Show file tree

Hide file tree

Showing 43 changed files with 53 additions and 92 deletions.
diff --git a/src/game/CAbstractActor.cpp b/src/game/CAbstractActor.cpp
@@ -201,7 +201,7 @@ void CAbstractActor::BuildPartSpheresProximityList(MaskType filterMask) {
     BuildPartProximityList(minPoint, FDistanceOverEstimate(maxPoint[0], maxPoint[1], maxPoint[2]), filterMask);
 }
 
-void CAbstractActor::IAbstractActor() {
+CAbstractActor::CAbstractActor() {
     short i;
 
     proximityList.p = NULL;

diff --git a/src/game/CAbstractActor.h b/src/game/CAbstractActor.h
@@ -85,6 +85,7 @@ typedef union {
 
 class CAbstractActor : public CDirectObject {
 public:
+    CAbstractActor();
     CAvaraGame *itsGame;
 
     unsigned long searchCount;
@@ -144,7 +145,7 @@ class CAbstractActor : public CDirectObject {
 
     virtual void LoadPart(short ind, short resId);
     virtual void LoadPartWithColors(short ind, short resId);
-    virtual void IAbstractActor();
+
     virtual void BeginScript();
     virtual CAbstractActor *EndScript();
     virtual void AdaptableSettings();
@@ -204,7 +205,7 @@ class CAbstractActor : public CDirectObject {
     virtual void GetFrictionTraction(Fixed *tract, Fixed *frict);
 
     //	Location link entry handling.
-    virtual void InitLocationLinks();
+    void InitLocationLinks();
     void LinkSphere(Fixed *origin, Fixed range);
     void LinkBox(Fixed minX, Fixed minZ, Fixed maxX, Fixed maxZ);
     void LinkPartBoxes();

diff --git a/src/game/CAbstractMissile.cpp b/src/game/CAbstractMissile.cpp
@@ -14,15 +14,13 @@
 #define GROUNDHITSOUNDID 211
 #define DEFAULTMISSILESOUND 200
 
-void CAbstractMissile::IAbstractMissile(CDepot *theDepot) {
-    IAbstractActor();
-
+CAbstractMissile::CAbstractMissile(CDepot *theDepot) {
     isActive = kIsActive;
     itsDepot = theDepot;
     itsGame = itsDepot->itsGame;
 
     speed = FIX3(2000);
-    maxFrameCount = FpsFramesPerClassic(50);
+
     energy = 0;
 
     nextMissile = NULL;

diff --git a/src/game/CAbstractMissile.h b/src/game/CAbstractMissile.h
@@ -35,7 +35,7 @@ class CAbstractMissile : public CAbstractActor {
     short missileKind;
     short soundResId;
 
-    virtual void IAbstractMissile(CDepot *theDepot);
+    CAbstractMissile(CDepot *theDepot);
     virtual void Deactivate();
     virtual void Launch(Matrix *startMatrix,
         RayHitRecord *target,

diff --git a/src/game/CAbstractMovers.cpp b/src/game/CAbstractMovers.cpp
@@ -9,9 +9,7 @@
 
 #include "CAbstractMovers.h"
 
-void CAbstractMovers::IAbstractActor() {
-    CGlowActors::IAbstractActor();
-
+CAbstractMovers::CAbstractMovers() {
     mass = FIX(50); //	Some default mass
     speed[0] = 0;
     speed[1] = 0;

diff --git a/src/game/CAbstractMovers.h b/src/game/CAbstractMovers.h
@@ -17,7 +17,7 @@ class CAbstractMovers : public CGlowActors {
     Fixed internalImpulse[3];
     Fixed impulseSlowDown;
 
-    virtual void IAbstractActor();
+    CAbstractMovers();
     virtual void GetSpeedEstimate(Fixed *theSpeed);
     virtual void FrameAction();
     virtual void Push(Fixed *direction);

diff --git a/src/game/CAbstractPlayer.cpp b/src/game/CAbstractPlayer.cpp
@@ -189,8 +189,7 @@ void CAbstractPlayer::LevelReset() {
 void CAbstractPlayer::LoadScout() {
     scoutCommand = kScoutNullCommand;
 
-    itsScout = new CScout;
-    itsScout->IScout(this, teamColor, GetTeamColorOr(ColorManager::getDefaultTeamColor()));
+    itsScout = new CScout(this, teamColor, GetTeamColorOr(ColorManager::getDefaultTeamColor()));
     itsScout->BeginScript();
     FreshCalc();
     itsScout->EndScript();

diff --git a/src/game/CBall.cpp b/src/game/CBall.cpp
@@ -21,9 +21,7 @@
 #define kStandardBallMass FIX(30);
 #define kBallBaseMass FIX(50);
 
-void CBall::IAbstractActor() {
-    CRealShooters::IAbstractActor();
-
+CBall::CBall() {
     mass = kStandardBallMass;
     baseMass = kStandardBallMass;
 

diff --git a/src/game/CBall.h b/src/game/CBall.h
@@ -79,7 +79,7 @@ class CBall : public CRealShooters {
 
     Boolean playerAttach;
 
-    virtual void IAbstractActor();
+    CBall();
     virtual void BeginScript();
     virtual CAbstractActor *EndScript();
     virtual void Dispose();

diff --git a/src/game/CDepot.cpp b/src/game/CDepot.cpp
@@ -168,19 +168,18 @@ CAbstractMissile *CDepot::MakeMissile(short kind) {
 
     switch (kind) {
         case kmiFlat:
-            newMissile = new CMissile;
+            newMissile = new CMissile(this);
             break;
         case kmiTurning:
-            newMissile = new CPlayerMissile;
+            newMissile = new CPlayerMissile(this);
             break;
         case kmiShuriken:
-            newMissile = new CShuriken;
+            newMissile = new CShuriken(this);
             break;
         default:
             return newMissile;
     }
 
-    newMissile->IAbstractMissile(this);
     newMissile->missileKind = kind;
 
     return newMissile;
@@ -321,16 +320,15 @@ CWeapon *CDepot::MakeWeapon(short kind) {
 
     switch (kind) {
         case kweGrenade:
-            newWeapon = new CGrenade;
+            newWeapon = new CGrenade(this);
             break;
         case kweSmart:
-            newWeapon = new CSmart;
+            newWeapon = new CSmart(this);
             break;
         default:
             return newWeapon;
     }
 
-    newWeapon->IWeapon(this);
     newWeapon->weaponKind = kind;
 
     return newWeapon;

diff --git a/src/game/CGlowActors.cpp b/src/game/CGlowActors.cpp
@@ -13,8 +13,7 @@
 
 extern Fixed FRandSeed;
 
-void CGlowActors::IAbstractActor() {
-    CPlacedActors::IAbstractActor();
+CGlowActors::CGlowActors() {
     canGlow = true;
     glow = 0;
 }

diff --git a/src/game/CGlowActors.h b/src/game/CGlowActors.h
@@ -19,5 +19,5 @@ class CGlowActors : public CPlacedActors {
     virtual CAbstractActor *EndScript();
     virtual void FrameAction();
     virtual void WasHit(RayHitRecord *theHit, Fixed hitEnergy);
-    virtual void IAbstractActor();
+    CGlowActors();
 };
diff --git a/src/game/CGrenade.cpp b/src/game/CGrenade.cpp
@@ -19,9 +19,7 @@
 #define kGravity FIX3(120)
 #define kGrenadeFriction FIX3(10)
 
-void CGrenade::IWeapon(CDepot *theDepot) {
-    CWeapon::IWeapon(theDepot);
-
+CGrenade::CGrenade(CDepot *theDepot) : CWeapon(theDepot) {
     blastSound = 231;
 
     partCount = 1;

diff --git a/src/game/CGrenade.h b/src/game/CGrenade.h
@@ -13,13 +13,13 @@
 
 class CDepot;
 
-class CGrenade : public CWeapon {
+class CGrenade final : public CWeapon {
 public:
     Fixed gravity, classicGravity;
     Fixed friction, classicFriction;
     Fixed speedOffset;
 
-    virtual void IWeapon(CDepot *theDepot);
+    CGrenade(CDepot *theDepot);
     virtual void PlaceParts();
     virtual void AdaptableSettings();
     virtual long Arm(CSmartPart *aPart);

diff --git a/src/game/CMarkerActor.cpp b/src/game/CMarkerActor.cpp
@@ -11,8 +11,7 @@
 
 #include "CSmartPart.h"
 
-void CMarkerActor::IAbstractActor() {
-    CGlowActors::IAbstractActor();
+CMarkerActor::CMarkerActor() {
     isActive = kIsActive;
     maskBits = kTargetBit; // + kMarkerBit; // TODO: what is this??
 }

diff --git a/src/game/CMarkerActor.h b/src/game/CMarkerActor.h
@@ -17,7 +17,7 @@ class CMarkerActor : public CGlowActors {
 public:
     short markerColor;
 
-    virtual void IAbstractActor();
+    CMarkerActor();
     virtual CAbstractActor *EndScript();
     virtual void FrameAction();
 };
diff --git a/src/game/CMissile.cpp b/src/game/CMissile.cpp
@@ -9,9 +9,8 @@
 
 #include "CMissile.h"
 
-void CMissile::IAbstractMissile(CDepot *theDepot) {
-    CAbstractMissile::IAbstractMissile(theDepot);
-
+CMissile::CMissile(CDepot *theDepot) : CAbstractMissile(theDepot) {
+    maxFrameCount = FpsFramesPerClassic(50);
     partCount = 1;
     LoadPart(0, kMissileBSP);
 }
diff --git a/src/game/CMissile.h b/src/game/CMissile.h
@@ -12,8 +12,8 @@
 
 #define kMissileBSP 801
 
-class CMissile : public CAbstractMissile {
+class CMissile final : public CAbstractMissile {
 public:
-    virtual void IAbstractMissile(CDepot *theDepot);
+    CMissile(CDepot *theDepot);
     virtual bool HandlesFastFPS() { return true; }
 };
diff --git a/src/game/CPill.cpp b/src/game/CPill.cpp
@@ -14,9 +14,7 @@
 #define kPillGravity FIX3(120)
 #define kFriction FIX3(800)
 
-void CPill::IAbstractActor() {
-    CBall::IAbstractActor();
-
+CPill::CPill() {
     mass = kStandardPillMass;
 
     shieldsCharge = FIX3(5);

diff --git a/src/game/CPill.h b/src/game/CPill.h
@@ -12,5 +12,5 @@
 
 class CPill : public CBall {
 public:
-    virtual void IAbstractActor();
+    CPill();
 };
diff --git a/src/game/CPlacedActors.cpp b/src/game/CPlacedActors.cpp
@@ -11,12 +11,10 @@
 
 #include "CSmartPart.h"
 
-void CPlacedActors::IAbstractActor() {
+CPlacedActors::CPlacedActors() {
     location[0] = 0;
     location[1] = 0;
     location[2] = 0;
-
-    CAbstractActor::IAbstractActor();
 }
 
 void CPlacedActors::BeginScript() {

diff --git a/src/game/CPlacedActors.h b/src/game/CPlacedActors.h
@@ -16,7 +16,7 @@ class CPlacedActors : public CAbstractActor {
     Vector location;
     Fixed heading;
 
-    virtual void IAbstractActor();
+    CPlacedActors();
     virtual void BeginScript();
     virtual CAbstractActor *EndScript();
     virtual bool UseForRandomIncarnator() { return false; }

diff --git a/src/game/CPlayerManager.cpp b/src/game/CPlayerManager.cpp
@@ -1032,7 +1032,6 @@ CAbstractPlayer *CPlayerManagerImpl::ChooseActor(CAbstractPlayer *actorList, sho
 
     if (itsPlayer == NULL) {
         itsPlayer = new CWalkerActor;
-        itsPlayer->IAbstractActor();
         itsPlayer->BeginScript();
         ProgramLongVar(iTeam, myTeamColor);
         FreshCalc(); //	Parser call.
@@ -1058,7 +1057,6 @@ CAbstractPlayer *CPlayerManagerImpl::ChooseActor(CAbstractPlayer *actorList, sho
 Boolean CPlayerManagerImpl::IncarnateInAnyColor() {
     for (short i = 1; i <= kMaxTeamColors; i++) {
         itsPlayer = new CWalkerActor;
-        itsPlayer->IAbstractActor();
         itsPlayer->BeginScript();
         ProgramLongVar(iTeam, i);
         FreshCalc(); //	Parser call.

diff --git a/src/game/CPlayerMissile.cpp b/src/game/CPlayerMissile.cpp
@@ -13,9 +13,7 @@
 #define kPlayerMissileBSP 203
 #define MISSILESPIN FpsCoefficient2(FIX(17))
 
-void CPlayerMissile::IAbstractMissile(CDepot *theDepot) {
-    CAbstractMissile::IAbstractMissile(theDepot);
-
+CPlayerMissile::CPlayerMissile(CDepot *theDepot) : CAbstractMissile(theDepot){
     speed = PLAYERMISSILESPEED;
     maxFrameCount = FpsFramesPerClassic(PLAYERMISSILELIFE);
 

diff --git a/src/game/CPlayerMissile.h b/src/game/CPlayerMissile.h
@@ -14,12 +14,12 @@
 #define PLAYERMISSILELIFE 25
 #define PLAYERMISSILERANGE (PLAYERMISSILELIFE * PLAYERMISSILESPEED)
 
-class CPlayerMissile : public CAbstractMissile {
+class CPlayerMissile final : public CAbstractMissile {
 public:
     Fixed rotation;
     Fixed spin;
 
-    virtual void IAbstractMissile(CDepot *theDepot);
+    CPlayerMissile(CDepot *theDepot);
     virtual void SetSpin(Boolean spinDirection);
     virtual void MoveForward();
     virtual bool HandlesFastFPS() { return true; }

diff --git a/src/game/CRealMovers.cpp b/src/game/CRealMovers.cpp
@@ -12,9 +12,7 @@
 
 #include "CSmartPart.h"
 
-void CRealMovers::IAbstractActor() {
-    CGlowActors::IAbstractActor();
-
+CRealMovers::CRealMovers() {
     maskBits |= kCanPushBit;
     baseMass = FIX(300);
     mass = FIX(50); //	Some default mass

diff --git a/src/game/CRealMovers.h b/src/game/CRealMovers.h
@@ -16,7 +16,7 @@ class CRealMovers : public CGlowActors {
     Vector speed = {0, 0, 0, 0}; // Track speed when Hector gets hit
     Vector dSpeed = {0, 0, 0, 0}; // Track delta velocity when Hector gets hit
 
-    virtual void IAbstractActor();
+    CRealMovers();
     virtual void GetSpeedEstimate(Fixed *theSpeed);
     virtual void Push(Fixed *direction);
     virtual void Accelerate(Fixed *direction);

diff --git a/src/game/CRealShooters.cpp b/src/game/CRealShooters.cpp
@@ -13,9 +13,7 @@
 #include "CShuriken.h"
 #include "CSmartPart.h"
 
-void CRealShooters::IAbstractActor() {
-    CRealMovers::IAbstractActor();
-
+CRealShooters::CRealShooters() {
     visionRange = FIX(100);
     shotPower = FIX3(500);
     burstLength = 2;
@@ -25,6 +23,7 @@ void CRealShooters::IAbstractActor() {
     watchTeams = -2;
     watchMask = kPlayerBit;
 }
+
 void CRealShooters::BeginScript() {
     CRealMovers::BeginScript();
 

diff --git a/src/game/CRealShooters.h b/src/game/CRealShooters.h
@@ -28,7 +28,7 @@ class CRealShooters : public CRealMovers {
     MaskType watchMask;
     short watchTeams;
 
-    virtual void IAbstractActor();
+    CRealShooters();
     virtual void BeginScript();
     virtual CAbstractActor *EndScript();
 

diff --git a/src/game/CScout.cpp b/src/game/CScout.cpp
@@ -27,9 +27,7 @@
 
 #define FOLLOWRADIUS 10
 
-void CScout::IScout(CAbstractPlayer *thePlayer, short theTeam, ARGBColor longTeamColor) {
-    IAbstractActor();
-
+CScout::CScout(CAbstractPlayer *thePlayer, short theTeam, ARGBColor longTeamColor) {
     mass = FIX(20);
     baseMass = FIX(40);
     teamColor = theTeam;

diff --git a/src/game/CScout.h b/src/game/CScout.h
@@ -26,14 +26,14 @@ enum {
     kScoutInactive
 };
 
-class CScout : public CRealMovers {
+class CScout final : public CRealMovers {
 public:
     Vector targetPosition;
     CAbstractPlayer *itsPlayer;
     short action;
     Boolean nextRotateFlag;
 
-    virtual void IScout(CAbstractPlayer *thePlayer, short theTeam, ARGBColor longTeamColor);
+    CScout(CAbstractPlayer *thePlayer, short theTeam, ARGBColor longTeamColor);
     virtual void PlaceParts();
     virtual void FrameAction();
     virtual void ControlViewPoint();