From 264ffcb6f7574437d077443c926acebbc957dda9 Mon Sep 17 00:00:00 2001 From: Christoph Korn Date: Tue, 31 Dec 2013 02:23:16 +0100 Subject: [PATCH 1/2] Fix typos Just fix some typos. --- neo/d3xp/ai/AI.cpp | 2 +- neo/d3xp/gamesys/Class.cpp | 2 +- neo/d3xp/physics/Physics_AF.cpp | 4 ++-- neo/d3xp/script/Script_Compiler.cpp | 2 +- neo/d3xp/script/Script_Program.h | 2 +- neo/framework/DeclAF.cpp | 2 +- neo/framework/DeclManager.h | 4 ++-- neo/idlib/CmdArgs.h | 2 +- neo/idlib/Lexer.cpp | 4 ++-- neo/idlib/Lexer.h | 4 ++-- neo/idlib/Parser.cpp | 2 +- neo/libs/openal-soft/include/AL/al.h | 2 +- neo/swf/SWF_SpriteInstance.cpp | 8 ++++---- neo/sys/sdl/sdl_glimp.cpp | 2 +- neo/sys/sys_session_local.cpp | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/neo/d3xp/ai/AI.cpp b/neo/d3xp/ai/AI.cpp index 2c8509d0..db5936ad 100644 --- a/neo/d3xp/ai/AI.cpp +++ b/neo/d3xp/ai/AI.cpp @@ -5764,7 +5764,7 @@ bool idAI::UpdateAnimationControllers() // Getting the joint positions causes the joints to be updated. The IK gets joint positions itself (which // are already up to date because of getting the joints in this function) and then sets their positions, which // forces the heirarchy to be updated again next time we get a joint or present the model. If IK is enabled, - // or if we have a seperate head, we end up transforming the joints twice per frame. Characters with no + // or if we have a separate head, we end up transforming the joints twice per frame. Characters with no // head entity and no ik will only transform their joints once. Set g_debuganim to the current entity number // in order to see how many times an entity transforms the joints per frame. idActor::UpdateAnimationControllers(); diff --git a/neo/d3xp/gamesys/Class.cpp b/neo/d3xp/gamesys/Class.cpp index a25b2932..39a8a3e3 100644 --- a/neo/d3xp/gamesys/Class.cpp +++ b/neo/d3xp/gamesys/Class.cpp @@ -1041,7 +1041,7 @@ bool idClass::ProcessEventArgPtr( const idEventDef* ev, intptr_t* data ) #if !CPU_EASYARGS /* - on ppc architecture, floats are passed in a seperate set of registers + on ppc architecture, floats are passed in a separate set of registers the function prototypes must have matching float declaration http://developer.apple.com/documentation/DeveloperTools/Conceptual/MachORuntime/2rt_powerpc_abi/chapter_9_section_5.html diff --git a/neo/d3xp/physics/Physics_AF.cpp b/neo/d3xp/physics/Physics_AF.cpp index dc85fee8..8f4b91d9 100644 --- a/neo/d3xp/physics/Physics_AF.cpp +++ b/neo/d3xp/physics/Physics_AF.cpp @@ -3482,7 +3482,7 @@ void idAFConstraint_Contact::ApplyFriction( float invTimeStep ) return; } - // seperate friction per contact is silly but it's fast and often looks close enough + // separate friction per contact is silly but it's fast and often looks close enough if( af_useImpulseFriction.GetBool() ) { @@ -7872,7 +7872,7 @@ void idPhysics_AF::BuildTrees() if( trees.Num() > 1 ) { - gameLocal.Warning( "Articulated figure has multiple seperate tree structures for entity '%s' type '%s'.", + gameLocal.Warning( "Articulated figure has multiple separate tree structures for entity '%s' type '%s'.", self->name.c_str(), self->GetType()->classname ); } diff --git a/neo/d3xp/script/Script_Compiler.cpp b/neo/d3xp/script/Script_Compiler.cpp index 3d3f287d..13f68fc1 100644 --- a/neo/d3xp/script/Script_Compiler.cpp +++ b/neo/d3xp/script/Script_Compiler.cpp @@ -1252,7 +1252,7 @@ idVarDef* idCompiler::EmitFunctionParms( int op, idVarDef* func, int startarg, i { EmitOpcode( op, object, VirtualFunctionConstant( func ) ); - // need arg size seperate since script object may be NULL + // need arg size separate since script object may be NULL statement_t& statement = gameLocal.program.GetStatement( gameLocal.program.NumStatements() - 1 ); statement.c = SizeConstant( func->value.functionPtr->parmTotal ); } diff --git a/neo/d3xp/script/Script_Program.h b/neo/d3xp/script/Script_Program.h index 993a0001..dbb14174 100644 --- a/neo/d3xp/script/Script_Program.h +++ b/neo/d3xp/script/Script_Program.h @@ -476,7 +476,7 @@ typedef struct statement_s idProgram Handles compiling and storage of script data. Multiple idProgram objects -would represent seperate programs with no knowledge of each other. Scripts +would represent separate programs with no knowledge of each other. Scripts meant to access shared data and functions should all be compiled by a single idProgram. diff --git a/neo/framework/DeclAF.cpp b/neo/framework/DeclAF.cpp index d799e652..ec57628f 100644 --- a/neo/framework/DeclAF.cpp +++ b/neo/framework/DeclAF.cpp @@ -1025,7 +1025,7 @@ bool idDeclAF::ParseBody( idLexer& src ) } else { - src.Error( "unkown model type %s", token.c_str() ); + src.Error( "unknown model type %s", token.c_str() ); return false; } } diff --git a/neo/framework/DeclManager.h b/neo/framework/DeclManager.h index 8c24704d..7bd823e3 100644 --- a/neo/framework/DeclManager.h +++ b/neo/framework/DeclManager.h @@ -92,11 +92,11 @@ typedef enum DS_PARSED } declState_t; -const int DECL_LEXER_FLAGS = LEXFL_NOSTRINGCONCAT | // multiple strings seperated by whitespaces are not concatenated +const int DECL_LEXER_FLAGS = LEXFL_NOSTRINGCONCAT | // multiple strings separated by whitespaces are not concatenated LEXFL_NOSTRINGESCAPECHARS | // no escape characters inside strings LEXFL_ALLOWPATHNAMES | // allow path seperators in names LEXFL_ALLOWMULTICHARLITERALS | // allow multi character literals - LEXFL_ALLOWBACKSLASHSTRINGCONCAT | // allow multiple strings seperated by '\' to be concatenated + LEXFL_ALLOWBACKSLASHSTRINGCONCAT | // allow multiple strings separated by '\' to be concatenated LEXFL_NOFATALERRORS; // just set a flag instead of fatal erroring diff --git a/neo/idlib/CmdArgs.h b/neo/idlib/CmdArgs.h index 4711cc70..41a8e610 100644 --- a/neo/idlib/CmdArgs.h +++ b/neo/idlib/CmdArgs.h @@ -67,7 +67,7 @@ public: // Takes a null terminated string and breaks the string up into arg tokens. // Does not need to be /n terminated. - // Set keepAsStrings to true to only seperate tokens from whitespace and comments, ignoring punctuation + // Set keepAsStrings to true to only separate tokens from whitespace and comments, ignoring punctuation void TokenizeString( const char* text, bool keepAsStrings ); void AppendArg( const char* text ); diff --git a/neo/idlib/Lexer.cpp b/neo/idlib/Lexer.cpp index c7c6a95b..4f2cf8e5 100644 --- a/neo/idlib/Lexer.cpp +++ b/neo/idlib/Lexer.cpp @@ -207,7 +207,7 @@ const char* idLexer::GetPunctuationFromId( int id ) return idLexer::punctuations[i].p; } } - return "unkown punctuation"; + return "unknown punctuation"; } /* @@ -755,7 +755,7 @@ int idLexer::ReadName( idToken* token ) ( c >= 'A' && c <= 'Z' ) || ( c >= '0' && c <= '9' ) || c == '_' || - // if treating all tokens as strings, don't parse '-' as a seperate token + // if treating all tokens as strings, don't parse '-' as a separate token ( ( idLexer::flags & LEXFL_ONLYSTRINGS ) && ( c == '-' ) ) || // if special path name characters are allowed ( ( idLexer::flags & LEXFL_ALLOWPATHNAMES ) && ( c == '/' || c == '\\' || c == ':' || c == '.' ) ) ); diff --git a/neo/idlib/Lexer.h b/neo/idlib/Lexer.h index 86dcfe42..22cbfbc8 100644 --- a/neo/idlib/Lexer.h +++ b/neo/idlib/Lexer.h @@ -51,7 +51,7 @@ typedef enum LEXFL_NOERRORS = BIT( 0 ), // don't print any errors LEXFL_NOWARNINGS = BIT( 1 ), // don't print any warnings LEXFL_NOFATALERRORS = BIT( 2 ), // errors aren't fatal - LEXFL_NOSTRINGCONCAT = BIT( 3 ), // multiple strings seperated by whitespaces are not concatenated + LEXFL_NOSTRINGCONCAT = BIT( 3 ), // multiple strings separated by whitespaces are not concatenated LEXFL_NOSTRINGESCAPECHARS = BIT( 4 ), // no escape characters inside strings LEXFL_NODOLLARPRECOMPILE = BIT( 5 ), // don't use the $ sign for precompilation LEXFL_NOBASEINCLUDES = BIT( 6 ), // don't include files embraced with < > @@ -60,7 +60,7 @@ typedef enum LEXFL_ALLOWIPADDRESSES = BIT( 9 ), // allow ip addresses to be parsed as numbers LEXFL_ALLOWFLOATEXCEPTIONS = BIT( 10 ), // allow float exceptions like 1.#INF or 1.#IND to be parsed LEXFL_ALLOWMULTICHARLITERALS = BIT( 11 ), // allow multi character literals - LEXFL_ALLOWBACKSLASHSTRINGCONCAT = BIT( 12 ), // allow multiple strings seperated by '\' to be concatenated + LEXFL_ALLOWBACKSLASHSTRINGCONCAT = BIT( 12 ), // allow multiple strings separated by '\' to be concatenated LEXFL_ONLYSTRINGS = BIT( 13 ) // parse as whitespace deliminated strings (quoted strings keep quotes) } lexerFlags_t; diff --git a/neo/idlib/Parser.cpp b/neo/idlib/Parser.cpp index bb5c1c32..769ad716 100644 --- a/neo/idlib/Parser.cpp +++ b/neo/idlib/Parser.cpp @@ -3720,7 +3720,7 @@ const char* idParser::GetPunctuationFromId( int id ) return idParser::punctuations[i].p; } } - return "unkown punctuation"; + return "unknown punctuation"; } /* diff --git a/neo/libs/openal-soft/include/AL/al.h b/neo/libs/openal-soft/include/AL/al.h index 413b3833..c4af5f8b 100644 --- a/neo/libs/openal-soft/include/AL/al.h +++ b/neo/libs/openal-soft/include/AL/al.h @@ -363,7 +363,7 @@ typedef void ALvoid; /** No error. */ #define AL_NO_ERROR 0 -/** Invalid name paramater passed to AL call. */ +/** Invalid name parameter passed to AL call. */ #define AL_INVALID_NAME 0xA001 /** Invalid enum parameter passed to AL call. */ diff --git a/neo/swf/SWF_SpriteInstance.cpp b/neo/swf/SWF_SpriteInstance.cpp index 45aad4d6..88f5393e 100644 --- a/neo/swf/SWF_SpriteInstance.cpp +++ b/neo/swf/SWF_SpriteInstance.cpp @@ -677,7 +677,7 @@ void idSWFSpriteInstance::PlayFrame( const idSWFParmList& parms ) } else { - idLib::Warning( "gotoAndPlay: expected 1 paramater" ); + idLib::Warning( "gotoAndPlay: expected 1 parameter" ); } } @@ -702,7 +702,7 @@ void idSWFSpriteInstance::StopFrame( const idSWFParmList& parms ) } else { - idLib::Warning( "gotoAndStop: expected 1 paramater" ); + idLib::Warning( "gotoAndStop: expected 1 parameter" ); } } @@ -1161,7 +1161,7 @@ SWF_SPRITE_FUNCTION_DEFINE( gotoAndPlay ) } else { - idLib::Warning( "gotoAndPlay: expected 1 paramater" ); + idLib::Warning( "gotoAndPlay: expected 1 parameter" ); } return idSWFScriptVar(); } @@ -1185,7 +1185,7 @@ SWF_SPRITE_FUNCTION_DEFINE( gotoAndStop ) } else { - idLib::Warning( "gotoAndStop: expected 1 paramater" ); + idLib::Warning( "gotoAndStop: expected 1 parameter" ); } return idSWFScriptVar(); } diff --git a/neo/sys/sdl/sdl_glimp.cpp b/neo/sys/sdl/sdl_glimp.cpp index a0098126..7002c22c 100644 --- a/neo/sys/sdl/sdl_glimp.cpp +++ b/neo/sys/sdl/sdl_glimp.cpp @@ -315,7 +315,7 @@ bool GLimp_Init( glimpParms_t parms ) */ #if SDL_VERSION_ATLEAST(2, 0, 0) -// SDL1 doesn't support multiple displays, so the source is much shorter and doesn't need seperate functions +// SDL1 doesn't support multiple displays, so the source is much shorter and doesn't need separate functions // makes sure the window will be full-screened on the right display and returns the SDL display index static int ScreenParmsHandleDisplayIndex( glimpParms_t parms ) { diff --git a/neo/sys/sys_session_local.cpp b/neo/sys/sys_session_local.cpp index 5beb6828..e620ff70 100644 --- a/neo/sys/sys_session_local.cpp +++ b/neo/sys/sys_session_local.cpp @@ -1563,7 +1563,7 @@ bool idSessionLocal::State_Game_State_Lobby_Peer() idBitMsg msg( buffer, sizeof( buffer ) ); - // Write match paramaters to the game state host, and tell him to start + // Write match parameters to the game state host, and tell him to start GetGameLobby().parms.Write( msg ); // Tell the game state lobby host we are ready From cf9ae278f9d27019689808342103bc8a84075b10 Mon Sep 17 00:00:00 2001 From: Christoph Korn Date: Tue, 31 Dec 2013 02:37:42 +0100 Subject: [PATCH 2/2] Fix another typo Small typo fix. --- neo/framework/Zip.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neo/framework/Zip.cpp b/neo/framework/Zip.cpp index f08c49a0..9b13973e 100644 --- a/neo/framework/Zip.cpp +++ b/neo/framework/Zip.cpp @@ -452,7 +452,7 @@ bool idZipBuilder::CreateZipFileFromFiles( const idList< idFile_Memory* >& srcFi // do not allow overwrite as this should be a tempfile attempt to check the file out if( !Sys_IsFileWritable( zipFileName ) ) { - idLib::PrintfIf( zip_verbosity.GetBool(), "File %s not writeable, cannot proceed.\n", zipFileName.c_str() ); + idLib::PrintfIf( zip_verbosity.GetBool(), "File %s not writable, cannot proceed.\n", zipFileName.c_str() ); return false; } @@ -549,7 +549,7 @@ zipFile idZipBuilder::CreateZipFile( const char* name ) // do not allow overwrite as this should be a tempfile attempt to check the file out if( !Sys_IsFileWritable( name ) ) { - idLib::PrintfIf( zip_verbosity.GetBool(), "File %s not writeable, cannot proceed.\n", name ); + idLib::PrintfIf( zip_verbosity.GetBool(), "File %s not writable, cannot proceed.\n", name ); return NULL; }