Various spelling fixes and unused code deletion.

Patch by Forgon from ticket:4612.
Warzone2100 · Aug 2, 2017 · d0dd6cf · d0dd6cf
1 parent 364d336
commit d0dd6cf
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 29 deletions.
diff --git a/lib/framework/debug.cpp b/lib/framework/debug.cpp
@@ -209,7 +209,7 @@ bool debug_callback_file_init(void **data)
 	}
 	snprintf(WZ_DBGFile, sizeof(WZ_DBGFile), "%s", WZDebugfilename);
 	setbuf(logfile, nullptr);
-	fprintf(logfile, "\n--- Starting log [%s]---\n", WZDebugfilename);
+	fprintf(logfile, "--- Starting log [%s]---\n", WZDebugfilename);
 	*data = logfile;
 
 	return true;

diff --git a/lib/framework/frame.cpp b/lib/framework/frame.cpp
@@ -292,7 +292,7 @@ bool saveFile(const char *pFileName, const char *pFileData, UDWORD fileSize)
 	}
 	else
 	{
-		debug(LOG_WZ, "Successfully wrote to %s%s%s with %d bytes", PHYSFS_getRealDir(pFileName), PHYSFS_getDirSeparator(), pFileName, size);
+		debug(LOG_WZ, "Successfully wrote to %s%s with %d bytes", PHYSFS_getRealDir(pFileName), pFileName, size);
 	}
 	return true;
 }

diff --git a/lib/ivis_opengl/imdload.cpp b/lib/ivis_opengl/imdload.cpp
@@ -496,7 +496,7 @@ void _imd_calc_bounds(iIMDShape *s, Vector3f *p, int size)
 	dz = vzmax.z - vzmin.z;
 	zspan = dx * dx + dy * dy + dz * dz;
 
-	// set points dia1 & dia2 to maximally seperated pair
+	// set points dia1 & dia2 to maximally separated pair
 	// assume xspan biggest
 	dia1 = vxmin;
 	dia2 = vxmax;

diff --git a/lib/qtgame/main_qt.cpp b/lib/qtgame/main_qt.cpp
@@ -153,13 +153,3 @@ int wzGetSwapInterval()
 {
 	return WzMainWindow::instance()->swapInterval();
 }
