diff --git a/src/lib/commands/lten.c b/src/lib/commands/lten.c index f5df960d..3cbc4ada 100644 --- a/src/lib/commands/lten.c +++ b/src/lib/commands/lten.c @@ -85,7 +85,7 @@ ltend(void) ontender = tender.shp_item[ip->i_uid]; if (ontender == 0 && amt > 0) { pr("No %s on %s\n", ip->i_name, prship(&tender)); - return RET_FAIL; + continue; } vbase = &mchr[(int)tender.shp_type]; maxtender = vbase->m_item[ip->i_uid]; diff --git a/src/lib/commands/tend.c b/src/lib/commands/tend.c index 25a054dc..deec23a4 100644 --- a/src/lib/commands/tend.c +++ b/src/lib/commands/tend.c @@ -119,7 +119,7 @@ tend(void) ontender = tender.shp_item[ip->i_uid]; if (ontender == 0 && amt > 0) { pr("No %s on %s\n", ip->i_name, prship(&tender)); - return RET_FAIL; + continue; } vbase = &mchr[(int)tender.shp_type]; maxtender = vbase->m_item[ip->i_uid]; diff --git a/tests/load-tend/03-tend-1 b/tests/load-tend/03-tend-1 index c51b8d81..a9f83e25 100644 --- a/tests/load-tend/03-tend-1 +++ b/tests/load-tend/03-tend-1 @@ -82,7 +82,6 @@ tend h 150 -1 170/171 || tend something the tender doesn't have tend h 150/152 1 151 tend h 151 -1 150/152 -| odd: first command fails, second doesn't | || tend something the target can't hold tend u 150 1 170/171 diff --git a/tests/load-tend/journal.log b/tests/load-tend/journal.log index c5f61807..b051b0e2 100644 --- a/tests/load-tend/journal.log +++ b/tests/load-tend/journal.log @@ -2184,7 +2184,7 @@ Play#1 input tend h 170/171 1 150 Play#1 command tend Play#1 output Play#1 1 No heavy products on frg frigate (#170) - Play#1 output Play#1 1 command failed + Play#1 output Play#1 1 No heavy products on sb submarine (#171) Play#1 output Play#1 6 0 406 Play#1 input tend h 150 -1 170/171 Play#1 command tend @@ -2195,7 +2195,7 @@ Play#1 input tend h 150/152 1 151 Play#1 command tend Play#1 output Play#1 1 No heavy products on cs cargo ship (#150) - Play#1 output Play#1 1 command failed + Play#1 output Play#1 1 No heavy products on cs cargo ship (#152) Play#1 output Play#1 6 0 404 Play#1 input tend h 151 -1 150/152 Play#1 command tend @@ -2532,7 +2532,7 @@ Play#1 input ltend i 200/201 1 350/352 Play#1 command ltend Play#1 output Play#1 1 No iron ore on cs cargo ship (#200) - Play#1 output Play#1 1 command failed + Play#1 output Play#1 1 No iron ore on cs cargo ship (#201) Play#1 output Play#1 6 0 370 Play#1 input ltend c 200/201 1 350/352 Play#1 command ltend @@ -2544,7 +2544,7 @@ Play#1 input ltend h 200/201 1 350/352 Play#1 command ltend Play#1 output Play#1 1 No heavy products on cs cargo ship (#200) - Play#1 output Play#1 1 command failed + Play#1 output Play#1 1 No heavy products on cs cargo ship (#201) Play#1 output Play#1 6 0 368 Play#1 input ltend f 200/201 0 350/351//352 Play#1 command ltend