Remove tdfID weapon def (#1467)

Replaced with regular ID in COB, removed elsewhere.
beyond-all-reason · Nov 3, 2024 · 8ad8a12 · 8ad8a12
1 parent d03b023
commit 8ad8a12
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 20 deletions.
diff --git a/AI/Wrappers/LegacyCpp/AIAICallback.cpp b/AI/Wrappers/LegacyCpp/AIAICallback.cpp
@@ -1259,8 +1259,6 @@ const springLegacyAI::WeaponDef* springLegacyAI::CAIAICallback::GetWeaponDefById
 
 		// weaponDef->id = sAICallback->WeaponDef_getId(skirmishAIId, weaponDefId);
 		weaponDef->id = weaponDefId;
-		// weaponDef->tdfId = sAICallback->WeaponDef_getTdfId(skirmishAIId, weaponDefId);
-		weaponDef->tdfId = -1;
 
 		weaponDef->turret = sAICallback->WeaponDef_isTurret(skirmishAIId, weaponDefId);
 		weaponDef->onlyForward = sAICallback->WeaponDef_isOnlyForward(skirmishAIId, weaponDefId);

diff --git a/AI/Wrappers/LegacyCpp/WeaponDef.h b/AI/Wrappers/LegacyCpp/WeaponDef.h
@@ -54,7 +54,6 @@ struct WeaponDef
 		, energycost(0.0f)
 		, projectilespershot(0)
 		, id(0)
-		, tdfId(0)
 		, turret(false)
 		, onlyForward(false)
 		, fixedLauncher(false)
@@ -172,7 +171,6 @@ struct WeaponDef
 		, energycost(0.0f)
 		, projectilespershot(0)
 		, id(0)
-		, tdfId(0)
 		, turret(false)
 		, onlyForward(false)
 		, fixedLauncher(false)
@@ -305,7 +303,6 @@ struct WeaponDef
 	int projectilespershot;
 
 	int id;
-	int tdfId;                  ///< the id= tag in the tdf
 
 	bool turret;
 	bool onlyForward;

diff --git a/doc/site/_data/weapondefs.json b/doc/site/_data/weapondefs.json
@@ -11,11 +11,6 @@
       "defaultValue": Cannon,
       "type": "std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >"
     },
-    "id": {
-      "internalName": "tdfId",
-      "defaultValue": 0,
-      "type": "int"
-    },
     "customParams": {
       "type": "table"
     },

diff --git a/rts/ExternalAI/SSkirmishAICallbackImpl.cpp b/rts/ExternalAI/SSkirmishAICallbackImpl.cpp
@@ -4492,10 +4492,6 @@ EXPORT(int) skirmishAiCallback_WeaponDef_getProjectilesPerShot(int skirmishAIId,
 	return getWeaponDefById(skirmishAIId, weaponDefId)->projectilespershot;
 }
 
-//EXPORT(int) skirmishAiCallback_WeaponDef_getTdfId(int skirmishAIId, int weaponDefId) {
-//	return getWeaponDefById(skirmishAIId, weaponDefId)->tdfId;
-//}
-
 EXPORT(bool) skirmishAiCallback_WeaponDef_isTurret(int skirmishAIId, int weaponDefId) {
 	return getWeaponDefById(skirmishAIId, weaponDefId)->turret;
 }

diff --git a/rts/Lua/LuaWeaponDefs.cpp b/rts/Lua/LuaWeaponDefs.cpp
@@ -460,8 +460,6 @@ static bool InitParamMap()
 
 	ADD_INT("id", wd.id);
 
-	ADD_INT("tdfId", wd.tdfId);
-
 	ADD_STRING("name",        wd.name);
 	ADD_STRING("description", wd.description);
 

diff --git a/rts/Sim/Units/Scripts/CobInstance.cpp b/rts/Sim/Units/Scripts/CobInstance.cpp
@@ -283,7 +283,7 @@ void CCobInstance::HitByWeapon(const float3& hitDir, int weaponDefId, float& ino
 		const WeaponDef* wd = weaponDefHandler->GetWeaponDefByID(weaponDefId);
 
 		callinArgs[0] = 4;
-		callinArgs[3] = ((wd != nullptr)? wd->tdfId : -1);
+		callinArgs[3] = ((wd != nullptr)? wd->id : -1);
 		callinArgs[4] = int(100 * inoutDamage);
 		// weaponHitMod, not an actual arg
 		callinArgs[MAX_COB_ARGS] = 1;

diff --git a/rts/Sim/Units/Scripts/CobScriptNames.h b/rts/Sim/Units/Scripts/CobScriptNames.h
@@ -28,7 +28,7 @@ enum {
 	COBFN_MoveRate2,            // -
 	COBFN_MoveRate3,            // FIXME: unused (see CHoverAirMoveType::UpdateMoveRate)
 	COBFN_SetSFXOccupy,         // in: curTerrainType
-	COBFN_HitByWeaponId,        // in: 500 * hitDir.z, in: 500 * hitDir.x, in: weaponDefs[weaponId].tdfId, in: 100 * damage, return value: 100 * weaponHitMod
+	COBFN_HitByWeaponId,        // in: 500 * hitDir.z, in: 500 * hitDir.x, in: weaponDefs[weaponId].id, in: 100 * damage, return value: 100 * weaponHitMod
 	COBFN_QueryLandingPadCount, // out: landingPadCount (default 16)
 	COBFN_QueryLandingPad,      // landingPadCount times (out: piecenum)
 	COBFN_Falling,              // -

diff --git a/rts/Sim/Weapons/WeaponDef.cpp b/rts/Sim/Weapons/WeaponDef.cpp
@@ -43,7 +43,6 @@ WEAPONTAG(std::string, type).externalName("weaponType").defaultValue("Cannon")
 	"EmgCannon - deprecated, a version of Laser or Flame with crappy visuals\n"
 	"Rifle - deprecated, more or less equivalent to invisible Lightning\n"
 );
-WEAPONTAG(int, tdfId).externalName("id").defaultValue(0);
 WEAPONDUMMYTAG(table, customParams).description("A table of arbitrary string key-value pairs, for use by Lua gadgets (no engine meaning)");
 
 // Collision & Avoidance

diff --git a/rts/Sim/Weapons/WeaponDef.h b/rts/Sim/Weapons/WeaponDef.h
@@ -104,7 +104,6 @@ struct WeaponDef
 	int projectilespershot;
 
 	int id;
-	int tdfId;                  ///< the id= tag in the tdf
 
 	bool isNulled;
 	bool turret;