Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename ship_sailors to crew_skill, it's more descriptive

This commit is contained in:
Enno Rehling 2015-04-18 08:34:13 +02:00
parent afbc4c816b
commit c322fbffd5
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/kernel/ship.c
View File

@ -305,6 +305,7 @@ int shipspeed(const ship * sh, const unit * u)
static bool init; static bool init;
attrib *a; attrib *a;
struct curse *c; struct curse *c;
int bonus;
assert(sh); assert(sh);
if (!u) u = ship_owner(sh); if (!u) u = ship_owner(sh);
@ -334,7 +335,11 @@ int shipspeed(const ship * sh, const unit * u)
} }
} }
k += ShipSpeedBonus(u); bonus = ShipSpeedBonus(u);
if (bonus > 0) {
//
}
k += bonus;
a = a_find(sh->attribs, &at_speedup); a = a_find(sh->attribs, &at_speedup);
while (a != NULL && a->type == &at_speedup) { while (a != NULL && a->type == &at_speedup) {

1
src/kernel/ship.h
View File

@ -36,6 +36,7 @@ extern "C" {
char *_name; char *_name;
int range; /* range in regions */ int range; /* range in regions */
int range_max;
int flags; /* flags */ int flags; /* flags */
int combat; /* modifier for combat */ int combat; /* modifier for combat */
int fishing; /* weekly income from fishing */ int fishing; /* weekly income from fishing */

1
src/kernel/xmlreader.c
View File

@ -509,6 +509,7 @@ static int parse_ships(xmlDocPtr doc)
st->minskill = xml_ivalue(node, "minskill", st->minskill); st->minskill = xml_ivalue(node, "minskill", st->minskill);
st->sumskill = xml_ivalue(node, "sumskill", st->sumskill); st->sumskill = xml_ivalue(node, "sumskill", st->sumskill);
st->range = xml_ivalue(node, "range", st->range); st->range = xml_ivalue(node, "range", st->range);
st->range_max = xml_ivalue(node, "range_max", st->range_max);
st->storm = xml_fvalue(node, "storm", st->storm); st->storm = xml_fvalue(node, "storm", st->storm);
/* reading eressea/ships/ship/construction */ /* reading eressea/ships/ship/construction */