From 8a72d0da3e0751f7395b0fca7b43673b50001b24 Mon Sep 17 00:00:00 2001
From: "Alexander S. Aganichev" <asa@eed.miee.ru>
Date: Wed, 24 Oct 2001 14:43:48 +0000
Subject: [PATCH] Updated for the new version of SpaceToss

---
 docs/notework.txt         |  6 +++--
 goldlib/gall/gvidbase.cpp |  2 ++
 goldlib/gcfg/gxspace.cpp  | 57 ++++++++++++++++++++++++++++++++++++---
 3 files changed, 60 insertions(+), 5 deletions(-)

diff --git a/docs/notework.txt b/docs/notework.txt
index db4165f..0194de0 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -13,8 +13,10 @@ ______________________________________________________________________
 ______________________________________________________________________
 
 + Added support for SpaceToss areafile. WARNING: there's no known way
-  to obtain primary AKA for echo areas from tosser config so you'll
-  need to define them manually. Main AKA will be used by default.
+  to obtain primary AKA for echo areas from tosser config ver 1.10 so
+  you'll need to define them manually. Main AKA will be used by
+  default. On newer versions (with UseAKA support) you should not
+  expirience this problem.
 
 - Thanks to Pavel Tsekov few more memory leaks was eliminated.
 
diff --git a/goldlib/gall/gvidbase.cpp b/goldlib/gall/gvidbase.cpp
index 676d8e0..1164873 100644
--- a/goldlib/gall/gvidbase.cpp
+++ b/goldlib/gall/gvidbase.cpp
@@ -79,7 +79,9 @@
 //  ------------------------------------------------------------------
 
 static bool __vcurhidden = false;
+#if defined(__UNIX__) || defined(__USE_NCURSES__)
 static unsigned long gvid_boxcvtc(char);
+#endif
 
 #if !defined(__USE_NCURSES__)
 
diff --git a/goldlib/gcfg/gxspace.cpp b/goldlib/gcfg/gxspace.cpp
index 14cba42..783a796 100644
--- a/goldlib/gcfg/gxspace.cpp
+++ b/goldlib/gcfg/gxspace.cpp
@@ -21,7 +21,7 @@
 //  ------------------------------------------------------------------
 //  $Id$
 //  ------------------------------------------------------------------
-//  Read areas from SpaceToss 1.10
+//  Read areas from SpaceToss 1.10 and higher
 //  ------------------------------------------------------------------
 
 #include <cstdlib>
@@ -31,6 +31,8 @@
 #undef GCFG_NOSPCT
 #include <gedacfg.h>
 
+static Path SpaceTossAreafile;
+
 
 //  ------------------------------------------------------------------
 
@@ -38,12 +40,17 @@ void gareafile::ParseSpaceArea(const char *type_path, AreaCfg &aa) {
 
   if(strnieql(type_path, "msg", 3))
     aa.msgbase = fidomsgtype;
-  else if(strnieql(type_path, "hud", 3))
+  else if(strnieql(type_path, "hud", 3)) {
     aa.msgbase = GMB_HUDSON;
+    aa.board = atoi(type_path+3);
+    return;
+  }
   else if(strnieql(type_path, "jam", 3))
     aa.msgbase = GMB_JAM;
   else if(strnieql(type_path, "sqh", 3))
     aa.msgbase = GMB_SQUISH;
+  else if(strnieql(type_path, "smb", 3))
+    aa.msgbase = GMB_SMB;
   else {
     aa.msgbase = 0;
     return;
@@ -62,6 +69,8 @@ void gareafile::ReadSpaceAr(const char* file) {
   const word CRC_PATH = 0x0212;
   const word CRC_FLAGS = 0xF81A;
   const word CRC_GROUP = 0x1C9B;
+  const word CRC_TYPE = 0x59E2;
+  const word CRC_USEAKA = 0x2F7D;
   const word CRC_ENDAREA = 0x3E9F;
 
   FILE* fp = fsopen(file, "rb", sharemode);
@@ -95,12 +104,40 @@ void gareafile::ReadSpaceAr(const char* file) {
         case CRC_PATH:
           ParseSpaceArea(val, aa);
           break;
+        case CRC_USEAKA:
+          aa.aka.set(val);
+          break;
         case CRC_FLAGS:
           if(strpbrk(val,"Ll")) {
             aa.type = GMB_LOCAL;
             aa.attr = attribslocal;
           }
           break;
+        case CRC_TYPE: {
+          const word CRC_ECHO = 0xC2D1;
+          const word CRC_NET = 0xEC5E;
+          const word CRC_LOCAL = 0x4CD5;
+          const word CRC_DUPE = 0x9B1D;
+          const word CRC_BAD = 0x29C2;
+
+          switch(getkeyvalcrc(&key, &val)) {
+            case CRC_ECHO:
+              aa.type = GMB_ECHO;
+              aa.attr = attribsecho;
+              break;
+            case CRC_NET:
+              aa.type = GMB_NET;
+              aa.attr = attribsnet;
+              break;
+            case CRC_LOCAL:
+            case CRC_DUPE:
+            case CRC_BAD:
+              aa.type = GMB_LOCAL;
+              aa.attr = attribslocal;
+              break;
+          }
+          break;
+        }
         case CRC_GROUP:
           aa.groupid = toupper(*val);
           break;
@@ -189,6 +226,9 @@ void gareafile::ReadSpaceCtl(const char* file) {
   const word CRC_NETMAIL = 0xE42E;
   const word CRC_BADMAIL = 0xE697;
   const word CRC_DUPEMAIL = 0xB38B;
+  const word CRC_HUDSONPATH = 0x52A7;
+  const word CRC_EXPORTLISTS = 0xB709;
+  const word CRC_AREAFILE = 0xB487;
 
   FILE* fp = fsopen(file, "rb", sharemode);
   if(fp) {
@@ -231,6 +271,15 @@ void gareafile::ReadSpaceCtl(const char* file) {
           aa.type = GMB_LOCAL;
           aa.attr = attribslocal;
           break;
+        case CRC_HUDSONPATH:
+          CfgHudsonpath(val);
+          break;
+        case CRC_EXPORTLISTS:
+          CfgJampath(val);
+          break;
+        case CRC_AREAFILE:
+          strxcpy(SpaceTossAreafile, val, sizeof(SpaceTossAreafile));
+          break;
       }
 
       if(aa.type != 0xFF) {
@@ -274,11 +323,13 @@ void gareafile::ReadSpaceToss(char* tag) {
 
   CfgSquishuserpath(path);
 
+  strcpy(SpaceTossAreafile, "spctoss.ar");
+
   MakePathname(file, path, "spctoss.ctl");
   ReadSpaceCtl(file);
   MakePathname(file, path, "spctoss.ntm");
   ReadSpaceNtm(file);
-  MakePathname(file, path, "spctoss.ar");
+  MakePathname(file, path, SpaceTossAreafile);
   ReadSpaceAr(file);
 }