Remove static variable String_table_size

Author: winterheart

Descent3/localization.cpp

@@ -118,7 +118,6 @@ namespace {
 // Assume that we on English locale
 int Localization_language = LANGUAGE_ENGLISH;
 
-int String_table_size = 0;
 std::vector<std::string> String_table;
 
 // list of the string table files, they will be loaded in the order they are listed
@@ -175,8 +174,6 @@ int LoadStringTables() {
     }
   }
 
-  String_table_size = 0;
-
   String_table = std::vector<std::string>(string_count);
 
   int runcount = 0;
@@ -199,11 +196,10 @@ int LoadStringTables() {
     return 0;
   }
 
-  String_table_size = runcount;
   Localization_language = old_language;
 
   atexit(FreeStringTables);
-  return String_table_size;
+  return runcount;
 }
 
 // Deallocates all the memory used for the string tables
@@ -212,7 +208,7 @@ void FreeStringTables() {
 }
 
 const char *GetStringFromTable(int index) {
-  if ((index < 0) || (index >= String_table_size))
+  if ((index < 0) || (index >= String_table.size()))
     return Error_string;
 
   if (String_table[index].empty())

scripts/AIGame.cpp

@@ -45,7 +45,6 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state);
 }
 #endif
 
-static int String_table_size = 0;
 static std::vector<std::string> String_table;
 static const char *_Error_string = "!!ERROR MISSING STRING!!";
 static const char *_Empty_string = "";
@@ -2471,7 +2470,6 @@ char STDCALL InitializeDLL(tOSIRISModuleInit *func_list) {
     return 0;
   }
   aigame_mod_id = func_list->module_identifier;
-  String_table_size = func_list->string_count;
   String_table = func_list->string_table;
 
   return 1;

scripts/AIGame3.cpp

@@ -46,7 +46,6 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state);
 }
 #endif
 
-static int String_table_size = 0;
 static std::vector<std::string> String_table;
 static const char *_Error_string = "!!ERROR MISSING STRING!!";
 static const char *_Empty_string = "";
@@ -1493,7 +1492,6 @@ void DoNameLookups(void) {
 //	Returns 1 if initialization went ok, 0 if there was an error and the DLL should not be loaded.
 char STDCALL InitializeDLL(tOSIRISModuleInit *func_list) {
   osicommon_Initialize((tOSIRISModuleInit *)func_list);
-  String_table_size = func_list->string_count;
   String_table = func_list->string_table;
 
   // Do name lookups

scripts/aigame2.cpp

@@ -45,7 +45,6 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state);
 }
 #endif
 
-static int String_table_size = 0;
 static std::vector<std::string> String_table;
 static const char *_Error_string = "!!ERROR MISSING STRING!!";
 static const char *_Empty_string = "";
@@ -262,7 +261,6 @@ class aiSTBlackBarrel : public aiObjScript {
 //	Returns 1 if initialization went ok, 0 if there was an error and the DLL should not be loaded.
 char STDCALL InitializeDLL(tOSIRISModuleInit *func_list) {
   osicommon_Initialize((tOSIRISModuleInit *)func_list);
-  String_table_size = func_list->string_count;
   String_table = func_list->string_table;
   if (func_list->game_checksum != CHECKSUM) {
     mprintf(0, "Game-Checksum FAIL!!! (%ul!=%ul)\n", func_list->game_checksum, CHECKSUM);

scripts/aigame4.cpp

@@ -44,12 +44,11 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state);
 }
 #endif
 
-int String_table_size = 0;
 std::vector<std::string> String_table;
 static const char *_Error_string = "!!ERROR MISSING STRING!!";
 static const char *_Empty_string = "";
 const char *GetStringFromTable(int index) {
-  if ((index < 0) || (index >= String_table_size))
+  if ((index < 0) || (index >= String_table.size()))
     return _Error_string;
   if (String_table[index].empty())
     return _Empty_string;
@@ -303,7 +302,6 @@ char STDCALL InitializeDLL(tOSIRISModuleInit *func_list) {
     return 0;
   }
   aigame_mod_id = func_list->module_identifier;
-  String_table_size = func_list->string_count;
   String_table = func_list->string_table;
 
   return 1;

scripts/clutter.cpp

@@ -43,7 +43,6 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state);
 }
 #endif
 
-static int String_table_size = 0;
 static std::vector<std::string> String_table;
 static const char *_Error_string = "!!ERROR MISSING STRING!!";
 static const char *_Empty_string = "";
@@ -143,7 +142,6 @@ class LavaRock : public ClutterScript {
 //	Returns 1 if initialization went ok, 0 if there was an error and the DLL should not be loaded.
 char STDCALL InitializeDLL(tOSIRISModuleInit *func_list) {
   osicommon_Initialize((tOSIRISModuleInit *)func_list);
-  String_table_size = func_list->string_count;
   String_table = func_list->string_table;
   if (func_list->game_checksum != CHECKSUM) {
     mprintf(0, "Game-Checksum FAIL!!! (%ul!=%ul)\n", func_list->game_checksum, CHECKSUM);

scripts/generic.cpp

@@ -43,7 +43,6 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state);
 }
 #endif
 
-int String_table_size = 0;
 std::vector<std::string> String_table;
 static const char *_Error_string = "!!ERROR MISSING STRING!!";
 static const char *_Empty_string = "";
@@ -152,14 +151,11 @@ char STDCALL InitializeDLL(tOSIRISModuleInit *func_list) {
     return 0;
   }
 
-  String_table_size = func_list->string_count;
   String_table = func_list->string_table;
 
-  int i;
-
   // initialize rapid fire script data
-  for (i = 0; i < MAX_PLAYERS; i++) {
-    RapidFirePlayerTimers[i].timer_handle = -1;
+  for (auto & RapidFirePlayerTimer : RapidFirePlayerTimers) {
+    RapidFirePlayerTimer.timer_handle = -1;
   }
 
   return 1;