Merge pull request #646 from jengelh/spello

Fix spellos in comments/strings

Descent3/demofile.cpp

@@ -337,7 +337,7 @@ static bool Demo_play_fast = false;
 
 extern void PageInAllData();
 
-// Prompts user for filename and starts recording if successfull
+// Prompts user for filename and starts recording if successful
 void DemoToggleRecording() {
   char szfile[_MAX_PATH * 2];
   szfile[0] = '\0';

Descent3/screens.cpp

@@ -464,7 +464,7 @@ void SinglePlayerPostLevelResults() {
   else
     PLR.accuracy_rating = 0.5f;
 
-  // strcpy(PLRHeader,PLR_success?"Mission Successfull":"Mission Failed");
+  // strcpy(PLRHeader, PLR_success ? "Mission Successful" : "Mission Failed");
   strcpy(PLRHeader, PLR_success ? TXT_PLR_MSN_SUCCESS : TXT_PLR_MSN_FAILED);
 
   snprintf(PLRLevel, sizeof(PLRLevel), "%s", Level_info.name);

Descent3/stringtable.h

@@ -795,7 +795,7 @@ const char *GetStringFromTable(int index);
 #define TXT_PLTTOONEW TXT(764)               //"Pilot File '%s' is not compatible with this version."
 #define TXT_FAILED TXT(765)                  //"Failed"
 #define TXT_SCORE TXT(766)                   //"Score"
-#define TXT_PLR_MSN_SUCCESS TXT(767)         // Mission Successfull
+#define TXT_PLR_MSN_SUCCESS TXT(767)         // Mission Successful
 #define TXT_PLR_MSN_FAILED TXT(768)          // Mission Failed
 #define TXT_VIEW_GUIDEBOT TXT(769)           //"Guide-Bot"
 #define TXT_VIEW_MARKER TXT(770)             //"Marker"

ddebug/windebug.cpp

@@ -46,7 +46,7 @@
  * added multiple pages per mono window.
  *
  * 27    4/01/99 11:07a Kevin
- * Added some more usefull debugging info
+ * Added some more useful debugging info
  *
  * 26    4/01/99 9:40a Matt
  * Fixed dump_text_to_clipboard.  It used to allocate a fixed number of

editor/DallasMainDlg.cpp

@@ -3311,7 +3311,7 @@ HTREEITEM CDallasMainDlg::AddNodeToTree(HTREEITEM parent, HTREEITEM insertbefore
 
   added_item = m_ScriptTree.InsertItem(&tvs);
 
-  // If add was unsuccessfull, delete the item data
+  // If add was unsuccessful, delete the item data
   if (added_item == NULL) {
     delete new_data_node;
     MessageBox("Unable to Allocate a New Tree Node", "Out of Memory Error!", MB_OK | MB_ICONEXCLAMATION);
@@ -7217,7 +7217,7 @@ void CDallasMainDlg::FillQueryMenu(CMenu *query_menu, int command_offset, int va
 
 // Attempts to parse the Nth (indexed at 1) bracketed section of the given function node's desc,
 // and obtain from it the parameter name, default string, and range string.
-// It returns the param type if successfull, or -1 if the requested Parameter section
+// It returns the param type if successful, or -1 if the requested Parameter section
 // does not exist
 int CDallasMainDlg::ParseNthParam(HTREEITEM func_node, int n, CString &name_text, CString &default_text,
                                   CString &range_text) {
@@ -7247,7 +7247,7 @@ int CDallasMainDlg::ParseNthParam(HTREEITEM func_node, int n, CString &name_text
 
 // Attempts to parse the Nth (indexed at 1) bracketed section of the given action desc,
 // and obtain from it the parameter name, default string, and range string.
-// It returns the param type if successfull, or -1 if the requested Parameter section
+// It returns the param type if successful, or -1 if the requested Parameter section
 // does not exist
 int CDallasMainDlg::ParseNthParam(char *desc, int n, CString &name_text, CString &default_text, CString &range_text) {
   // Check validity of desc and given n
@@ -7277,7 +7277,7 @@ int CDallasMainDlg::ParseNthParam(char *desc, int n, CString &name_text, CString
 #define DEFAULT_SECTION 3
 #define RANGE_SECTION 4
 
-// Parses the next param block encountered, and, if successfull, returns the
+// Parses the next param block encountered, and, if successful, returns the
 // parameter type (-1 is returned if a parameter block was not found).
 // The name, default, and range strings are also set appropriately, and the
 // line pointer will be set to the first character after the closing bracket.

editor/TableFileEdit.cpp

@@ -140,7 +140,7 @@ void CTableFileEdit::OnTableEditFileSave() {
   m_PageList.SaveSelected(&m_DescriptionBox);
 
   if (!m_PageList.SaveTable(NULL)) {
-    MessageBox("The save was unsuccessfull", "Save Table Error!");
+    MessageBox("The save was unsuccessful", "Save Table Error!");
     return;
   }
   m_PageList.SetTitleString(this);
@@ -158,7 +158,7 @@ void CTableFileEdit::OnTableEditFileSaveAs() {
   }
 
   if (!m_PageList.SaveTable(dlg_open.GetPathName().GetBuffer(0))) {
-    MessageBox("The save was unsuccessfull", "Save Table Error!");
+    MessageBox("The save was unsuccessful", "Save Table Error!");
     return;
   }
   m_PageList.SetTitleString(this);

editor/TableFileFilter.cpp

@@ -183,7 +183,7 @@ void TableFileFilter::OnFileSave() {
 
   CWaitCursor wc;
   if (!m_PageList.SaveList(NULL)) {
-    MessageBox("The save was unsuccessfull", "Save Table Error!");
+    MessageBox("The save was unsuccessful", "Save Table Error!");
     return;
   }
   m_PageList.SetTitleString();
@@ -200,7 +200,7 @@ void TableFileFilter::OnFileSaveAs() {
 
   CWaitCursor wc;
   if (!m_PageList.SaveList(dlg_open.GetPathName().GetBuffer(0))) {
-    MessageBox("The save was unsuccessfull", "Save Data List Error!");
+    MessageBox("The save was unsuccessful", "Save Data List Error!");
     return;
   }
 
@@ -221,7 +221,7 @@ void TableFileFilter::OnFileLoad() {
 
   CWaitCursor wc;
   if (!m_PageList.LoadList(dlg_open.GetPathName().GetBuffer(0))) {
-    MessageBox("The load was unsuccessfull", "Load Data List Error!");
+    MessageBox("The load was unsuccessful", "Load Data List Error!");
     m_PageList.ClearList();
     return;
   }
@@ -305,7 +305,7 @@ void TableFileFilter::OnBtnCreateNewTableFile() {
 
   CWaitCursor wc;
   if (!m_PageList.CreateNewTableFile(dlg_open.GetPathName().GetBuffer(0), SOURCE_TABLE_FILENAME)) {
-    MessageBox("The save was unsuccessfull", "Save Table File Error!");
+    MessageBox("The save was unsuccessful", "Save Table File Error!");
     return;
   }
 

editor/editorDoc.cpp

@@ -260,7 +260,7 @@ BOOL CEditorDoc::OnSaveDocument(LPCTSTR lpszPathName) {
                       "  4. Use File/Save As to save with the real name.\n\n"
                       "Matt & Samir are working on this problem.");
 
-  // If the Save was successfull, handle the Dallas coordination
+  // If the Save was successful, handle the Dallas coordination
   if (retval) {
 
     // If Dallas is up, change its filenames

legacy/renderer/Direct3D.cpp

@@ -2634,7 +2634,7 @@ void d3d_SetAlphaValue(uint8_t val) {
 }
 
 // Sets the overall alpha scale factor (all alpha values are scaled by this value)
-// usefull for motion blur effect
+// useful for motion blur effect
 void d3d_SetAlphaFactor(float val) { d3d_Alpha_factor = val; }
 
 // Returns the current Alpha factor

legacy/renderer/opengl.cpp

@@ -2239,7 +2239,7 @@ void opengl_SetAlphaValue(uint8_t val) {
 }
 
 // Sets the overall alpha scale factor (all alpha values are scaled by this value)
-// usefull for motion blur effect
+// useful for motion blur effect
 void opengl_SetAlphaFactor(float val) { OpenGL_Alpha_factor = val; }
 
 // Returns the current Alpha factor

legacy/renderer/renderer.cpp

@@ -1450,7 +1450,7 @@ void rend_SetAlphaValue(uint8_t val) {
 }
 
 // Sets the overall alpha scale factor (all alpha values are scaled by this value)
-// usefull for motion blur effect
+// useful for motion blur effect
 void rend_SetAlphaFactor(float val) {
   if (val < 0.0f)
     val = 0.0f;

lib/demofile.h

@@ -155,7 +155,7 @@ extern uint16_t Demo_obj_map[MAX_OBJECTS];
 #define DT_SETOBJLIFELEFT 25 // Object is getting OF_LIFELEFT flag changed
 #define DT_2D_SOUND 26       // Play a 2d sound
 
-// If not recording prompts user for filename and starts recording if successfull
+// If not recording prompts user for filename and starts recording if successful
 // If recording, close the demo file
 void DemoToggleRecording();
 

lib/renderer.h

@@ -531,7 +531,7 @@ void rend_SetAlphaType(int8_t);
 void rend_SetAlphaValue(uint8_t val);
 
 // Sets the overall alpha scale factor (all alpha values are scaled by this value)
-// usefull for motion blur effect
+// useful for motion blur effect
 void rend_SetAlphaFactor(float val);
 
 // Returns the current Alpha factor

manage/doorpage.cpp

@@ -434,7 +434,7 @@ int mng_FindSpecificDoorPage(char *name, mngs_door_page *doorpage, int offset) {
 }
 
 // Given a door page, allocs a door and calls AssignDoorPageToDoor to actually
-// load models and values. Rturns door handle on success, -1 if fail
+// load models and values. Returns door handle on success, -1 if fail
 int mng_SetAndLoadDoor(mngs_door_page *doorpage) {
   int n;
 

manage/doorpage.h

@@ -51,7 +51,7 @@ int mng_ReadNewDoorPage(CFILE *infile, mngs_door_page *doorpage);
 int mng_FindSpecificDoorPage(char *name, mngs_door_page *doorpage, int offset = 0);
 
 // Given a door page, allocs a door and calls AssignDoorPageToDoor to actually
-// load model and values. Rturns door handle on success, -1 if fail
+// load model and values. Returns door handle on success, -1 if fail
 int mng_SetAndLoadDoor(mngs_door_page *doorpage);
 
 // Given a doorpage and a door handle, attempts to make door n correspond to

manage/gamefilepage.cpp

@@ -196,7 +196,7 @@ int mng_FindSpecificGamefilePage(char *name, mngs_gamefile_page *gamefilepage, i
 }
 
 // Given a gamefile page, allocs a gamefile and calls AssignGamefilePageToGamefile to actually
-// load models and values. Rturns gamefile handle on success, -1 if fail
+// load models and values. Returns gamefile handle on success, -1 if fail
 int mng_SetAndLoadGamefile(mngs_gamefile_page *gamefilepage) {
   int n;
 

manage/gamefilepage.h

@@ -48,7 +48,7 @@ int mng_ReadNewGamefilePage(CFILE *infile, mngs_gamefile_page *gamefilepage);
 int mng_FindSpecificGamefilePage(char *name, mngs_gamefile_page *gamefilepage, int offset = 0);
 
 // Given a gamefile page, allocs a gamefile and calls AssignGamefilePageToGamefile to actually
-// load bitmaps and values. Rturns gamefile handle on success, -1 if fail
+// load bitmaps and values. Returns gamefile handle on success, -1 if fail
 int mng_SetAndLoadGamefile(mngs_gamefile_page *gamefilepage);
 
 // Given a gamefilepage and a gamefile handle, attempts to make gamefile n correspond to

manage/generic.cpp

@@ -1838,7 +1838,7 @@ try_again:;
 }
 
 // Given a generic page, allocs a generic and calls AssignGenericPageTogeneric to actually
-// load models and values. Rturns generic handle on success, -1 if fail
+// load models and values. Returns generic handle on success, -1 if fail
 int mng_SetAndLoadGeneric(mngs_generic_page *genericpage, CFILE *infile) {
   int i, j, n;
   bool f_anim = false;

manage/genericpage.h

@@ -61,7 +61,7 @@ int mng_ReadNewGenericPage(CFILE *infile, mngs_generic_page *genericpage);
 int mng_FindSpecificGenericPage(char *name, mngs_generic_page *genericpage, int offset = 0);
 
 // Given a generic page, allocs a generic and calls AssignGenericPageToGeneric to actually
-// load model and values. Rturns generic handle on success, -1 if fail
+// load model and values. Returns generic handle on success, -1 if fail
 int mng_SetAndLoadGeneric(mngs_generic_page *genericpage, CFILE *infile = NULL);
 
 // Given a genericpage and a generic handle, attempts to make generic n correspond to

manage/megapage.cpp

@@ -233,7 +233,7 @@ int mng_FindSpecificMegacellPage(char *name, mngs_megacell_page *megacellpage, i
   return found; // successful!
 }
 // Given a megacell page, allocs a megacell and calls AssignMegacellPageToMegacell to actually
-// load models and values. Rturns megacell handle on success, -1 if fail
+// load models and values. Returns megacell handle on success, -1 if fail
 int mng_SetAndLoadMegacell(mngs_megacell_page *megacellpage) {
   int n;
 

manage/megapage.h

@@ -49,7 +49,7 @@ int mng_ReadNewMegacellPage(CFILE *infile, mngs_megacell_page *megacellpage);
 int mng_FindSpecificMegacellPage(char *name, mngs_megacell_page *megacellpage, int local);
 
 // Given a megacell page, allocs a megacell and calls AssignMegacellPageToMegacell to actually
-// load model and values. Rturns megacell handle on success, -1 if fail
+// load model and values. Returns megacell handle on success, -1 if fail
 int mng_SetAndLoadMegacell(mngs_megacell_page *megacellpage);
 
 // Given a megacellpage and a megacell handle, attempts to make megacell n correspond to

manage/powerpage.h

@@ -53,7 +53,7 @@ int mng_DeletePowPage(char *name, int local);
 int mng_FindSpecificPowPage(char *name, mngs_power_page *powpage, int offset = 0);
 
 // Given a power page, allocs a powerup and calls AssignPowPageToPowerup to actually
-// load bitmaps and values. Rturns powerup handle on success, -1 if fail
+// load bitmaps and values. Returns powerup handle on success, -1 if fail
 int mng_SetAndLoadPowerup(mngs_power_page *powpage);
 
 // Given a powpage and a powerup handle, attempts to make powerup n correspond to

manage/robotpage.h

@@ -53,7 +53,7 @@ int mng_DeleteRobotPage(char *name, int local);
 int mng_FindSpecificRobotPage(char *name, mngs_robot_page *robotpage);
 
 // Given a robot page, allocs a robot and calls AssignRobotPageToRobot to actually
-// load model and values. Rturns robot handle on success, -1 if fail
+// load model and values. Returns robot handle on success, -1 if fail
 int mng_SetAndLoadRobot(mngs_robot_page *robotpage);
 
 // Given a robotpage and a robot handle, attempts to make robot n correspond to

manage/shippage.cpp

@@ -913,7 +913,7 @@ try_again:;
 }
 
 // Given a ship page, allocs a ship and calls AssignShipPageToShip to actually
-// load models and values. Rturns ship handle on success, -1 if fail
+// load models and values. Returns ship handle on success, -1 if fail
 int mng_SetAndLoadShip(mngs_ship_page *shippage, CFILE *infile) {
   int n;
 

manage/shippage.h

@@ -57,7 +57,7 @@ int mng_ReadNewShipPage(CFILE *infile, mngs_ship_page *shippage);
 int mng_FindSpecificShipPage(char *name, mngs_ship_page *shippage, int offset = 0);
 
 // Given a ship page, allocs a ship and calls AssignShipPageToShip to actually
-// load model and values. Rturns ship handle on success, -1 if fail
+// load model and values. Returns ship handle on success, -1 if fail
 int mng_SetAndLoadShip(mngs_ship_page *shippage, CFILE *infile);
 
 // Given a shippage and a ship handle, attempts to make ship n correspond to

manage/soundpage.cpp

@@ -381,7 +381,7 @@ int mng_FindSpecificSoundPage(char *name, mngs_sound_page *soundpage, int offset
   return found; // successful!
 }
 // Given a sound page, allocs a sound and calls AssignSoundPageToSound to actually
-// load raws and values. Rturns sound handle on success, -1 if fail
+// load raws and values. Returns sound handle on success, -1 if fail
 int mng_SetAndLoadSound(mngs_sound_page *soundpage) {
   int n;
 

manage/soundpage.h

@@ -48,7 +48,7 @@ int mng_ReadNewSoundPage(CFILE *infile, mngs_sound_page *soundpage);
 int mng_FindSpecificSoundPage(char *name, mngs_sound_page *soundpage, int offset = 0);
 
 // Given a sound page, allocs a sound and calls AssignSoundPageToSound to actually
-// load model and values. Rturns sound handle on success, -1 if fail
+// load model and values. Returns sound handle on success, -1 if fail
 int mng_SetAndLoadSound(mngs_sound_page *soundpage);
 
 // Given a soundpage and a sound handle, attempts to make sound n correspond to

manage/texpage.cpp

@@ -916,7 +916,7 @@ try_again:;
 }
 
 // Given a texture page, allocs a texture and calls AssignTexPageToTexture to actually
-// load bitmaps and values. Rturns texture handle on success, -1 if fail
+// load bitmaps and values. Returns texture handle on success, -1 if fail
 int mng_SetAndLoadTexture(mngs_texture_page *texpage, CFILE *infile) {
   int n;
 

manage/weaponpage.cpp

@@ -1345,7 +1345,7 @@ int mng_GetGuaranteedWeaponPage(char *name, CFILE *infile) {
 }
 
 // Given a weapon page, allocs a weapon and calls AssignWeaponPageToWeapon to actually
-// load models and values. Rturns weapon handle on success, -1 if fail
+// load models and values. Returns weapon handle on success, -1 if fail
 int mng_SetAndLoadWeapon(mngs_weapon_page *weaponpage, CFILE *infile) {
   int n;
 

manage/weaponpage.h

@@ -61,7 +61,7 @@ int mng_FindSpecificWeaponPage(char *name, mngs_weapon_page *weaponpage, int off
 int mng_FindSpecificWeaponPage(char *name, mngs_weapon_page *weaponpage);
 
 // Given a weapon page, allocs a weapon and calls AssignWeaponPageToWeapon to actually
-// load model and values. Rturns weapon handle on success, -1 if fail
+// load model and values. Returns weapon handle on success, -1 if fail
 int mng_SetAndLoadWeapon(mngs_weapon_page *weaponpage, CFILE *infile);
 
 // Given a weaponpage and a weapon handle, attempts to make weapon n correspond to

networking/networking.cpp

@@ -2275,7 +2275,7 @@ int nw_ReccomendPPS() {
 
 // Register the networking library to call your function back
 // When data containing your ID is found
-// Returns non-zero if succesfull, Zero if this ID is already registered
+// Returns non-zero if succesful, Zero if this ID is already registered
 int nw_RegisterCallback(NetworkReceiveCallback nfp, uint8_t id) {
   ASSERT(id < 16);
 

renderer/HardwareBaseGPU.cpp

@@ -189,7 +189,7 @@ void rend_SetZBias(float z_bias) {
 }
 
 // Sets the overall alpha scale factor (all alpha values are scaled by this value)
-// usefull for motion blur effect
+// useful for motion blur effect
 void rend_SetAlphaFactor(float val) {
   gpu_Alpha_factor = std::clamp(val, 0.0f, 1.0f);
 }