[Fix] More FreeBSD fixes.

This commit is contained in:
Allanis 2014-05-28 15:50:24 +01:00
parent 74e1ba3342
commit 9f8dbeccb5

View File

@ -1440,8 +1440,12 @@ int pilot_rmMissionCargo(Pilot* pilot, unsigned int cargo_id, int jettison) {
sizeof(PilotCommodity) * (pilot->ncommodities-i-1)); sizeof(PilotCommodity) * (pilot->ncommodities-i-1));
pilot->ncommodities--; pilot->ncommodities--;
pilot->commodities = realloc(pilot->commodities, if(pilot->ncommodities == 0) {
sizeof(PilotCommodity) * pilot->ncommodities); free(pilot->commodities);
pilot->commodities = NULL;
} else
pilot->commodities = realloc(pilot->commodities,
sizeof(PilotCommodity) * pilot->ncommodities);
return 0; return 0;
} }
@ -1468,8 +1472,13 @@ int pilot_rmCargo(Pilot* pilot, Commodity* cargo, int quantity) {
memmove(pilot->commodities+i, pilot->commodities+i+1, memmove(pilot->commodities+i, pilot->commodities+i+1,
sizeof(PilotCommodity)*(pilot->ncommodities-i)); sizeof(PilotCommodity)*(pilot->ncommodities-i));
pilot->ncommodities--; pilot->ncommodities--;
pilot->commodities = realloc(pilot->commodities, if(pilot->ncommodities == 0) {
sizeof(PilotCommodity)*pilot->ncommodities); free(pilot->commodities);
pilot->commodities = NULL;
}
else
pilot->commodities = realloc(pilot->commodities,
sizeof(PilotCommodity) * pilot->ncommodities);
} else } else
pilot->commodities[i].quantity -= q; pilot->commodities[i].quantity -= q;