Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove tdfID weapon def #1467

Merged
merged 2 commits into from
Nov 3, 2024
Merged

Remove tdfID weapon def #1467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a41a42
Remove `tdfID` weapon def
sprunk Apr 12, 2024
642ceb4
Merge branch 'master' into tdf-id
lhog Nov 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions AI/Wrappers/LegacyCpp/AIAICallback.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 0 additions & 3 deletions AI/Wrappers/LegacyCpp/WeaponDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ struct WeaponDef
, energycost(0.0f)
, projectilespershot(0)
, id(0)
, tdfId(0)
, turret(false)
, onlyForward(false)
, fixedLauncher(false)
Expand Down Expand Up @@ -172,7 +171,6 @@ struct WeaponDef
, energycost(0.0f)
, projectilespershot(0)
, id(0)
, tdfId(0)
, turret(false)
, onlyForward(false)
, fixedLauncher(false)
Expand Down Expand Up @@ -305,7 +303,6 @@ struct WeaponDef
int projectilespershot;

int id;
int tdfId; ///< the id= tag in the tdf

bool turret;
bool onlyForward;
Expand Down
5 changes: 0 additions & 5 deletions doc/site/_data/weapondefs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
4 changes: 0 additions & 4 deletions rts/ExternalAI/SSkirmishAICallbackImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 0 additions & 2 deletions rts/Lua/LuaWeaponDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion rts/Sim/Units/Scripts/CobInstance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion rts/Sim/Units/Scripts/CobScriptNames.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, // -
Expand Down
1 change: 0 additions & 1 deletion rts/Sim/Weapons/WeaponDef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion rts/Sim/Weapons/WeaponDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ struct WeaponDef
int projectilespershot;

int id;
int tdfId; ///< the id= tag in the tdf

bool isNulled;
bool turret;
Expand Down