Save and restore trade_end_empty. Set to Y for terror.

TradeWars Proxy Notes.md

@@ -31,7 +31,8 @@
   
 # BUG
 
-* none that this moment.  Get writing some!
+* terror:  The trade empty flag wasn't set.  Cargo in holds couldn't be sold, endless loop.
+* 
 
 
 ## Things to Improve / Fix

scripts.cpp

@@ -1,8 +1,9 @@
 #include "scripts.h"
 
-#include "logging.h"
 #include <boost/format.hpp>
 
+#include "logging.h"
+
 #ifdef DEPRECATED_SEE_TRADER_DISPATCH
 
 ScriptTrader::ScriptTrader(Director &d) : Dispatch(d) {
@@ -524,18 +525,29 @@ void ScriptTerror::activate(void) {
   BUGZ_LOG(warning) << "ScriptTerror::activate()";
   // Need: InputDispatch, MoveDispatch, ScriptTrader
 
+  // Save the trade_end_empty, and set to Y
+  if (director.galaxy.config["trade_end_empty"]) {
+    old_trade_end_empty =
+        director.galaxy.config["trade_end_empty"].as<std::string>();
+  } else {
+    old_trade_end_empty = "Y";
+  }
+  director.galaxy.config["trade_end_empty"] = "Y";
+
   // Step 1:  Get number of loops of terror
   director.chain = input;
   input->activate();
 
-  // Step 2:  Look for closest trades, try ScriptTrade until none < some level.
-  // Step 3:  Move on, unless out of loops (or low on turns)
+  // Step 2:  Look for closest trades, try ScriptTrade until none < some
+  // level. Step 3:  Move on, unless out of loops (or low on turns)
 
   // deactivate();
 }
 
 void ScriptTerror::deactivate(void) {
   BUGZ_LOG(warning) << "ScriptTerror::deactivate()";
+  // restore the original value.
+  director.galaxy.config["trade_end_empty"] = old_trade_end_empty;
   notify();
 }
 
@@ -562,7 +574,7 @@ void ScriptTerror::input_notify(void) {
   // ok, step 2:  move!
   // md->setNotify([this]() { this->proxy_deactivate(); });
 
-  BUGZ_LOG(fatal) << "Moving to: " << ppt.s1;          
+  BUGZ_LOG(fatal) << "Moving to: " << ppt.s1;
   md->move_to = ppt.s1;
   director.chain = move;
   director.chain->activate();
@@ -598,7 +610,8 @@ void ScriptTerror::trade_notify(void) {
       deactivate();
       return;
     }
-    if ((director.current_sector == ppt.s1) || (director.current_sector == ppt.s2)) {
+    if ((director.current_sector == ppt.s1) ||
+        (director.current_sector == ppt.s2)) {
       // We're still here...
       BUGZ_LOG(fatal) << "Trade it again, Sam.";
       to_client("Keep trading.\n\r");

scripts.h

@@ -65,7 +65,8 @@ class ScriptTerror : public Dispatch {
   std::shared_ptr<Dispatch> input;
   TraderDispatch * td;
   std::shared_ptr<Dispatch> trader;
-
+  std::string old_trade_end_empty;
+  
  public:
   ScriptTerror(Director &);
   ~ScriptTerror();