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

do not damage ships with no owner while still in production

Browse source
This commit is contained in:
Enno Rehling 2010-09-02 23:25:25 -07:00
parent bf5bccc133
commit db8f2f7d0c
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gamecode/laws.c
View file

@ -2659,12 +2659,15 @@ sinkships(region * r)
while (*shp) { while (*shp) {
ship * sh = *shp; ship * sh = *shp;
if (fval(r->terrain, SEA_REGION) && (!enoughsailors(sh, r) || get_captain(sh)==NULL)) {
/* Schiff nicht seetüchtig */ if (!sh->type->construction || sh->size>=sh->type->construction->maxsize) {
damage_ship(sh, 0.30); if (fval(r->terrain, SEA_REGION) && (!enoughsailors(sh, r) || get_captain(sh)==NULL)) {
} /* Schiff nicht seetüchtig */
if (shipowner(sh)==NULL) { damage_ship(sh, 0.30);
damage_ship(sh, 0.05); }
if (shipowner(sh)==NULL) {
damage_ship(sh, 0.05);
}
} }
if (sh->damage >= sh->size * DAMAGE_SCALE) { if (sh->damage >= sh->size * DAMAGE_SCALE) {
remove_ship(shp, sh); remove_ship(shp, sh);