Change GetStringFromTable() signature

Assuming that index will never be negative, change it to unsigned int.
DescentDevelopers · Sep 12, 2024 · 153a09c · 153a09c
1 parent 197e111
commit 153a09c
Show file tree

Hide file tree

Showing 21 changed files with 40 additions and 40 deletions.
diff --git a/Descent3/localization.cpp b/Descent3/localization.cpp
@@ -207,8 +207,8 @@ void FreeStringTables() {
   String_table.clear();
 }
 
-const char *GetStringFromTable(int index) {
-  if ((index < 0) || (index >= String_table.size()))
+const char *GetStringFromTable(uint32_t index) {
+  if (index >= String_table.size())
     return Error_string;
 
   if (String_table[index].empty())

diff --git a/Descent3/localization.h b/Descent3/localization.h
@@ -59,7 +59,7 @@ void FreeStringTables();
 
 // Returns a pointer to the string at the index location from the string table
 // if it is a bad index given, then the pointer to the error string "ERROR MISSING STRING" is given
-const char *GetStringFromTable(int index);
+const char *GetStringFromTable(uint32_t index);
 
 /**
  * Creates table of strings from given filename

diff --git a/Descent3/stringtable.h b/Descent3/stringtable.h
@@ -26,7 +26,7 @@
 // Returns a pointer to the string at the index location from the string table
 // if it is a bad index given, then the pointer to the error string "ERROR MISSING STRING" is given
 
-const char *GetStringFromTable(int index);
+const char *GetStringFromTable(uint32_t index);
 
 #define TXT_NEW TXT(0)                //"New"
 #define TXT_DELETE TXT(1)             //"Delete"

diff --git a/netgames/coop/coop.cpp b/netgames/coop/coop.cpp
@@ -137,11 +137,11 @@ int unpack_pstat(tPlayerStat *user_info, uint8_t *data) {
 // localization info
 static std::vector<std::string> StringTable;
 static const char *_ErrorString = "Missing String";
-const char *GetStringFromTable(int d) {
-  if ((d < 0) || (d >= StringTable.size()))
+const char *GetStringFromTable(uint32_t index) {
+  if (index >= StringTable.size())
     return _ErrorString;
   else
-    return StringTable[d].c_str();
+    return StringTable[index].c_str();
 }
 ///////////////////////////////////////////////
 static int SortedPlayers[MAX_PLAYER_RECORDS];

diff --git a/netgames/coop/coopstr.h b/netgames/coop/coopstr.h
@@ -26,7 +26,7 @@
 // Returns a pointer to the string at the index location from the string table
 // if it is a bad index given, then the pointer to the error string "ERROR MISSING STRING" is given
 
-const char *GetStringFromTable(int index);
+const char *GetStringFromTable(uint32_t index);
 
 #define TXT_COOP TXT(0)          //"Coop"
 #define TXT_STATGAMENAME TXT(1)  //"Co-op Descent 3"

diff --git a/netgames/entropy/EntropyBase.cpp b/netgames/entropy/EntropyBase.cpp
@@ -214,11 +214,11 @@ static void OnPrintScores(int level);
 // localization info
 static std::vector<std::string> StringTable;
 static const char *_ErrorString = "Missing String";
-const char *GetStringFromTable(int d) {
-  if ((d < 0) || (d >= StringTable.size()))
+const char *GetStringFromTable(uint32_t index) {
+  if (index >= StringTable.size())
     return _ErrorString;
   else
-    return StringTable[d].c_str();
+    return StringTable[index].c_str();
 }
 ///////////////////////////////////////////////
 

diff --git a/netgames/entropy/Entropystr.h b/netgames/entropy/Entropystr.h
@@ -26,7 +26,7 @@
 // Returns a pointer to the string at the index location from the string table
 // if it is a bad index given, then the pointer to the error string "ERROR MISSING STRING" is given
 
-const char *GetStringFromTable(int index);
+const char *GetStringFromTable(uint32_t index);
 
 #define TXT_GAMENAME TXT(0)        //"Entropy"
 #define TXT_KILLA TXT(1)           //"%s was killed by %s"

diff --git a/netgames/hoard/hoard.cpp b/netgames/hoard/hoard.cpp
@@ -144,11 +144,11 @@ static bool Config_displayed = false;
 // localization info
 static std::vector<std::string> StringTable;
 static const char *_ErrorString = "Missing String";
-const char *GetStringFromTable(int d) {
-  if ((d < 0) || (d >= StringTable.size()))
+const char *GetStringFromTable(uint32_t index) {
+  if (index >= StringTable.size())
     return _ErrorString;
   else
-    return StringTable[d].c_str();
+    return StringTable[index].c_str();
 }
 ///////////////////////////////////////////////
 

diff --git a/netgames/hoard/hoardstr.h b/netgames/hoard/hoardstr.h
@@ -26,7 +26,7 @@
 // Returns a pointer to the string at the index location from the string table
 // if it is a bad index given, then the pointer to the error string "ERROR MISSING STRING" is given
 
-const char *GetStringFromTable(int index);
+const char *GetStringFromTable(uint32_t index);
 
 #define TXT_DEATH1 TXT(0)          //"%s got blasted by %s"
 #define TXT_DEATH2 TXT(1)          //"%s knows %s is his god"

diff --git a/netgames/hyperanarchy/hyperanarchy.cpp b/netgames/hyperanarchy/hyperanarchy.cpp
@@ -113,11 +113,11 @@ static void OnClientPlayerEntersGame(int player_num);
 // localization info
 static std::vector<std::string> StringTable;
 static const char *_ErrorString = "Missing String";
-const char *GetStringFromTable(int d) {
-  if ((d < 0) || (d >= StringTable.size()))
+const char *GetStringFromTable(uint32_t index) {
+  if (index >= StringTable.size())
     return _ErrorString;
   else
-    return StringTable[d].c_str();
+    return StringTable[index].c_str();
 }
 ///////////////////////////////////////////////
 

diff --git a/netgames/hyperanarchy/hyperstr.h b/netgames/hyperanarchy/hyperstr.h
@@ -26,7 +26,7 @@
 // Returns a pointer to the string at the index location from the string table
 // if it is a bad index given, then the pointer to the error string "ERROR MISSING STRING" is given
 
-const char *GetStringFromTable(int index);
+const char *GetStringFromTable(uint32_t index);
 
 #define TXT_DEATH1 TXT(0)          //"%s got butchered by %s"
 #define TXT_SUICIDE1 TXT(1)        //"%s shags himself"

diff --git a/netgames/monsterball/monsterball.cpp b/netgames/monsterball/monsterball.cpp
@@ -274,11 +274,11 @@ static bool monsterball_info_set = false;
 // localization info
 static std::vector<std::string> StringTable;
 static const char *_ErrorString = "Missing String";
-const char *GetStringFromTable(int d) {
-  if ((d < 0) || (d >= StringTable.size()))
+const char *GetStringFromTable(uint32_t index) {
+  if (index >= StringTable.size())
     return _ErrorString;
   else
-    return StringTable[d].c_str();
+    return StringTable[index].c_str();
 }
 ///////////////////////////////////////////////
 

diff --git a/netgames/monsterball/monsterstr.h b/netgames/monsterball/monsterstr.h
@@ -26,7 +26,7 @@
 // Returns a pointer to the string at the index location from the string table
 // if it is a bad index given, then the pointer to the error string "ERROR MISSING STRING" is given
 
-const char *GetStringFromTable(int index);
+const char *GetStringFromTable(uint32_t index);
 
 #define TXT_GAMENAME TXT(0)           //"Monsterball"
 #define TXT_KILLEDA TXT(1)            //"%s was killed by %s"

diff --git a/netgames/tanarchy/tanarchy.cpp b/netgames/tanarchy/tanarchy.cpp
@@ -119,11 +119,11 @@ static int Highlight_bmp = -1;
 // localization info
 static std::vector<std::string> StringTable;
 static const char *_ErrorString = "Missing String";
-const char *GetStringFromTable(int d) {
-  if ((d < 0) || (d >= StringTable.size()))
+const char *GetStringFromTable(uint32_t index) {
+  if (index >= StringTable.size())
     return _ErrorString;
   else
-    return StringTable[d].c_str();
+    return StringTable[index].c_str();
 }
 ///////////////////////////////////////////////
 

diff --git a/netgames/tanarchy/tanarchystr.h b/netgames/tanarchy/tanarchystr.h
@@ -26,7 +26,7 @@
 // Returns a pointer to the string at the index location from the string table
 // if it is a bad index given, then the pointer to the error string "ERROR MISSING STRING" is given
 
-const char *GetStringFromTable(int index);
+const char *GetStringFromTable(uint32_t index);
 
 #define TXT_DEATH1 TXT(0)          //"%s got blasted by %s"
 #define TXT_DEATH2 TXT(1)          //"%s knows %s is his god"

diff --git a/scripts/AIGame.cpp b/scripts/AIGame.cpp
@@ -48,8 +48,8 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state);
 static 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()))
+const char *GetStringFromTable(uint32_t index) {
+  if (index >= String_table.size())
     return _Error_string;
   if (String_table[index].empty())
     return _Empty_string;

diff --git a/scripts/AIGame3.cpp b/scripts/AIGame3.cpp
@@ -49,8 +49,8 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state);
 static 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()))
+const char *GetStringFromTable(uint32_t index) {
+  if (index >= String_table.size())
     return _Error_string;
   if (String_table[index].empty())
     return _Empty_string;

diff --git a/scripts/aigame2.cpp b/scripts/aigame2.cpp
@@ -48,8 +48,8 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state);
 static 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()))
+const char *GetStringFromTable(uint32_t index) {
+  if (index >= String_table.size())
     return _Error_string;
   if (String_table[index].empty())
     return _Empty_string;

diff --git a/scripts/aigame4.cpp b/scripts/aigame4.cpp
@@ -47,8 +47,8 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state);
 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()))
+const char *GetStringFromTable(uint32_t index) {
+  if (index >= String_table.size())
     return _Error_string;
   if (String_table[index].empty())
     return _Empty_string;

diff --git a/scripts/clutter.cpp b/scripts/clutter.cpp
@@ -46,8 +46,8 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state);
 static std::vector<std::string> String_table;
 static const char *_Error_string = "!!ERROR MISSING STRING!!";
 static const char *_Empty_string = "";
-static const char *GetStringFromTable(int index) {
-  if ((index < 0) || (index >= String_table.size()))
+static const char *GetStringFromTable(uint32_t index) {
+  if (index >= String_table.size())
     return _Error_string;
   if (String_table[index].empty())
     return _Empty_string;

diff --git a/scripts/generic.cpp b/scripts/generic.cpp
@@ -46,8 +46,8 @@ DLLEXPORT int STDCALL SaveRestoreState(void *file_ptr, uint8_t saving_state);
 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()))
+const char *GetStringFromTable(uint32_t index) {
+  if (index >= String_table.size())
     return _Error_string;
   if (String_table[index].empty())
     return _Empty_string;