-
-void StartTextInput()
-{
-	// Something started?
-}
-
-void StopTextInput()
-{
-	// Whatever it was, it stopped…
-}
diff --git a/lib/widget/widget.cpp b/lib/widget/widget.cpp
@@ -826,7 +826,7 @@ void WIDGET::displayRecursive(int xOffset, int yOffset)
 
 /* Display the screen's widgets in their current state
  * (Call after calling widgRunScreen, this allows the input
- *  processing to be seperated from the display of the widgets).
+ *  processing to be separated from the display of the widgets).
  */
 void widgDisplayScreen(W_SCREEN *psScreen)
 {

diff --git a/lib/widget/widget.h b/lib/widget/widget.h
@@ -340,7 +340,7 @@ WZ_DECL_NONNULL(1) WidgetTriggers const &widgRunScreen(W_SCREEN *psScreen);
 
 /** Display the screen's widgets in their current state
  * (Call after calling widgRunScreen, this allows the input
- *  processing to be seperated from the display of the widgets).
+ *  processing to be separated from the display of the widgets).
  */
 WZ_DECL_NONNULL(1) void widgDisplayScreen(W_SCREEN *psScreen);
 

diff --git a/src/difficulty.cpp b/src/difficulty.cpp
@@ -25,7 +25,7 @@
 
 
 /*
-	Changed to allow seperate modifiers for enemy and player damage.
+	Changed to allow separate modifiers for enemy and player damage.
 */
 
 #include "lib/framework/frame.h"

diff --git a/src/droiddef.h b/src/droiddef.h
@@ -38,7 +38,7 @@
 
 /*!
  * The number of components in the asParts / asBits arrays.
- * Weapons are stored seperately, thus the maximum index into the array
+ * Weapons are stored separately, thus the maximum index into the array
  * is 1 smaller than the number of components.
  */
 #define DROID_MAXCOMP (COMP_NUMCOMPONENTS - 1)

diff --git a/src/init.cpp b/src/init.cpp
@@ -898,7 +898,7 @@ bool frontendShutdown()
 
 bool stageOneInitialise()
 {
-	debug(LOG_WZ, "== stageOneInitalise ==");
+	debug(LOG_WZ, "== stageOneInitialise ==");
 	wzSceneEnd("Main menu loop");
 	wzSceneBegin("Main game loop");
 
@@ -1026,7 +1026,7 @@ bool stageOneShutDown()
 	scrShutDown();
 	gridShutDown();
 
-	debug(LOG_TEXTURE, "=== stageOneShutDown ===");
+	debug(LOG_TEXTURE, "== stageOneShutDown ==");
 	modelShutdown();
 	pie_TexShutDown();
 
@@ -1049,7 +1049,7 @@ bool stageTwoInitialise()
 {
 	int i;
 
-	debug(LOG_WZ, "== stageTwoInitalise ==");
+	debug(LOG_WZ, "== stageTwoInitialise ==");
 
 	// make sure we clear on loading; this a bad hack to fix a bug when
 	// loading a savegame where we are building a lassat
@@ -1179,7 +1179,7 @@ bool stageThreeInitialise()
 	UDWORD i;
 	DROID		*psDroid;
 
-	debug(LOG_WZ, "== stageThreeInitalise ==");
+	debug(LOG_WZ, "== stageThreeInitialise ==");
 
 	loopMissionState = LMS_NORMAL;
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -934,8 +934,7 @@ int realmain(int argc, char *argv[])
 		         newtime->tm_mon + 1, newtime->tm_mday, newtime->tm_hour, newtime->tm_min, newtime->tm_sec);
 		debug_register_callback(debug_callback_file, debug_callback_file_init, debug_callback_file_exit, buf);
 
-		// FIXME: Change this to LOG_WZ on next release
-		debug(LOG_INFO, "Using %s debug file", buf);
+		debug(LOG_WZ, "Using %s debug file", buf);
 	}
 
 	// NOTE: it is now safe to use debug() calls to make sure output gets captured.

diff --git a/src/multiint.cpp b/src/multiint.cpp
@@ -4183,7 +4183,6 @@ void displayPlayer(WIDGET *psWidget, UDWORD xOffset, UDWORD yOffset)
 
 	int downloadProgress = NETgetDownloadProgress(j);
 
-	//bluboxes.
 	drawBlueBox(x, y, psWidget->width(), psWidget->height());
 	if (downloadProgress != 100)
 	{

diff --git a/src/multijoin.cpp b/src/multijoin.cpp
@@ -89,7 +89,7 @@ bool intDisplayMultiJoiningStatus(UBYTE joinCount)
 	x = RET_X;
 	y = RET_Y;
 
-	RenderWindowFrame(FRAME_NORMAL, x, y , w, h);		// draw a wee blu box.
+	RenderWindowFrame(FRAME_NORMAL, x, y , w, h);		// draw a wee blue box.
 
 	// display how far done..
 	iV_DrawText(_("Players Still Joining"),

diff --git a/src/terrain.cpp b/src/terrain.cpp
@@ -117,7 +117,7 @@ static int terrainDistance;
 static int xSectors, ySectors;
 
 /// Did we initialise the terrain renderer yet?
-static bool terrainInitalised = false;
+static bool terrainInitialised = false;
 
 /// Helper to specify the offset in a VBO
 #define BUFFER_OFFSET(i) ((char *)NULL + (i))
@@ -538,7 +538,7 @@ void markTileDirty(int i, int j)
 {
 	int x, y;
 
-	if (!terrainInitalised)
+	if (!terrainInitialised)
 	{
 		return; // will be updated anyway
 	}
@@ -931,7 +931,7 @@ bool initTerrain()
 
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, lightmapWidth, lightmapHeight, 0, GL_RGB, GL_UNSIGNED_BYTE, lightmapPixmap);
 
-	terrainInitalised = true;
+	terrainInitialised = true;
 
 	glBindBuffer(GL_ARRAY_BUFFER, 0);  // HACK Must unbind GL_ARRAY_BUFFER (in this function, at least), otherwise text rendering may mysteriously crash.
 
@@ -972,7 +972,7 @@ void shutdownTerrain()
 	free(lightmapPixmap);
 	lightmapPixmap = nullptr;
 
-	terrainInitalised = false;
+	terrainInitialised = false;
 }
 
 static void updateLightMap()