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

Bug 2617: Berechnung von Überladung berechnet Flotten korrekt.

This commit is contained in:
Enno Rehling 2019-11-02 19:09:15 +01:00
parent 0db8f2167b
commit 52ee682a48
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/move.c
View File

@ -501,7 +501,7 @@ static double overload(const region * r, ship * sh)
double ovl; double ovl;
getshipweight(sh, &n, &p); getshipweight(sh, &n, &p);
ovl = n / (double)sh->type->cargo; ovl = n / (double)(sh->type->cargo * sh->number);
if (mcabins) { if (mcabins) {
ovl = fmax(ovl, p / (double)mcabins); ovl = fmax(ovl, p / (double)mcabins);
} }
@ -746,7 +746,7 @@ double damage_overload(double overload)
} }
/* message to all factions in ship, start from firstu, end before lastu (may be NULL) */ /* message to all factions in ship, start from firstu, end before lastu (may be NULL) */
static void msg_to_ship_inmates(ship *sh, unit **firstu, unit **lastu, message *msg) { static void msg_to_passengers(ship *sh, unit **firstu, unit **lastu, message *msg) {
unit *u, *shipfirst = NULL; unit *u, *shipfirst = NULL;
for (u = *firstu; u != *lastu; u = u->next) { for (u = *firstu; u != *lastu; u = u->next) {
if (u->ship == sh) { if (u->ship == sh) {
@ -836,19 +836,19 @@ static void drifting_ships(region * r)
if (rnext && firstu) { if (rnext && firstu) {
message *msg = msg_message("ship_drift", "ship dir", sh, dir); message *msg = msg_message("ship_drift", "ship dir", sh, dir);
msg_to_ship_inmates(sh, &firstu, &lastu, msg); msg_to_passengers(sh, &firstu, &lastu, msg);
} }
fset(sh, SF_DRIFTED); fset(sh, SF_DRIFTED);
if (ovl >= overload_start()) { if (ovl >= overload_start()) {
damage_ship(sh, damage_overload(ovl)); damage_ship(sh, damage_overload(ovl));
msg_to_ship_inmates(sh, &firstu, &lastu, msg_message("massive_overload", "ship", sh)); msg_to_passengers(sh, &firstu, &lastu, msg_message("massive_overload", "ship", sh));
} }
else { else {
damage_ship(sh, damage_drift); damage_ship(sh, damage_drift);
} }
if (sh->damage >= sh->size * DAMAGE_SCALE) { if (sh->damage >= sh->size * DAMAGE_SCALE) {
msg_to_ship_inmates(sh, &firstu, &lastu, msg_message("shipsink", "ship", sh)); msg_to_passengers(sh, &firstu, &lastu, msg_message("shipsink", "ship", sh));
sink_ship(sh); sink_ship(sh);
remove_ship(shp, sh); remove_ship(shp, sh);
} }