Changeset 129 for trunk/settings.cpp

Timestamp:

Sep 5, 2021, 7:31:26 PM (4 years ago)

Author:

Gregg Young

Message:

Use WorkPlace Sans on ecs systems. Hard code error that resource dll could not be loaded (they contain the string table)

File:

• trunk/settings.cpp (modified) (2 diffs)

trunk/settings.cpp

@@ -1360 +1360 @@
             p = env;
             p++;
-            if (!stricmp(p, ":\\sys")) {
+            if (!stricmp(p, ":\\sys") || !stricmp(p, ":\\ecs")) {
                 strcpy(ucFont, "9.Workplace Sans");
                 WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
             }
-            /*if (pset->GetLangID() == RU || pset->GetLangID() == CZ || pset->GetLangID() == PL) {*/
             else {
                 strcpy(ucFont, "9.Times New Roman MT 30");
                 WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
             }
-            /*else if (g_installer) {
-                strcpy(ucFont, 9.WarpSans");
-                WinSetPresParam(hwnd, PP_FONTNAMESIZE, strlen(ucFont) + 1, ucFont);
-            } */
         return MRESULT (FALSE);
         }
@@ -1522 +1517 @@
     if ((rc = DosLoadModule(PSZ(NULL), 0, psz, &g_hmod)))
     {
-        DisplayError(RSTR(IDS_HEADER_ERROR),
-                     RSTR(IDS_ERROR_RESOURSEMODFAILED), psz, rc);
+        DisplayError("Error",
+                     "Could not (re)load resource module '%s' (return code %d). "
+                     "Make sure the DLL is in the LIBPATH. If this is the case, "
+                     "try deleting GOTCHA.INI and restart. If this fails, contact "
+                     "the author (ygk@qwest.net).", psz, rc);
+        // This won't work since the strings are in the resource DLL
+        //DisplayError(RSTR(IDS_HEADER_ERROR),
+        //             RSTR(IDS_ERROR_RESOURSEMODFAILED), psz, rc);
         exit(1);
     }