More typo fixes

include/Obstacle.h

@@ -38,7 +38,7 @@ class MeshTransform;
 
 /** This ABC represents a (normally) solid object in a world. It has pure
     virtual functions for getting information about it's size, checking ray
-    intersections, checking point intersections, computing normals etc.
+    intersections, checking point intersections, computting normals etc.
     All these functions have to be implemented in concrete subclasses.
 */
 
@@ -59,7 +59,7 @@ class Obstacle
         @param hwidth     Half the X size of the obstacle
         @param hbreadth   Half the Y size of the obstacle
         @param height     The Z size of the obstacle
-        @param drive      @c true if the obstacle is drivethtrough, i.e. tanks
+        @param drive      @c true if the obstacle is driveththrough, i.e. tanks
           can pass through it
         @param shoot      @c true if the obstacle is shootthrough, i.e. bullets
           can pass through it

include/OpenGLUtils.h

@@ -1,6 +1,6 @@
 /* bzflag
  * Copyright (c) 1993-2023 Tim Riker
- * Writen By Jeffrey Myers
+ * Written By Jeffrey Myers
  *
  * This package is free software;  you can redistribute it and/or
  * modify it under the terms of the license found in the file

include/ServerItem.h

@@ -36,7 +36,7 @@ class ServerItem
     std::string   getAddrName() const;
     time_t    getAgeMinutes() const;
     time_t    getAgeSeconds() const;
-    std::string   getAgeString() const; // nifty formated age string
+    std::string   getAgeString() const; // nifty formatted age string
     time_t    getNow() const; // current time
     bool      operator<(const ServerItem &right);
 private:

include/StateDatabase.h

@@ -30,7 +30,7 @@
 /** BZDB is the generic name:value pair database within bzflag and bzfs. Its
  * useful for data that can be serialized to a string that needs to be
  * accessible to many areas of the code. It also provides facilities for
- * saving persistant pairs to the config file and downloading variables from
+ * saving persistent pairs to the config file and downloading variables from
  * the server.
  *
  * BZDB is not an object broker, and isn't meant to be. If you have data
@@ -39,7 +39,7 @@
  * (if accessed often, such as game variables like gravity, you will need a
  * cached version anyway to avoid the overhead of lookup). Using BZDB adds
  * unnecessary overhead if objects generally keep their data hidden without
- * needing persistant state.
+ * needing persistent state.
  *
  * Basically, if your data can be serialized to a string, and it makes sense
  * to do so (eg: config file option, game variable downloaded from server), use
@@ -100,7 +100,7 @@ class StateDatabase : public Singleton<StateDatabase>
                             Permission access = Client);
 
     /** mark a value as persistent (i.e. to be saved) or volatile.
-     * this state is stored independently of the existance of a value
+     * this state is stored independently of the existence of a value
      * with the given name.  that is, adding or removing the name
      * will not affect persistence of the name.  the default is
      * volatile.
@@ -203,7 +203,7 @@ class StateDatabase : public Singleton<StateDatabase>
      */
     bool              getDebug() const;
 
-// true if we are in a mode where we are seting values that are to be defaults ( config and world time )
+// true if we are in a mode where we are setting values that are to be defaults ( config and world time )
     void              setSaveDefault(bool save);
     bool              getSaveDefault() const;
 

include/TextUtils.h

@@ -106,7 +106,7 @@ std::string no_whitespace(const std::string &s);
  * inside quotes are ignored.
  * Hence /ban "Mr Blahblah" isajerk parses to "/ban", "Mr Blahlah" and "isajerk"
  * but so does "Mr Blahblah" "isajerk", so if you want 3 tokens and a delimeter
- * is in one of the tokens, by puting quotes around it you can get the correct
+ * is in one of the tokens, by putting quotes around it you can get the correct
  * parsing. When use quotes is enabled, \'s and "'s should\can be escaped with \
  * escaping is not currently done for any other character.
  * Should not have " as a delimeter if you want to use quotes

include/WordFilter.h

@@ -127,10 +127,10 @@ class WordFilter
     ExpCompareSet filters[MAX_FILTER_SETS];
 
 
-    /** used by the agressive filter */
+    /** used by the aggressive filter */
     ExpCompareSet suffixes;
 
-    /** used by the agressive filter */
+    /** used by the aggressive filter */
     ExpCompareSet prefixes;
 
 
@@ -213,7 +213,7 @@ class WordFilter
     bool addToFilter(const std::string &word, const std::string &expression);
 
     /** given an input string, filter the input
-     * using either the simple or agressive filter
+     * using either the simple or aggressive filter
      */
     bool filter(char *input, const bool simple=false) const;
     bool filter(std::string &input, const bool simple=false) const;

