Skip to content

Commit c37b20a

Browse files
committed
set TakeDamage int to damagetype
1 parent 778a285 commit c37b20a

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

Spore ModAPI/Spore/Simulator/cCombatant.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ namespace Simulator
7979
/* 14h */ virtual cSpaceToolData* GetWeapon();
8080

8181
/// Called when the combatant is attacked, takes the damage
82-
/* 18h */ virtual int TakeDamage(float damage, uint32_t attackerPoliticalID, int, const Vector3&, cCombatant* pAttacker); // used to substract health
82+
/// Vector3 may be knockback direction?
83+
/* 18h */ virtual int TakeDamage(float damage, uint32_t attackerPoliticalID, int damagetype, const Vector3&, cCombatant* pAttacker); // used to substract health
8384

8485
/* 1Ch */ virtual void AddHostileUnit(cCombatant* combatant);
8586
/* 20h */ virtual Math::Vector3 func20h();

Spore ModAPI/Spore/Simulator/cCreatureBase.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ namespace Simulator
115115

116116
// sub_C1BE40 WALK TO??
117117
// arg_8 is normalized vector
118-
void WalkTo(int speedState, const Vector3& dstPos, const Vector3& arg_8, float goalStopDistance=1.0f, float acceptableStopDistance=2.0f);
118+
void WalkTo(int speedState, const Vector3& dstPos, const Vector3& arg_8, float goalStopDistance = 1.0f, float acceptableStopDistance = 2.0f);
119119

120120
//TODO loc_D315AE know how much distance advances with WASD
121121

0 commit comments

Comments
 (0)