Change GetStringFromTable() signature

Assuming that index will never be negative, change it to unsigned int.

Author: winterheart

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())

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

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"

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];

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"

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();
 }
 ///////////////////////////////////////////////
 

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"

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();
 }
 ///////////////////////////////////////////////
 

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"

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();
 }
 ///////////////////////////////////////////////