include/bzfsAPI.h

@@ -1666,7 +1666,7 @@ BZF_API unsigned int bz_getTeamPlayerLimit ( bz_eTeamType team );
 
 // player score
 BZF_API void bz_computePlayerScore( bool enabled );
-BZF_API bool bz_computingPlayerScore( void );
+BZF_API bool bz_computtingPlayerScore( void );
 
 BZF_API bool bz_setPlayerWins (int playerId, int wins);
 BZF_API bool bz_setPlayerLosses (int playerId, int losses);
@@ -2062,7 +2062,7 @@ BZF_API bool bz_removeCustomPluginHandler ( const char* extension, bz_APIPluginH
 // team info
 
 BZF_API void bz_computeTeamScore( bool enabled );
-BZF_API bool bz_computingTeamScore( void );
+BZF_API bool bz_computtingTeamScore( void );
 
 BZF_API int bz_getTeamCount (bz_eTeamType team );
 BZF_API int bz_getTeamScore (bz_eTeamType team );

man/bzflag.6.in

@@ -130,7 +130,7 @@ color coding on *nix, same as \-echo on windows.
 Prints a concise list of the \fBbzflag\fR command line options.
 .TP
 \fB\-latitude\fI latitude\fR
-Uses \fIlatitude\fR when computing celestial object positions.
+Uses \fIlatitude\fR when computting celestial object positions.
 .TP
 \fB\-list\fI url\fR
 Look for list servers using \fIurl\fR.  A built\-in url is
@@ -144,7 +144,7 @@ from the internet and are queried when using the Find Server menu.
 Set the locale used to display messages, menus, hud alerts, etc.
 .TP
 \fB\-longitude \fIlongitude\fR
-Uses \fIlongitude\fR when computing celestial object positions.
+Uses \fIlongitude\fR when computting celestial object positions.
 .TP
 .B \-m, \-mute
 Disables sound.

misc/shtool

@@ -333,11 +333,11 @@ while [ $# -gt 0 ]; do
             eval "opt_${opt_OPT}=yes"
             ;;
         ':' )
-            #   option with argument (multiple occurrances override)
+            #   option with argument (multiple occurrences override)
             eval "opt_${opt_OPT}=\"\$opt_ARG\""
             ;;
         '+' )
-            #   option with argument (multiple occurrances append)
+            #   option with argument (multiple occurrences append)
             eval "opt_${opt_OPT}=\"\$opt_${opt_OPT}\${ASC_NL}\$opt_ARG\""
             ;;
         * )

plugins/plugin_utils/plugin_files.cpp

@@ -48,10 +48,10 @@ bool WindowsAddFileStack(const char *szPathName, const char* fileMask,
     else
         searchstr += "*.*";
 
-    std::string extenstionSearch;
+    std::string extensionSearch;
 
     if (fileMask && strchr(fileMask,'.'))
-        extenstionSearch = strchr(fileMask,'.')+1;
+        extensionSearch = strchr(fileMask,'.')+1;
 
     hFile = (long)_findfirst(searchstr.c_str(),&fileInfo);
 
@@ -86,7 +86,7 @@ bool WindowsAddFileStack(const char *szPathName, const char* fileMask,
                             if (strrchr(FilePath.c_str(),'.'))
                             {
                                 if (compare_nocase(std::string(strrchr(FilePath.c_str(),'.')+1),
-                                                   extenstionSearch) == 0)
+                                                   extensionSearch) == 0)
                                     list.push_back(FilePath);
                             }
                         }

src/bzflag/BackgroundRenderer.cxx

@@ -1378,7 +1378,7 @@ void BackgroundRenderer::drawGroundReceivers(SceneRenderer& renderer)
         color[2] = lightColor[2];
         color[3] = I;
 
-        // draw ground receiver, computing lighting at each vertex ourselves
+        // draw ground receiver, computting lighting at each vertex ourselves
         glBegin(GL_TRIANGLE_FAN);
         {
             glColor4fv(color);
@@ -1553,7 +1553,7 @@ void BackgroundRenderer::drawAdvancedGroundReceivers(SceneRenderer& renderer)
         float outerSize;
         float outerColor[3];
 
-        // draw ground receiver, computing lighting at each vertex ourselves
+        // draw ground receiver, computting lighting at each vertex ourselves
         glBegin(GL_TRIANGLE_FAN);
         {
             // center point

src/bzflag/Region.cxx

@@ -189,7 +189,7 @@ BzfRegion* BzfRegion::orphanSplitRegion(const float e1[2], const float e2[2])
 {
     // if edge p1,p2 intersects me then split myself along that edge.
     // return new region (the other half of the split), or NULL if no
-    // split occured.  the new region (if it exists) will be to the
+    // split occurred.  the new region (if it exists) will be to the
     // right of the cutting edge (when moving from e1 to e2).
     const int count = corners.size();
     if (count == 0) return NULL;

src/bzflag/ShotStrategy.h

@@ -13,7 +13,7 @@
 /*
  * ShotStrategy:
  *  Interface for all shot flight path strategies.  A
- *  strategy encapsulates the algorithm for computing
+ *  strategy encapsulates the algorithm for computting
  *  the path taken by a shot.
  */
 

src/bzfs/Permissions.cxx

@@ -532,7 +532,7 @@ PlayerAccessInfo::AccessPerm permFromName(const std::string &name)
     return PlayerAccessInfo::lastPerm;
 }
 
-// Parse a list of permissions &permissionString and set the corrosponding Permissions
+// Parse a list of permissions &permissionString and set the corresponding Permissions
 // in &info. Return true if a group is referenced but not defined yet, else false.
 // return value is only needed for groupdb parsing, not for userdb.
 bool parsePermissionString(const std::string &permissionString, PlayerAccessInfo &info)
@@ -627,7 +627,7 @@ bool parsePermissionString(const std::string &permissionString, PlayerAccessInfo
                 continue;
             }
 
-            // + is like no operator, just let it pass trough
+            // + is like no operator, just let it pass through
             case '+':
                 break;
 

src/bzfs/RecordReplay.cxx

@@ -2205,7 +2205,7 @@ static bool loadHeader(ReplayHeader *h, FILE *f)
      *
      * 4) implement a world reload feature on the client side,
      *    so that if the server sends a MsgGetWorld to the client
-     *    when it isn't expecting one, it reaquires and regenerates
+     *    when it isn't expecting one, it requires and regenerates
      *    its world DB. this would be the slick way to do it.
      *
      * 5) implement a resizing command, but that's icky.

src/bzfs/SpawnPolicy.cxx

@@ -75,7 +75,7 @@ void SpawnPolicy::getPosition(float pos[3], int playerId, bool onGroundOnly, boo
          * map.
          *
          * TODO: this should be a circle instead of square to prevent such
-         * predictibility and tendency to select those potentially
+         * predictability and tendency to select those potentially
          * dangerous corners.
          */
 

src/bzfs/bzfs.cxx

@@ -1512,7 +1512,7 @@ void sendPlayerMessage(GameKeeper::Player *playerData, PlayerId dstPlayer,
         // Trim off the command to leave the player's message
         message = message + 4;
 
-        // Set the message type to an action messsage
+        // Set the message type to an action message
         type = ActionMessage;
     }
 

src/bzfs/bzfsAPI.cxx

@@ -1320,7 +1320,7 @@ BZF_API void bz_computePlayerScore( bool enabled )
     Score::KeepPlayerScores = enabled;
 }
 
-BZF_API bool bz_computingPlayerScore( void )
+BZF_API bool bz_computtingPlayerScore( void )
 {
     return Score::KeepPlayerScores;
 }
@@ -3541,7 +3541,7 @@ BZF_API void bz_computeTeamScore( bool enabled )
     Score::KeepTeamScores = enabled;
 }
 
-BZF_API bool bz_computingTeamScore( void )
+BZF_API bool bz_computtingTeamScore( void )
 {
     return Score::KeepTeamScores;
 }

src/common/OSFile.cxx

@@ -365,7 +365,7 @@ std::string OSFile::getFileName()
     return info->title;
 }
 
-// this CAN return npos, cus the file may not have an extenstion, if it just happens to end in a '.' then well, your really weird Mr. File.
+// this CAN return npos, cus the file may not have an extension, if it just happens to end in a '.' then well, your really weird Mr. File.
 std::string OSFile::getExtension()
 {
     std::string::size_type dot = info->stdName.rfind('.');

src/game/Intersect.cxx

@@ -294,7 +294,7 @@ float timeRayHitsBlock(const Ray& r, const float* p1,
 }
 
 
-/** Computing ray travel time to the plane described by 3 points
+/** Computting ray travel time to the plane described by 3 points
  */
 static float timeRayHitsPlane(const float pb[3], const float db[3],
                               const float x1[3], const float x2[3],
@@ -318,7 +318,7 @@ static float timeRayHitsPlane(const float pb[3], const float db[3],
     n[1] = u[2] * v[0] - u[0] * v[2];
     n[2] = u[0] * v[1] - u[1] * v[0];
 
-    // computing unnormalized distance projecting the distance on versor
+    // computting unnormalized distance projecting the distance on versor
     float distance = 0.0;
     for (i = 0; i < 3; i++)
         distance += n[i] * d[i];

src/net/network.cxx

@@ -140,7 +140,7 @@ extern "C" {
         /* 10052 */{WSAENETRESET,   "The connection must be reset because the Windows Sockets implementation dropped it"},
         /* 10053 */{WSAECONNABORTED,    "The virtual circuit was aborted due to timeout or other failure"},
         /* 10054 */{WSAECONNRESET,  "The virtual circuit was reset by the remote side"},
-        /* 10055 */{WSAENOBUFS,     "No buffer space is available or a buffer deadlock has occured. The socket cannot be created"},
+        /* 10055 */{WSAENOBUFS,     "No buffer space is available or a buffer deadlock has occurred. The socket cannot be created"},
         /* 10056 */{WSAEISCONN,     "The socket is already connected"},
         /* 10057 */{WSAENOTCONN,    "The socket is not connected"},
         /* 10058 */{WSAESHUTDOWN,   "The socket has been shutdown"},

src/ogl/OpenGLUtils.cxx

@@ -1,6 +1,6 @@
 /* bzflag
  * Copyright (c) 1993-2023 Tim Riker
- * Writen By Jeffrey Myers
+ * Written By Jeffrey Myers
  *
  * This package is free software;  you can redistribute it and/or
  * modify it under the terms of the license found in the file

tools/modeltool/SimpleTextUtils.h

@@ -63,7 +63,7 @@ std::string replace_all(const std::string& in, const std::string& replaceMe, con
  * inside quotes are ignored.
  * Hence /ban "Mr Blahblah" isajerk parses to "/ban", "Mr Blahlah" and "isajerk"
  * but so does "Mr Blahblah" "isajerk", so if you want 3 tokens and a delimeter
- * is in one of the tokens, by puting quotes around it you can get the correct
+ * is in one of the tokens, by putting quotes around it you can get the correct
  * parsing. When use quotes is enabled, \'s and "'s should\can be escaped with \
  * escaping is not currently done for any other character.
  * Should not have " as a delimeter if you want to use quotes

tools/modeltool/model.h

@@ -1,6 +1,6 @@
 
 //
-// modeltool.h : defintions of the model classes
+// modeltool.h : definitions of the model classes
 //
 
 #ifndef _MODEL_H_

tools/modeltool/modeltool.cxx

@@ -242,7 +242,7 @@ static int  dumpUsage ( char *exeName, const char* reason )
 int main(int argc, char* argv[])
 {
     std::string input;
-    std::string extenstion = "OBJ";
+    std::string extension = "OBJ";
     std::string output;
 
     // make sure we have all the right stuff
@@ -258,10 +258,10 @@ int main(int argc, char* argv[])
     }
     input = argv[1];
 
-    // see if it has an extenstion
+    // see if it has an extension
     char *p = strrchr(argv[1],'.');
     if (p)
-        extenstion = p+1;
+        extension = p+1;
 
     if (!p)
         output = input + ".bzw";
@@ -385,9 +385,9 @@ int main(int argc, char* argv[])
 
     CModel  model;
 
-    if ( SimpleTextUtils::tolower(extenstion) == "obj" )
+    if ( SimpleTextUtils::tolower(extension) == "obj" )
         readOBJ(model,input);
-    else if ( SimpleTextUtils::tolower(extenstion) == "bsp" )
+    else if ( SimpleTextUtils::tolower(extension) == "bsp" )
     {
         Quake3Level level;
         level.loadFromFile(input.c_str());
@@ -404,7 +404,7 @@ int main(int argc, char* argv[])
     if (model.meshes.size() > 0)
     {
         writeBZW(model,output);
-        printf("%s file %s converted to BZW as %s\n", extenstion.c_str(),input.c_str(),output.c_str());
+        printf("%s file %s converted to BZW as %s\n", extension.c_str(),input.c_str(),output.c_str());
     }
     else
         printf("no valid meshes written from %s\n", input.c_str());

tools/modeltool/wavefrontOBJ.h

@@ -1,6 +1,6 @@
 
 //
-// wavefrontOBJ.h : defintions of the model classes
+// wavefrontOBJ.h : definitions of the model classes
 //
 
 #ifndef _WAVEFRONT_OBJ_H_