Merge branch 'work1'

dispatchers.cpp

@@ -415,6 +415,10 @@ MoveDispatch::MoveDispatch(Director &d) : Dispatch(d) {
   BUGZ_LOG(warning) << "MoveDispatch()";
 }
 
+MoveDispatch::~MoveDispatch() {
+  BUGZ_LOG(warning) << "~MoveDispatch()";
+}
+
 // sector_type move_to;
 
 void MoveDispatch::activate(void) {
@@ -453,6 +457,8 @@ void MoveDispatch::server_line(const std::string &line,
     }
   }
 
+  // SL: [###### DANGER! You have marked sector 740 to be avoided!]
+
   if ((state != 2) && (state != 5)) {
     // hide the density scan part
     std::string temp = raw_line;
@@ -542,6 +548,9 @@ bool MoveDispatch::density_clear(density d) {  // int sector, int density) {
 void MoveDispatch::server_prompt(const std::string &prompt) {
   BUGZ_LOG(fatal) << "server_prompt: " << prompt;
 
+  // SL: [###### DANGER! You have marked sector 740 to be avoided!]
+  // SP: [Do you really want to warp there? (Y/N) ]
+
   if (state == 2) {
     if (at_command_prompt(prompt)) {
       // Ok, density is done

dispatchers.h

@@ -129,6 +129,8 @@ class CIMDispatch : public Dispatch {
 class MoveDispatch : public Dispatch {
  public:
   MoveDispatch(Director &);
+  ~MoveDispatch();
+  
   sector_type move_to;
   sector_type starting;
   int state;

scripts.cpp

@@ -219,7 +219,7 @@ void ScriptTerror::trade_notify(void) {
 }
 
 ScriptVoyager::ScriptVoyager(Director &d) : Dispatch(d) {
-  BUGZ_LOG(warning) << "SCriptVoyager()";
+  BUGZ_LOG(warning) << "ScriptVoyager()";
   init();
 }
 
@@ -308,6 +308,9 @@ void ScriptVoyager::next(void) {
 
 }
 
+// SL: [###### DANGER! You have marked sector 740 to be avoided!]
+// SP: [Do you really want to warp there? (Y/N) ]
+
 void ScriptVoyager::server_prompt(const std::string &prompt) {
 
 }