Localization cleanup

CMakeLists.txt

@@ -97,9 +97,9 @@ endif()
 
 # 64 bit machines have a different game checksum than 32 bit machines
 if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-  add_definitions(-DCHECKSUM=2273889835UL)
+  add_definitions(-DCHECKSUM=2273864794UL)
 else()
-  add_definitions(-DCHECKSUM=2273873307UL)
+  add_definitions(-DCHECKSUM=2273860746UL)
 endif()
 
 if(BUILD_TESTING)

Descent3/CtlCfgElem.cpp

@@ -113,18 +113,20 @@
  * $NoKeywords: $
  */
 
+#include <cstring>
+#include <string>
+#include <vector>
+
 #include "CtlCfgElem.h"
 #include "descent.h"
 
 #include "Macros.h"
 #include "ddio.h"
-#include "application.h"
 #include "renderer.h"
 #include "stringtable.h"
 #include "gamefont.h"
 #include "localization.h"
 
-#include <string.h>
 #include "joystick.h"
 
 // all controller binding texts
@@ -417,58 +419,58 @@ extern char Ctltext_MseBtnBindings[][32];
 extern char Ctltext_MseAxisBindings[][32];
 
 void Localize_ctl_bindings() {
-  char **strtable;
-  int n_strings, i;
+  std::vector<std::string> strtable;
+  int i;
 
   // keyboard translations.
   // no need to do for english!
   if (Localization_GetLanguage() == LANGUAGE_ENGLISH)
     return;
 
-  if (CreateStringTable("bindkey.str", &strtable, &n_strings)) {
+  if (CreateStringTable("bindkey.str", strtable)) {
     i = 0;
     while (key_binding_indices[i] != 0xff) {
-      if (i >= n_strings) {
+      if (i >= strtable.size()) {
         break;
       }
-      strcpy(Ctltext_KeyBindings[key_binding_indices[i]], strtable[i]);
+      strcpy(Ctltext_KeyBindings[key_binding_indices[i]], strtable[i].c_str());
       i++;
     }
-    DestroyStringTable(strtable, n_strings);
+    DestroyStringTable(strtable);
   }
 
   // mouse translations.
-  if (CreateStringTable("bindmse.str", &strtable, &n_strings)) {
+  if (CreateStringTable("bindmse.str", strtable)) {
     for (i = 0; i < 6; i++) {
-      if (i >= n_strings) {
+      if (i >= strtable.size()) {
         break;
       }
-      strcpy(Ctltext_MseBtnBindings[i], strtable[i]);
+      strcpy(Ctltext_MseBtnBindings[i], strtable[i].c_str());
     }
     for (i = 0; i < 3; i++) {
-      if ((i + 6) >= n_strings) {
+      if ((i + 6) >= strtable.size()) {
         break;
       }
-      strcpy(Ctltext_MseAxisBindings[i], strtable[i + 6]);
+      strcpy(Ctltext_MseAxisBindings[i], strtable[i + 6].c_str());
     }
-    DestroyStringTable(strtable, n_strings);
+    DestroyStringTable(strtable);
   }
 
   // joystick translations.
-  if (CreateStringTable("bindjoy.str", &strtable, &n_strings)) {
+  if (CreateStringTable("bindjoy.str", strtable)) {
     for (i = 0; i < 6; i++) {
-      if (i >= n_strings) {
+      if (i >= strtable.size()) {
         break;
       }
-      strcpy(Ctltext_AxisBindings[i + 1], strtable[i]);
+      strcpy(Ctltext_AxisBindings[i + 1], strtable[i].c_str());
     }
     for (i = 0; i < 4; i++) {
-      if ((i + 6) >= n_strings) {
+      if ((i + 6) >= strtable.size()) {
         break;
       }
-      strcpy(Ctltext_PovBindings[i + 1], strtable[i + 6]);
+      strcpy(Ctltext_PovBindings[i + 1], strtable[i + 6].c_str());
     }
-    DestroyStringTable(strtable, n_strings);
+    DestroyStringTable(strtable);
   }
 }
 

Descent3/Game2DLL.cpp

@@ -17,6 +17,8 @@
 */
 
 #include <algorithm>
+#include <string>
+#include <vector>
 
 #include "pstypes.h"
 #include "pserror.h"
@@ -62,6 +64,7 @@
 #include "ObjScript.h"
 #include "args.h"
 
+
 void SelectNextCameraView(int window);
 #define NUM_CAMERA_VIEWS 3
 extern int Camera_view_mode[NUM_CAMERA_VIEWS];
@@ -539,7 +542,7 @@ void GetGameAPI(game_api *api) {
 
   api->osiris_functions = &Multi_d3m_osiris_funcs;
   Osiris_CreateModuleInitStruct(&Multi_d3m_osiris_funcs);
-  Multi_d3m_osiris_funcs.string_table = NULL;
+  Multi_d3m_osiris_funcs.string_table.clear();
   Multi_d3m_osiris_funcs.string_count = 0;
   Multi_d3m_osiris_funcs.module_identifier = 0xEDF7;
   Multi_d3m_osiris_funcs.module_is_static = false;

Descent3/LoadLevel.cpp

@@ -1237,10 +1237,11 @@
  * $NoKeywords: $
  */
 
+#include <algorithm>
 #include <cstring>
 #include <cstdlib>
-#include <cerrno>
-#include <algorithm>
+#include <string>
+#include <vector>
 
 #include "LoadLevel.h"
 
@@ -5712,18 +5713,12 @@ int CountDataToPageIn() {
 
 #endif
 
-void Localization_SetLanguage(int type);
-
-int Localization_GetLanguage(void);
-
 char *LocalizeLevelName(char *level) {
   static char local_name[101];
 
-  char **english_names;
-  int num_english_names;
+  std::vector<std::string> english_names;
 
-  char **local_names;
-  int num_local_names;
+  std::vector<std::string> local_names;
 
   local_name[0] = 0;
 
@@ -5736,7 +5731,7 @@ char *LocalizeLevelName(char *level) {
 
   Localization_SetLanguage(LANGUAGE_ENGLISH);
   // Save the current language, then bash it to english
-  if (!CreateStringTable("level_names.str", &english_names, &num_english_names)) {
+  if (!CreateStringTable("level_names.str", english_names)) {
     LOG_WARNING << "Couldn't open level_names stringtable!";
     Localization_SetLanguage(save_lang);
     strcpy(local_name, level);
@@ -5746,22 +5741,22 @@ char *LocalizeLevelName(char *level) {
   // Restore the correct language
   Localization_SetLanguage(save_lang);
 
-  if (!CreateStringTable("level_names.str", &local_names, &num_local_names)) {
+  if (!CreateStringTable("level_names.str", local_names)) {
     LOG_WARNING << "Couldn't open level_names stringtable!";
     // destroy the english stringtable...
-    DestroyStringTable(english_names, num_english_names);
+    DestroyStringTable(english_names);
 
     strcpy(local_name, level);
     return local_name;
   }
 
   // Now search for the correct level
-  for (int i = 0; i < num_english_names; i++) {
-    if (0 == stricmp(level, english_names[i])) {
+  for (int i = 0; i < english_names.size(); i++) {
+    if (0 == stricmp(level, english_names[i].c_str())) {
       // Ok, we found a match. So return the local text.
-      strcpy(local_name, local_names[i]);
-      DestroyStringTable(english_names, num_english_names);
-      DestroyStringTable(local_names, num_local_names);
+      strcpy(local_name, local_names[i].c_str());
+      DestroyStringTable(english_names);
+      DestroyStringTable(local_names);
       return local_name;
     }
   }

Descent3/Mission.cpp

@@ -640,6 +640,8 @@
 #include <cstring>
 #include <cstdlib>
 #include <filesystem>
+#include <string>
+#include <vector>
 
 #include "Mission.h"
 #include "3d.h"
@@ -648,6 +650,8 @@
 #include "cfile.h"
 #include "gamefont.h"
 #include "grdefs.h"
+#include "levelgoal.h"
+#include "localization.h"
 #include "descent.h"
 #include "ddio.h"
 #include "d3movie.h"
@@ -672,6 +676,7 @@
 #include "terrain.h"
 #include "multi.h"
 #include "hud.h"
+
 //	---------------------------------------------------------------------------
 //	Data
 //	---------------------------------------------------------------------------
@@ -1245,25 +1250,20 @@ void FreeMission() {
   Current_mission.hog = NULL;
   Current_level = NULL;
 }
-#include "localization.h"
-#include "levelgoal.h"
-// Load the text (goal strings) for a level
-void LoadLevelText(const char *level_filename) {
-  char pathname[_MAX_FNAME], filename[_MAX_FNAME];
-  int n_strings;
-  ddio_SplitPath(level_filename, pathname, filename, NULL);
-  strcat(pathname, filename);
-  strcat(pathname, ".str");
-  char **goal_strings;
-  if (CreateStringTable(pathname, &goal_strings, &n_strings)) {
+
+void LoadLevelText(const std::filesystem::path &level_filename) {
+  std::filesystem::path pathname = level_filename;
+  pathname.replace_extension(".str");
+  std::vector<std::string> goal_strings;
+  if (CreateStringTable(pathname, goal_strings)) {
     int n_goals = Level_goals.GetNumGoals();
-    ASSERT(n_strings == (n_goals * 3));
+    ASSERT(goal_strings.size() == (n_goals * 3));
     for (int i = 0; i < n_goals; i++) {
-      Level_goals.GoalSetName(i, goal_strings[i * 3]);
-      Level_goals.GoalSetItemName(i, goal_strings[i * 3 + 1]);
-      Level_goals.GoalSetDesc(i, goal_strings[i * 3 + 2]);
+      Level_goals.GoalSetName(i, (char *)goal_strings[i * 3].c_str());
+      Level_goals.GoalSetItemName(i, (char *)goal_strings[i * 3 + 1].c_str());
+      Level_goals.GoalSetDesc(i, (char *)goal_strings[i * 3 + 2].c_str());
     }
-    DestroyStringTable(goal_strings, n_strings);
+    DestroyStringTable(goal_strings);
   }
 }
 

Descent3/Mission.h

@@ -167,7 +167,6 @@
 #ifndef MISSION_H
 #define MISSION_H
 
-#include "pstypes.h"
 #include "descent.h"
 
 //	*** CONSTANTS ***
@@ -177,11 +176,14 @@
 #define LOAD_PROGRESS_PREPARE 4
 #define LOAD_PROGRESS_DONE 200
 
+// Load the text (goal strings) for a level
+void LoadLevelText(const std::filesystem::path &level_filename);
+
 // Load level progress worker
 void LoadLevelProgress(int step, float percent, const char *chunk = NULL);
 
 //	array constants
-const int MSN_FILENAMELEN = _MAX_PATH, MSN_URLLEN = 256;
+const int MSN_URLLEN = 256;
 
 #define MAX_KEYWORDLEN 300