Fix tend from target not to stop on foreign target
Tending a negative number of commodities takes from the target ships. When a target ship is foreign, tend silently stops. This is wrong. Fix it to skip foreign target ships instead. Broken when Chainsaw 2 added tending to allies.
This commit is contained in:
parent
f11071f3b7
commit
20b2598214
1 changed files with 3 additions and 4 deletions
|
@ -30,7 +30,7 @@
|
|||
* Dave Pare, 1986
|
||||
* Thomas Ruschak, 1992
|
||||
* Steve McClure, 2000
|
||||
* Markus Armbruster, 2004-2011
|
||||
* Markus Armbruster, 2004-2012
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
|
@ -148,10 +148,9 @@ tend(void)
|
|||
vbase = &mchr[(int)target.shp_type];
|
||||
maxtarget = vbase->m_item[ip->i_uid];
|
||||
if (amt < 0) {
|
||||
if (!player->owner)
|
||||
amt = 0;
|
||||
|
||||
/* take from target and give to tender */
|
||||
if (!player->owner)
|
||||
continue;
|
||||
transfer = MIN(ontarget, -amt);
|
||||
transfer = MIN(maxtender - ontender, transfer);
|
||||
if (transfer == 0)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue