Changeset 115 for trunk/gotcha.cpp

Timestamp:

Aug 8, 2021, 6:59:05 PM (4 years ago)

Author:

Gregg Young

Message:

Changes to remove obsolete help files; select language based on system language; remove language selection from Gotcha! Quiet; Combine program and help language selection in Gotcha. Changes to get Gotcha! Quiet working in ArcaOS installer.

File:

• trunk/gotcha.cpp (modified) (7 diffs)

trunk/gotcha.cpp

@@ -39 +39 @@
 Helper      *g_phelp = NULL;
 BOOL        g_usePMps = FALSE;
+CHAR        g_installerSavePath[_MAX_PATH] = {0};
+BOOL        g_installer = FALSE;
+CHAR        g_installerINI[_MAX_PATH] = {0};
 
 #include "bitmap.cpp"
@@ -92 +95 @@
             g_usePMps = TRUE;
         }
-        if (stricmp (argv[i], "-i") == 0)
+        if (stricmp (argv[i], "-i") == 0 || stricmp (argv[i], "-i+") == 0)
         {
+            CHAR * memdrv = getenv("MEMDRIVE");
+
             g_installer = TRUE;
-            pset->SetFileSaveStyle (FSS_NUMFILES);
-            pset->SetNumSaveDir ("Z:\\");
+            
+            if (memdrv) {
+                strcpy(g_installerSavePath, memdrv);
+                strcat(g_installerSavePath, ":\\");
+            }
+            else
+                strcpy(g_installerSavePath, "Z:\\");
+            if (stricmp (argv[i], "-i+") == 0)
+                strcpy(g_installerINI, "gotchaq.ini");
+            else {
+                strcpy(g_installerINI, g_installerSavePath);
+                strcat(g_installerINI, "gotchaq.ini");
+            }
         }
 #endif
@@ -120 +136 @@
     HMQ hmq = WinCreateMsgQueue (hab, 0);
     int rc;
-
+#ifdef _QUIET_  //Needed here for setting adjustments for installer version
+    CheckCmdlineArgs (argc, argv);
+#endif
     // Load settings moved up here so the string table is available for the already running error
     pset = new SETTINGS;
@@ -129 +147 @@
     pset->pForceSaveFile = pset->QueryForceSaveFile();
     pset->bSerialCapture = pset->SerialCapture ();
-    //DisplayError("DEBUG", "%d", Version());
-#if 0
+    //Reset Save style and directory for installer
+    
 #ifdef _QUIET_
-    HINI hini = PrfOpenProfile (hab, "gotchaq.ini");
-#else
-    HINI hini = PrfOpenProfile (hab, "gotcha.ini");
-#endif
-    BOOL fLChange = FALSE;
-    ULONG ulDataSize;
-    PrfQueryProfileSize(hini, "Language", "LangChangeRequested", &ulDataSize );
-    PrfQueryProfileData(hini, "Language", "LangChangeRequested", &fLChange, &ulDataSize);
-    if (!fLChange) {
-    CHAR *lang = getenv("LANG");
-#ifdef _QUIET_
-    PSZ  psz = "goqresen";
-#else
-    PSZ  psz = "gotresen";
-#endif
-    PSZ  pszh = "gotcha_en";
-    if (lang) {
-        if (!strnicmp(lang, "es", 2)) {
-            psz = "gotreses";
-            pszh = "gotcha_es";
-        }
-        else if (!strnicmp(lang, "cs", 2)) {
-            psz = "gotrescz";
-        }
-        else if (!strnicmp(lang, "de", 2)) {
-            psz = "gotresde";
-        }
-        else if (!strnicmp(lang, "it", 2)) {
-            psz = "gotresit";
-            pszh = "gotcha_it";
-        }
-        else if (!strnicmp(lang, "br", 2)) {
-            psz = "gotresbr";
-            pszh = "gotcha_br";
-        }
-    }
-    pset->SetString(SEI_LANGUAGE, psz);
-    pset->SetString (SEI_LANGUAGEHELP, pszh);
-
-    pset->Save ();
-    pset->ReloadResources (pset->QueryString(SEI_LANGUAGE));
-    //fLChange = FALSE;
-        //PrfWriteProfileData(hini, "Language", "LangChangeRequested", &fLChange, sizeof(BOOL));
-    }
-    if (hini)
-        PrfCloseProfile (hini);
-#endif
-#ifdef _QUIET_
-    CheckCmdlineArgs (argc, argv);
+    
     if ((Version() < 2))
     {
@@ -267 +237 @@
 #endif
     g_phelp = new Helper(hwndFrame);
-
 
     // do the main msg loop
@@ -345 +314 @@
 }
 
+#if 0
 // saymsg2 was adapted from code in FM/2
 APIRET saymsg2(int DefaultButton, HWND hwnd,  PCSZ pszTitle, PCSZ pszFmt, ...)
@@ -395 +365 @@
   return MBID_ERROR;
 }
+#endif
 // ** AddSysMenuItem ****************************************************** /*FOLD00*/