Fixes, added highwater support for Jam

golded3/gccfgg.h

@@ -226,6 +226,7 @@ const word CRC_INTERNETSERVER   = 0xA01B;
 const word CRC_INVALIDATE       = 0x69CB;
 const word CRC_JAMHARDDELETE    = 0xE2D5;
 const word CRC_JAMPATH          = 0x1200;
+const word CRC_JAMSMAPIHIGHWATER= 0x74A4;
 const word CRC_KEYBCLEAR        = 0xD407;
 const word CRC_KEYBDEFAULTS     = 0x9FAE;
 const word CRC_KEYBEXT          = 0xC48A;

golded3/gccfgg0.cpp

@@ -66,6 +66,7 @@ tglobalbool globalbool[gswitches_last] = {
   { CRC_AREALISTPAGEBAR          }, // 0x6C37;
   { CRC_USEMSGID                 }, // 0x6FDB;
   { CRC_LOOKUPNET                }, // 0x7359;
+  { CRC_JAMSMAPIHIGHWATER        }, // 0x74A4;
   { CRC_SQUISHDIRECT             }, // 0x7C35;
   { CRC_FIDOHWMARKS              }, // 0x7E07;
   { CRC_MSGLISTPAGEBAR           }, // 0x8041;

golded3/gckeys.cpp

@@ -1120,7 +1120,7 @@ int ReadKeysCfg(int force) {
   vector<Macro>::iterator k;
   for(k=CFG->macro.begin(), n=0; k != CFG->macro.end(); k++, n++) {
     if(k->type == 0) {
-      if((k->key == KK_Auto) or (k->key == 0x0300)) {
+      if(k->key == KK_Auto) {
         // Start automacro
         mac = k->buf;
         while(*mac) {

golded3/gcprot.h

@@ -216,7 +216,6 @@ void CfgInternetreply    ();
 void CfgInternetrfcbody  ();
 void CfgInternetserver   ();
 void CfgInvalidate       ();
-void CfgJamharddelete    ();
 void CfgJampath          ();
 void CfgKeybclear        ();
 void CfgKeybdefaults     ();

golded3/gecfgg.h

@@ -53,6 +53,7 @@ enum en_gswitches {
   arealistpagebar,
   usemsgid,
   lookupnet,
+  jamsmapihw,
   squishdirect,
   fidohwmarks,
   msglistpagebar,

golded3/gecmfd.cpp

@@ -120,8 +120,10 @@ void Area::DeleteMsg(GMsg* msg, int direction) {
     if(isnet() and isfido())
       TouchNetscan(false);
 
-    // Remove message from internal table
-    Msgn.Del(msg->msgno);
+    if(not issmb() and not (isjam() and not CFG->switches.get(jamharddelete))) {
+      // Remove message from internal table
+      Msgn.Del(msg->msgno);
+    }
 
     // Update lastreads
     if(Msgn.Count())

golded3/gehdre.cpp

@@ -427,7 +427,6 @@ int EditHeaderinfo(int mode, GMsgHeaderView &view) {
 
   ChgAttrs(YES, msg);
 
-  whelpdef(CFG->helpged, Key_F1, C_HELPB, C_HELPW, C_HELPQ, C_HELPS, NULL);
   vcurshow();
   if(not (hedit.lookup or AA->isnet())) {
     char date2[25] = {""};

golded3/geinit.cpp

@@ -1033,7 +1033,7 @@ void Initialize(int argc, char* argv[]) {
   #ifndef GMB_NOJAM
   if(AL.msgbases & MT_JAM) {
     update_statuslinef("%s JAM", LNG->Checking);
-    JamInit(CFG->jampath, CFG->switches.get(jamharddelete));
+    JamInit(CFG->jampath, CFG->switches.get(jamharddelete), CFG->switches.get(jamsmapihw));
   }
   #endif
   #ifndef GMB_NOPCB

golded3/gemenu.cpp

@@ -571,7 +571,6 @@ void ChgAttrs(int mode, GMsg* __msg) {
   }
   else {
     DispAttrWindow(false);
-    freonkey();
   }
 }
 
@@ -582,7 +581,6 @@ void AskAttributes(GMsg* __msg) {
 
   ChgAttrs(ALWAYS, __msg);
   update_statusline(LNG->ChangeAttrs);
-  whelpdef(CFG->helpged, Key_F1, C_HELPB, C_HELPW, C_HELPQ, C_HELPS, NULL);
   whelppcat(H_Attributes);
 
   gkey key;

golded3/gemlst.cpp

@@ -340,7 +340,6 @@ bool GMsgList::handle_key() {
       break;
 
     case KK_ListGotoNext:
-    listgotonext:
       key = Key_Dwn;
       default_handle_key();
       break;

golded3/gmarea.h

@@ -444,6 +444,7 @@ public:
   int isjam() const;
   int ispcboard() const;
   int issquish() const;
+  int issmb() const;
   int iswildcat() const;
   int isadeptxbbs() const;
   int isseparator() const;
@@ -607,6 +608,7 @@ inline int Area::ishudson() const    { return area->ishudson(); }
 inline int Area::isjam() const       { return area->isjam(); }
 inline int Area::ispcboard() const   { return area->ispcboard(); }
 inline int Area::issquish() const    { return area->issquish(); }
+inline int Area::issmb() const       { return area->issmb(); }
 inline int Area::iswildcat() const   { return area->iswildcat(); }
 inline int Area::isadeptxbbs() const { return area->isadeptxbbs(); }
 inline int Area::isseparator() const { return area->isseparator(); }