Use TClass property

Author: ZivDero

src/extensions/house/houseext_hooks.cpp

@@ -469,7 +469,7 @@ void HouseClassExt::_Harvested(int tiberium, TiberiumType slot)
     PointTotal += tiberium * 5;
 
     if ((Session.Type != GAME_NORMAL && !IsHuman) || !RuleExtension->IsTiberiumStorage) {
-        Credits += tiberium * Tiberiums[slot]->Value;
+        Credits += tiberium * Tiberiums[slot]->CreditValue;
     }
     else {
         long oldcap = Capacity;

src/extensions/techno/technoext.cpp

@@ -84,7 +84,7 @@ TechnoClassExtension::TechnoClassExtension(const TechnoClass *this_ptr) :
     {
         new ((StorageClassExt*)&(this_ptr->Storage)) StorageClassExt(&Storage);
 
-        const auto ttypeext = Extension::Fetch(this_ptr->Techno_Type_Class());
+        const auto ttypeext = Extension::Fetch(this_ptr->TClass);
         if (ttypeext->Spawns)
             SpawnManager = new SpawnManagerClass(const_cast<TechnoClass*>(this_ptr), ttypeext->Spawns, ttypeext->SpawnsNumber, ttypeext->SpawnRegenRate, ttypeext->SpawnReloadRate, ttypeext->SpawnSpawnRate, ttypeext->SpawnLogicRate);
     }
@@ -547,7 +547,7 @@ int TechnoClassExtension::Time_To_Build() const
     /**
      *  Walls have a coefficient as they are really cheap.
      */
-    if (This()->RTTI == RTTI_BUILDING && reinterpret_cast<const BuildingTypeClass *>(This()->Techno_Type_Class())->IsWall) {
+    if (This()->RTTI == RTTI_BUILDING && reinterpret_cast<const BuildingTypeClass *>(This()->TClass)->IsWall) {
         time *= Rule->WallBuildSpeedCoefficient;
     }
 
@@ -609,7 +609,7 @@ bool TechnoClassExtension::Opportunity_Fire()
  */
 Coord TechnoClassExtension::Fire_Coord(WeaponSlotType which, TPoint3D<int> offset) const
 {
-    const TechnoTypeClass *ttype = This()->Techno_Type_Class();
+    const TechnoTypeClass *ttype = This()->TClass;
     const auto weaponinfo = This()->Get_Weapon(which);
 
     Matrix3D matrix;
@@ -655,7 +655,7 @@ void TechnoClassExtension::Put_Storage_Pointers()
  */
 const TechnoTypeClass *TechnoClassExtension::Techno_Type_Class() const
 {
-    return reinterpret_cast<TechnoClass *>(This())->Techno_Type_Class();
+    return reinterpret_cast<TechnoClass *>(This())->TClass;
 }
 
 

src/extensions/technotype/technotypeext.h

@@ -64,7 +64,7 @@ class TechnoTypeClassExtension : public ObjectTypeClassExtension
     virtual bool Read_INI(CCINIClass &ini) override;
 
     static ProductionFlags Get_Production_Flags(RTTIType type, int id);
-    static ProductionFlags Get_Production_Flags(const TechnoClass* techno) { return Get_Production_Flags(techno->Techno_Type_Class()); }
+    static ProductionFlags Get_Production_Flags(const TechnoClass* techno) { return Get_Production_Flags(techno->TClass); }
     static ProductionFlags Get_Production_Flags(const TechnoTypeClass* ttype) { return Get_Production_Flags(Extension::Fetch(ttype)); }
     static ProductionFlags Get_Production_Flags(const TechnoTypeClassExtension* ttype_ext);