From 2740b901e426ff4cb55c758e6ff130f11c941e8c Mon Sep 17 00:00:00 2001
From: johns <>
Date: Mon, 12 Mar 2001 23:18:21 +0000
Subject: [PATCH] Fixed bug: New orders didn't reset path in return goods.
---
src/action/action_returngoods.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/action/action_returngoods.cpp b/src/action/action_returngoods.cpp
index d1c1d15c8..6e26433d4 100644
--- a/src/action/action_returngoods.cpp
+++ b/src/action/action_returngoods.cpp
@@ -65,9 +65,9 @@ global void HandleActionReturnGoods(Unit* unit)
RefsDebugCheck( !destu->Refs );
++destu->Refs;
unit->Orders[0].RangeX=unit->Orders[0].RangeY=1;
- unit->Orders[0].X=-1;
- unit->Orders[0].Y=-1;
+ unit->Orders[0].X=unit->Orders[0].Y=-1;
unit->Orders[0].Action=UnitActionMineGold;
+ NewResetPath(unit);
#else
if( !(destu=FindGoldDeposit(unit,unit->X,unit->Y)) ) {
// No deposit -> can't return
@@ -101,11 +101,11 @@ global void HandleActionReturnGoods(Unit* unit)
RefsDebugCheck( !destu->Refs );
++destu->Refs;
unit->Orders[0].RangeX=unit->Orders[0].RangeY=1;
- unit->Orders[0].X=-1;
- unit->Orders[0].Y=-1;
+ unit->Orders[0].X=unit->Orders[0].Y=-1;
DebugLevel3("Return to %Zd=%d,%d\n"
,UnitNumber(destu),unit->Orders[0].X,unit->Orders[0].Y);
unit->Orders[0].Action=UnitActionHarvest;
+ NewResetPath(unit);
#else
if( !(destu=FindWoodDeposit(unit->Player,unit->X,unit->Y)) ) {
// No deposit -> can't return
@@ -142,11 +142,11 @@ global void HandleActionReturnGoods(Unit* unit)
RefsDebugCheck( !destu->Refs );
++destu->Refs;
unit->Orders[0].RangeX=unit->Orders[0].RangeY=1;
- unit->Orders[0].X=-1;
- unit->Orders[0].Y=-1;
+ unit->Orders[0].X=unit->Orders[0].Y=-1;
DebugLevel3("Return to %Zd=%d,%d\n"
,UnitNumber(destu),unit->Orders[0].X,unit->Orders[0].Y);
unit->Orders[0].Action=UnitActionHaulOil;
+ NewResetPath(unit);
#else
if( !(destu=FindOilDeposit(unit->Player,unit->X,unit->Y)) ) {
// No deposit -> can't return