Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Add] Beam weapons now use delay and duration.

Browse Source
This commit is contained in:
Allanis 2013-09-23 21:04:56 +01:00
parent 7030d97402
commit 06ea30d96e
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/outfit.c
View File

@ -564,9 +564,11 @@ static void outfit_parseSBeam(Outfit* tmp, const xmlNodePtr parent) {
node = parent->xmlChildrenNode; node = parent->xmlChildrenNode;
do { /* Load all the data. */ do { /* Load all the data. */
xmlr_float(node, "range", tmp->u.bem.range); xmlr_float(node, "range", tmp->u.bem.range);
xmlr_float(node, "turn", tmp->u.bem.turn); xmlr_float(node, "turn", tmp->u.bem.turn);
xmlr_float(node, "energy", tmp->u.bem.energy); xmlr_float(node, "energy", tmp->u.bem.energy);
xmlr_long(node, "delay", tmp->u.bem.delay);
xmlr_long(node, "duration", tmp->u.bem.duration);
if(xml_isNode(node, "damage")) if(xml_isNode(node, "damage"))
outfit_parseDamage(&tmp->u.bem.dtype, &tmp->u.bem.damage, node); outfit_parseDamage(&tmp->u.bem.dtype, &tmp->u.bem.damage, node);
@ -575,6 +577,8 @@ static void outfit_parseSBeam(Outfit* tmp, const xmlNodePtr parent) {
tmp->u.bem.colour = &cWhite; /** @todo Make it loadable. */ tmp->u.bem.colour = &cWhite; /** @todo Make it loadable. */
#define MELEMENT(o,s) if(0) WARN("Outfit '%s' missing/invalid '"s"' element", tmp->name) #define MELEMENT(o,s) if(0) WARN("Outfit '%s' missing/invalid '"s"' element", tmp->name)
MELEMENT(tmp->u.bem.delay==0, "range");
MELEMENT(tmp->u.bem.duration==0, "duration");
MELEMENT(tmp->u.bem.range==0, "range"); MELEMENT(tmp->u.bem.range==0, "range");
MELEMENT(tmp->u.bem.turn==0, "turn"); MELEMENT(tmp->u.bem.turn==0, "turn");
MELEMENT(tmp->u.bem.energy==0, "energy"); MELEMENT(tmp->u.bem.energy==0, "energy");

15
src/outfit.h
View File

@ -63,13 +63,14 @@ typedef struct OutfitBoltData_ {
* @brief Represents the particular properties of a beam weapon. * @brief Represents the particular properties of a beam weapon.
*/ */
typedef struct OutfitBeamData_ { typedef struct OutfitBeamData_ {
unsigned int delay; /**< Delay between usage. */ unsigned int delay; /**< Delay between usage. */
double range; /**< How far it goes. */ unsigned int duration; /**< How long the beam lasts active. */
double turn; /**< How fast it can turn. Only for turrets. */ double range; /**< How far it goes. */
glColour* colour; /**< Beam colour. */ double turn; /**< How fast it can turn. Only for turrets. */
double energy; /**< Amount of energy it drains (per second). */ glColour* colour; /**< Beam colour. */
DamageType dtype; /**< Damage type. */ double energy; /**< Amount of energy it drains (per second). */
double damage; /**< Damage amount. */ DamageType dtype; /**< Damage type. */
double damage; /**< Damage amount. */
} OutfitBeamData; } OutfitBeamData;
/** /**