Merge pull request #255 from kroq-gar78/typo-fixes

Fix typos in comments and debug/error statements

SConscript

@@ -130,7 +130,7 @@ if tool:
 for var in ["CC","CXX","LD","LIBPATH"]:
 	if var in os.environ:
 		env[var] = os.environ[var]
-		print "copying enviroment variable {0}={1!r}".format(var,os.environ[var])
+		print "copying environment variable {0}={1!r}".format(var,os.environ[var])
 # variables containing several space separated things
 for var in ["CFLAGS","CCFLAGS","CXXFLAGS","LINKFLAGS","CPPDEFINES","CPPPATH"]:
 	if var in os.environ:
@@ -138,7 +138,7 @@ for var in ["CFLAGS","CCFLAGS","CXXFLAGS","LINKFLAGS","CPPDEFINES","CPPPATH"]:
 			env[var] += SCons.Util.CLVar(os.environ[var])
 		else:
 			env[var] = SCons.Util.CLVar(os.environ[var])
-		print "copying enviroment variable {0}={1!r}".format(var,os.environ[var])
+		print "copying environment variable {0}={1!r}".format(var,os.environ[var])
 
 #Used for intro text / executable name, actual bit flags are only set if the --64bit/--32bit command line args are given
 def add32bitflags(env):

TODO

@@ -13,7 +13,7 @@ Client/Server API:
 
 Interface General:
 	Try to use the "Activity" model for some simpler interfaces instead of code-heavy M-V-C
-	Move interfaces into seperate folder
+	Move interfaces into separate folder
 
 Interface Elements:
 	Vertical Scrolling for Textbox, 

src/PowderToySDL.cpp

@@ -721,7 +721,7 @@ void BlueScreen(const char * detailMessage){
 
 	std::string errorTitle = "ERROR";
 	std::string errorDetails = "Details: " + std::string(detailMessage);
-	std::string errorHelp = "An unrecoverable fault has occured, please report the error by visiting the website below\n"
+	std::string errorHelp = "An unrecoverable fault has occurred, please report the error by visiting the website below\n"
 		"http://" SERVER;
 	int currentY = 0, width, height;
 	int errorWidth = 0;

src/client/requestbroker/ImageRequest.cpp

@@ -113,7 +113,7 @@ RequestBroker::ProcessResponse ImageRequest::Process(RequestBroker & rb)
 	if(image)
 	{
 
-		//Create a copy, to seperate from the cache
+		//Create a copy, to separate from the cache
 		std::vector<Request *> children(Children.begin(), Children.end());
 		Children.clear();
 

src/gui/game/BitmapBrush.h

@@ -24,7 +24,7 @@ public:
 	{
 		ui::Point newSize = rectSize_;
 
-		//Ensure the rect has odd dimentions so we can pull an integer radius with a 1x1 centre 
+		//Ensure the rect has odd dimensions so we can pull an integer radius with a 1x1 centre 
 		if(!(newSize.X % 2))
 			newSize.X += 1;
 		if(!(newSize.Y % 2))

src/lua/socket/except.h

@@ -5,7 +5,7 @@
 * LuaSocket toolkit (but completely independent from other modules)
 *
 * This provides support for simple exceptions in Lua. During the
-* development of the HTTP/FTP/SMTP support, it became aparent that
+* development of the HTTP/FTP/SMTP support, it became apparent that
 * error checking was taking a substantial amount of the coding. These
 * function greatly simplify the task of checking errors.
 *

src/lua/socket/io.h

@@ -45,7 +45,7 @@ typedef int (*p_send) (
 /* interface to recv function */
 typedef int (*p_recv) (
     void *ctx,          /* context needed by recv */
-    char *data,         /* pointer to buffer where data will be writen */
+    char *data,         /* pointer to buffer where data will be written */
     size_t count,       /* number of bytes to receive into buffer */
     size_t *got,        /* number of bytes received uppon return */
     p_timeout tm        /* timeout control */

src/lua/socket/tcp.h

@@ -4,7 +4,7 @@
 * TCP object
 * LuaSocket toolkit
 *
-* The tcp.h module is basicly a glue that puts together modules buffer.h,
+* The tcp.h module is basically a glue that puts together modules buffer.h,
 * timeout.h socket.h and inet.h to provide the LuaSocket TCP (AF_INET,
 * SOCK_STREAM) support.
 *

src/resampler/resampler.cpp

@@ -6,7 +6,7 @@
 //
 // Feb. 1996: Creation, losely based on a heavily bugfixed version of Schumacher's resampler in Graphics Gems 3.
 // Oct. 2000: Ported to C++, tweaks.
-// May 2001: Continous to discrete mapping, box filter tweaks.
+// May 2001: Continuous to discrete mapping, box filter tweaks.
 // March 9, 2002: Kaiser filter grabbed from Jonathan Blow's GD magazine mipmap sample code.
 // Sept. 8, 2002: Comments cleaned up a bit.
 // Dec. 31, 2008: v2.2: Bit more cleanup, released as public domain.

src/simulation/elements/Element.h

@@ -58,7 +58,7 @@ public:
 	static int legacyUpdate(UPDATE_FUNC_ARGS);
 
 	/** Returns a list of properties, their type and offset within the structure that can be changed
-	 by higher-level processes refering to them by name such as Lua or the property tool **/
+	 by higher-level processes referring to them by name such as Lua or the property tool **/
 	static std::vector<StructProperty> GetProperties();
 };
 

src/simulation/elements/SPRK.cpp

@@ -244,7 +244,7 @@ int Element_SPRK::update(UPDATE_FUNC_ARGS)
 				}
 
 				if (pavg == PT_INSL) continue; //Insulation blocks everything past here
-				if (!((sim->elements[receiver].Properties&PROP_CONDUCTS)||receiver==PT_INST||receiver==PT_QRTZ)) continue; //Stop non-conducting recievers, allow INST and QRTZ as special cases
+				if (!((sim->elements[receiver].Properties&PROP_CONDUCTS)||receiver==PT_INST||receiver==PT_QRTZ)) continue; //Stop non-conducting receivers, allow INST and QRTZ as special cases
 				if (abs(rx)+abs(ry)>=4 &&sender!=PT_SWCH&&receiver!=PT_SWCH) continue; //Only switch conducts really far
 				if (receiver==sender && receiver!=PT_INST && receiver!=PT_QRTZ) goto conduct; //Everything conducts to itself, except INST.