diff --git a/ChangeLog.idsoftware b/ChangeLog.idsoftware index 47deae20..1e96dd13 100644 --- a/ChangeLog.idsoftware +++ b/ChangeLog.idsoftware @@ -21,7 +21,7 @@ that we distribute with the binaries. (see changelog) - Fixed another texcompression bug 25/04/2007 -- Fixed texcompression beeing disabled after each restart +- Fixed texcompression being disabled after each restart - Fixed gtk-searchpopup in treeviews 15/04/2007 @@ -1055,7 +1055,7 @@ SPoG 07/09/2004 Michael Schlueter - Removed unused source files - qsysprintf, gtkfilesel. -- Changed linux exectuable-path resolution to use '/proc/self/exe'. +- Changed linux executable-path resolution to use '/proc/self/exe'. - Changed 'file exists, overwrite?' prompt to default to 'no'. 06/09/2004 @@ -1430,7 +1430,7 @@ Nurail 30/04/2004 SPoG - Changed texture window not to auto-scroll when selecting faces. -- Changed surface inspector to apply shader seperately from shift/scale/rotate. +- Changed surface inspector to apply shader separately from shift/scale/rotate. - Changed selected face tracking to use separate selection list. 26/04/2004 @@ -1544,7 +1544,7 @@ SPoG - Removed modal buttons from Surface Inspector. - Changed Surface Inspector keys: - Escape: revert not-yet-committed values to previous state. - - Enter: commit not-yet-committed values immediatly. + - Enter: commit not-yet-committed values immediately. - Changed Surface Inspector to update when selection changes. 31/01/2004 @@ -2601,7 +2601,7 @@ SPoG - spog_branch - experimental - work-in-progress - added scene graph traversals to replace all traversals of 'active_brushes', 'selected_brushes', 'filtered_brushes' and 'entities' linked-lists. - added view module: view-volume-culling system acting on the scene graph, - uses scene heirarchy to minimise culling tests per frame. + uses scene hierarchy to minimise culling tests per frame. - added opengl-state module: sorts opengl-state objects (shaders) to minimise opengl state changes during rendering. - added renderer module: culls objects outside the view volume, @@ -2665,7 +2665,7 @@ from the code conventions: All headers that describe synapse APIs should start with an i: ishader.h igl.h The few files in include/ that don't start with a lowercase i are specific files for build control and configuration. - Regular developement never creates non i-prefixed files in include/ + Regular development never creates non i-prefixed files in include/ the merge with IDataStream goes like this (note the corrected class names): class IInputStream @@ -2728,7 +2728,7 @@ SPoG Added method to check if a file exists quickly. Added method to traverse the filesystem with control on start-dir and depth of recursion. - Defined implementation requirements for IArchive. - An archive contains a heirarchy of directories and files, and may contain empty directories. + An archive contains a hierarchy of directories and files, and may contain empty directories. An archive can be traversed in directory order. Directories can be distinguished from files during a traversal. Directory paths will always end with a separator. @@ -2815,8 +2815,8 @@ TTimo 28/11/2003 ydnar - full SCC purge of the vs.net project files (for real this time) -- added seperate Q3Map2 build targets -- added seperate Q3Map2 post-build Python script +- added separate Q3Map2 build targets +- added separate Q3Map2 post-build Python script - _skybox entity support - _skybox and _decal in entities.def (Q3) @@ -2916,7 +2916,7 @@ Some jpegs get garbaged alpha channel 14/10/2003 TTimo - http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=879 - fixed hellish dlclose issue only occuring with holy builds + fixed hellish dlclose issue only occurring with holy builds -- released 1.3.12 win32 -- end merge @@ -3065,8 +3065,8 @@ Nurail Nurail & TTimo - http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=856 a surface inspector module to customize per-game API - removing DO_SURFACEPLUGIN define (enabled implicitely) - removing bSurfacePropertiesPlugin (true implicitely) + removing DO_SURFACEPLUGIN define (enabled implicitly) + removing bSurfacePropertiesPlugin (true implicitly) remove SI_SetActiveInRadiant, it's always on by default why was USE_UNDOTABLE_DEFINE taken out? - put back in removed DBG_PLUGIN define and related code, that stuff is from way back and no longer relevant @@ -3655,7 +3655,7 @@ SPoG - Removed or #ifdef'd non-functional code from model module. - Added support for misc_gamemodel and model_static to entity module. - Cleaned up entity module's on-epair-changed API. -- Moved light-entity-specific code to a seperate file in entity module. +- Moved light-entity-specific code to a separate file in entity module. - Cleaned up file dialog interface - specify file-type-lists with a string. 22/12/2002 @@ -3689,7 +3689,7 @@ TTimo TTimo - having the linux version compile and start again. took out numerous elements while merging, built a list of TODO stuff the main thing to do being to bring the win32 build back up too, then to go through TODO list and fix stuff - until the win32 version runs too, I check this in to a seperate branch merge-1_2_10-post + until the win32 version runs too, I check this in to a separate branch merge-1_2_10-post - There is quite a massive update in mainframe.cpp switch case for all events. Looks like it's just a reordering of stuff, but it looks bad in the diffs. - added m_MapReg pattern @@ -3883,7 +3883,7 @@ TTimo mouse AngleSpeed setting was getting clobbered. fixed and upped the max values - http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=623 applied a fix, rolls back the values when the compression formats are not supported - fix ain't very clean, if we have to deal with extensions some more, we need to deal with the settings persistance better + fix ain't very clean, if we have to deal with extensions some more, we need to deal with the settings persistence better - http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=624 updated the setup code for town_*.shader (both in full setup and update) updated files in WolfPack @@ -3942,7 +3942,7 @@ TTimo cons -- gcc= read gcc version and configure accordingly changed _NO_STLPORT to Q_NO_STLPORT - independant BASE_CFLAGS and BASE_CXXFLAGS + independent BASE_CFLAGS and BASE_CXXFLAGS correcting usage of CC/CXX for c/cpp source and linking fixed missing -lz in vfspk3.so changed the way we build curry.so, works from the GtkRadiant tree now @@ -3952,7 +3952,7 @@ TTimo 04/11/2002 TTimo - http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=638 - .qe4 version 4, udpated q3's .qe4 template, update setup to put q3map2 in the right place + .qe4 version 4, updated q3's .qe4 template, update setup to put q3map2 in the right place bumped version to 1.2.11-test for test setups 03/11/2002 @@ -4036,12 +4036,12 @@ TTimo Note: This only matters in SOF2/JK2 now. Make a light targetted (a spotlight) to get it to aim the correct direction, otherwise it defaults to pointing downward. You cannot have omnidirectional flares - - Lightgrid size is automatically increased to accomodate large maps. The + - Lightgrid size is automatically increased to accommodate large maps. The MAX_MAP_LIGHTGRID error will never happen again - Update PicoModel to 0.8.7 sources - ASE support - Alias|Wavefront OBJ support - - .remap shader remapping suport + - .remap shader remapping support - http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=655 handle grayscale jpegs gracefully - mathlib: fixed VectorClear(), got rid of braces @@ -4171,12 +4171,12 @@ TTimo ESelectedPatches. + Changed the horizontal and vertical tc shift spin control to have a limit of 8192. - + Moved SPoG's implementation of redisperse cols to a seperate function + + Moved SPoG's implementation of redisperse cols to a separate function and reinstated the old code. + Added 'Paste to Camera', shortcut Alt+V, which pastes the contents of the clipboard to the current camera origin. + Added centerview functionality to 4 window mode. Ctrl+tab will focus - on the selection, or if non existant, on the camera. + on the selection, or if non existent, on the camera. 11-09-2002 Arnout @@ -4461,7 +4461,7 @@ END -- merging release-1_2_9 -> merge-post-1_2_10 into trunk - END TTimo - spritemodels in build system - applying HL setup patch (att 270, bug 197) - - the templating went one filename seperator too far, causing all *.fgl to be modified .. + - the templating went one filename separator too far, causing all *.fgl to be modified .. fixed so that we only have the relevant changes - modules added to main Executable Files, TODO for later will need to identify what is HL specific - .game generation: don't want enginename yet, gamename is ok @@ -4560,7 +4560,7 @@ END -- merging release-1_2_9 -> merge-post-1_2_10 into trunk - END 27/5/2002 Hydra - - Created an inital implementation of a sprite model plugin. + - Created an initial implementation of a sprite model plugin. According to the powers that be, it seems creating a model plugin is hackish. It works ok, but there is no way to attach models (sprites if you will) @@ -5072,7 +5072,7 @@ END -- merging release-1_2_9 -> merge-post-1_2_10 into trunk - END TTimo - patching in Hydra's code for Half-Life, builds and runs on Linux, need to quickfix on win32 now - build system on Linux: some things are still hardcoded into the core, you need a different core - for Q3/RTCW or HL for now. do ./cons -- halflife to build HL mode (build trees are seperate) + for Q3/RTCW or HL for now. do ./cons -- halflife to build HL mode (build trees are separate) - there is no media / install procedure yet, but a zip with what you may need for install is available: http://zerowing.idsoftware.com/stuff/HL-media-0329.zip - cvs added all the new files @@ -5134,7 +5134,7 @@ END -- merging release-1_2_9 -> merge-post-1_2_10 into trunk - END - Fixed incorrect line numbers being reported when script files had // comments in them - Removed EClass_Create from the EClass manager _EClassManagerTable - - Replaced all occurences of "textures/radiant/notex" in shaders.cpp with a define. + - Replaced all occurrences of "textures/radiant/notex" in shaders.cpp with a define. - Fixed a crash in shaders.cpp when there was no default texture. - Fixed a possible issue with g_bCancel_Map_LoadFile - Added a crash fix for uninitialised patchMesh_t->pSymbiot @@ -5299,7 +5299,7 @@ END -- merging release-1_2_9 -> merge-post-1_2_10 into trunk - END +++ radiant/select.h 25 Mar 2002 11:39:27 -0000 - cleanup interface for entity selection-grouping/ungrouping utlities +++ radiant/undo.cpp 25 Mar 2002 11:39:29 -0000 - - removed workaround for wierd entity_clone behaviour (changed in entity module) + - removed workaround for weird entity_clone behaviour (changed in entity module) - avoid using Entity_FreeEpairs (not exposed by entity module) +++ radiant/xywindow.cpp 25 Mar 2002 11:39:35 -0000 - const fixes @@ -5565,7 +5565,7 @@ END -- merging release-1_2_9 -> merge-post-1_2_10 into trunk - END - http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=308 added preference to allow 'paint drag-select' brushes/faces in 3d camera view - http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=389 - added preference to strafe camera foward/back in 3d view while freelook is active + added preference to strafe camera forward/back in 3d view while freelook is active ETG & RR2DO2 - http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=388 @@ -5633,7 +5633,7 @@ END -- merging release-1_2_9 -> merge-post-1_2_10 into trunk - END New entity keys: - "_lightmapscale" key for brush entities (worldspawn, func_*). This lets a mapper scale the lightmap samplesize per-entity. For large constructions, 2.0 or 3.0 is a fine value, and keeps BSP size down and compile times low. For those areas you want to have high-detail shadows, make a func_group and use a value of 0.25 or so. It will scale the samplesize value for the surface's shader (default 16) or the -samplesize argument. - "modelscale" and "modelscale_vec" keys for misc_models (1.0 = default). This was for proper RTCW support and is available for Quake 3 maps as well. Lets you scale up map models in the world, getting around the MD3 size limitation. The next build of GtkRadiant has SPoG's code to support this in-editor so you can see what effect a scale has. - - Flare surfaces are now supressed from the BSP. They serve no purpose other than add to the vert & surfacecount in a BSP. These surfaces were created silently when a shader has "light 1" or "q3map_flareshader X." Use the new -flares switch when BSPing your map to have them emitted. + - Flare surfaces are now suppressed from the BSP. They serve no purpose other than add to the vert & surfacecount in a BSP. These surfaces were created silently when a shader has "light 1" or "q3map_flareshader X." Use the new -flares switch when BSPing your map to have them emitted. Changes: - GtkRadiant 1.2.4-nightly version increment. @@ -5737,7 +5737,7 @@ END -- merging release-1_2_9 -> merge-post-1_2_10 into trunk - END added modelscale key check to misc_model entity in md3/entity module added angle key check to eclassmodel class in md3/entity module fixed bugs in BP writing and reading in map module - TTimo (commited as SPoG) + TTimo (committed as SPoG) - fixing permissions on cvsreport and doxygen stuff, upgraded dot 23/1/2002 @@ -5940,7 +5940,7 @@ END -- merging release-1_2_9 -> merge-post-1_2_10 into trunk - END TTimo - merge gameselect branch back into trunk the IS setup scripts have been updated for the new paths layout - developement environment needs to be updated to copy binaries to the right places for debug + development environment needs to be updated to copy binaries to the right places for debug it is recommended to run a 1.2.1 setup on win32 prior to compile and install debug bins - updated the setup to be more templated for inclusion/non inclusion of game packs on demand @@ -6102,7 +6102,7 @@ END -- merging release-1_2_9 -> merge-post-1_2_10 into trunk - END since we check for .pid even before we know where the GameTools path is on linux, we need to sanitize the ~/.q3a dir usage. Switch to ~/.radiant, use the version tag - to maintain things independant, and use the game name to isolate per-game settings? + to maintain things independent, and use the game name to isolate per-game settings? ~/.radiant/1.2.0-nightly/quake3/radiant.ini (.pid, .log) ~/.radiant/1.2.0-nightly/wolf/.. @@ -6116,7 +6116,7 @@ END -- merging release-1_2_9 -> merge-post-1_2_10 into trunk - END - replaced setup/win32/setup.sh by setup/win32/setup.pl same functionality level + abiliy to generate back a template from a work version - major rework on the IS scripts, basics of multiple games support installer - clean seperation between editor core and game pack + clean separation between editor core and game pack design doc and analysis of custom setup generation, setup script UI requierements see setup/win32/TODO for more details @@ -6459,14 +6459,14 @@ END -- merging release-1_2_9 -> merge-post-1_2_10 into trunk - END 10/09/2001 TTimo - - patched contrib plugins, using seperate build scheme + - patched contrib plugins, using separate build scheme - fixed textool issues, compiles again 09/09/2001 TTimo - sub-menu cascading http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=178 - - udpated the Q3Radiant manual with some new GtkRadiant stuff + - updated the Q3Radiant manual with some new GtkRadiant stuff - updated the FAQ with 1.1.1 known issues Gef - http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=174 @@ -6664,7 +6664,7 @@ END -- merging release-1_2_9 -> merge-post-1_2_10 into trunk - END around 15/08/2001 TTimo quakecon fixes: switched to long filenames in project and misc_model dialogs, - removed all occurences of win32 conversion to old 8.3 filenames + removed all occurrences of win32 conversion to old 8.3 filenames NOTE: this might raise some bugs and issues, but it's the way to go for the future, already fixes more issues than it creates @@ -6787,7 +6787,7 @@ around 15/08/2001 30/05/2001 TTimo - - added libxml2 as an external dependency. libxml2 should be installed as a seperate + - added libxml2 as an external dependency. libxml2 should be installed as a separate directory on win32. dynamic linking now instead of static previously. - cleaned up q3map win32 project file, removed opengl dependency (the drawflag command line is inoperant now .. I don't think it was used anyway?) @@ -6865,12 +6865,12 @@ around 15/08/2001 - STL in GtkRadiant or a plugin must now use STLPort a custom configured version of STLPort is available at http://zerowing.idsoftware.com/STLPort still need to write some guidelines about it - bascially, we are using STL: iostreams disabled, no namespace, no threading, no exceptions + basically, we are using STL: iostreams disabled, no namespace, no threading, no exceptions 30/05/2001 TTimo - - removed libxml2 from tree, use a seperate libxml2/ directory next to GtkRadiant/ for win32 - libxml2 will be distributed seperately as an archive based on official release (same as win32 Gtk SDK) + - removed libxml2 from tree, use a separate libxml2/ directory next to GtkRadiant/ for win32 + libxml2 will be distributed separately as an archive based on official release (same as win32 Gtk SDK) (check on zerowing for the latest archive) libxml2 is now used as dynamic shared object on win32, makes sense since many module will rely on it - cleaned q3map, removed GL dependencies @@ -7991,7 +7991,7 @@ around 15/08/2001 14/08/2000 TTimo - using profile.cpp code to read shortcut keys files - moved DevDocs/changelog.txt to data/changelog.txt - (data/ should be used for user-side stuff and DevDocs/ for developpers) + (data/ should be used for user-side stuff and DevDocs/ for developers) - added data/quickstart.txt with a beginning of info about the main differences between Q3Radiant 202 and GtkRadiant. to be used as a doc later. diff --git a/TODO b/TODO index 60573df1..5eaab5c9 100644 --- a/TODO +++ b/TODO @@ -20,7 +20,7 @@ FEATURES - paint-select or equivalent (e.g. area-selection with occlusion) - select-complete-tall or equivalent (e.g. subtract-from-selection modifier key) -- texture pane names are often illegible, becuase 1. they are long and overlap each other and 2. they overlap the outline rectangles around the images themselves. +- texture pane names are often illegible, because 1. they are long and overlap each other and 2. they overlap the outline rectangles around the images themselves. Build: document build-menu xml format. diff --git a/contrib/bkgrnd2d/dialog.cpp b/contrib/bkgrnd2d/dialog.cpp index 086f2560..23612197 100644 --- a/contrib/bkgrnd2d/dialog.cpp +++ b/contrib/bkgrnd2d/dialog.cpp @@ -250,7 +250,7 @@ CBackgroundDialogPage::CBackgroundDialogPage( VIEWTYPE vt ){ g_signal_connect( G_OBJECT( w ), "value-changed", G_CALLBACK( alpha_adjust_callback ), ( gpointer ) this ); gtk_box_pack_start( GTK_BOX( hbox ),w, TRUE, TRUE, 5 ); - gtk_widget_set_tooltip_text( w, "Set image transparancy" ); + gtk_widget_set_tooltip_text( w, "Set image transparency" ); gtk_widget_show( w ); gtk_widget_show( hbox ); diff --git a/contrib/bkgrnd2d/readme_bkgrnd2d-b0.25.txt b/contrib/bkgrnd2d/readme_bkgrnd2d-b0.25.txt index c1e401c7..2da7419d 100644 --- a/contrib/bkgrnd2d/readme_bkgrnd2d-b0.25.txt +++ b/contrib/bkgrnd2d/readme_bkgrnd2d-b0.25.txt @@ -56,7 +56,7 @@ Usage: - Use the toggle buttons to show or hide the loaded images. The buttons will press or unpress whenever you click them, but an image will only be - displayed once you have successfully loaded a file and set its size/postion. + displayed once you have successfully loaded a file and set its size/position. - Set the opacity of the image using the slider in the configuration dialog. @@ -117,7 +117,7 @@ TODO: - render under the grid instead of blending - mac/*nix support - remember/save/restore settings -- texture options independant of radiant prefs +- texture options independent of radiant prefs - clean up icky code Changes from 0.1 diff --git a/contrib/bobtoolz/funchandlers-GTK.cpp b/contrib/bobtoolz/funchandlers-GTK.cpp index 84eb94eb..1340b887 100644 --- a/contrib/bobtoolz/funchandlers-GTK.cpp +++ b/contrib/bobtoolz/funchandlers-GTK.cpp @@ -384,7 +384,7 @@ void DoPathPlotter(){ if ( entity != 0 ) DBobView_setEntity( *entity, rs.fMultiplier, rs.nPoints, rs.fGravity, rs.bNoUpdate, rs.bShowExtra ); else - globalErrorStream() << "bobToolz PathPlotter: No trigger_push entitity selected, select 1 only (Use list to select it).\n"; + globalErrorStream() << "bobToolz PathPlotter: No trigger_push entity selected, select 1 only (Use list to select it).\n"; return; } diff --git a/contrib/bobtoolz/txt/changelog.txt b/contrib/bobtoolz/txt/changelog.txt index 777dc775..b46744c1 100644 --- a/contrib/bobtoolz/txt/changelog.txt +++ b/contrib/bobtoolz/txt/changelog.txt @@ -10,7 +10,7 @@ Added: (16.05.01) Impemented a little feature that highligths the q3map bug that is causing problems for autocaulk, (see readme) (01.04.01) - Added DPatch class to implement patches, however radiant does not (currently) support adding patches to an entity via a plugin, so, its actually redundant atm, i was adding this to fix the patches being removed from entities probelm with dealing with entities outside of the worldspawn. + Added DPatch class to implement patches, however radiant does not (currently) support adding patches to an entity via a plugin, so, its actually redundant atm, i was adding this to fix the patches being removed from entities problem with dealing with entities outside of the worldspawn. Changes: (02.04.01) diff --git a/contrib/bobtoolz/visfind.cpp b/contrib/bobtoolz/visfind.cpp index 6d1cd7a2..11ee3c05 100644 --- a/contrib/bobtoolz/visfind.cpp +++ b/contrib/bobtoolz/visfind.cpp @@ -1,4 +1,4 @@ -// Requries parts of the q3 tools source to compile +// Requires parts of the q3 tools source to compile // Date: Oct 5, 2001 // Written by: Brad Whitehead (whiteheb@gamerstv.net) diff --git a/contrib/camera/funchandlers.cpp b/contrib/camera/funchandlers.cpp index 4134a889..182efcd2 100644 --- a/contrib/camera/funchandlers.cpp +++ b/contrib/camera/funchandlers.cpp @@ -137,7 +137,7 @@ void DoLoadCamera(){ else { char error[PATH_MAX + 64]; FreeCam( cam ); - sprintf( error, "An error occured during the loading of \'%s\'", fullpathtofile ); + sprintf( error, "An error occurred during the loading of \'%s\'", fullpathtofile ); g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, error, "Load error", eMB_OK ); } diff --git a/contrib/meshtex/Doxyfile b/contrib/meshtex/Doxyfile index 2ca3c818..8186a059 100644 --- a/contrib/meshtex/Doxyfile +++ b/contrib/meshtex/Doxyfile @@ -1661,7 +1661,7 @@ UML_LOOK = NO # the class node. If there are many fields or methods and many nodes the # graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS # threshold limits the number of items for each type to make the size more -# managable. Set this to 0 for no limit. Note that the threshold may be +# manageable. Set this to 0 for no limit. Note that the threshold may be # exceeded by 50% before the limit is enforced. UML_LIMIT_NUM_FIELDS = 10 diff --git a/contrib/meshtex/GenericDialog.cpp b/contrib/meshtex/GenericDialog.cpp index ce62b2b9..e4716b5d 100644 --- a/contrib/meshtex/GenericDialog.cpp +++ b/contrib/meshtex/GenericDialog.cpp @@ -146,7 +146,7 @@ GenericDialog::Hide() } /** - * Default handler for Apply logic. This method should be overriden by + * Default handler for Apply logic. This method should be overridden by * subclass implementations that need to execute some logic when OK or Apply * is clicked. The return value should be the success of that logic. A * successful OK will cause the window to be hidden. diff --git a/contrib/meshtex/PluginModule.cpp b/contrib/meshtex/PluginModule.cpp index 6a2032e3..cbcfa728 100644 --- a/contrib/meshtex/PluginModule.cpp +++ b/contrib/meshtex/PluginModule.cpp @@ -130,9 +130,9 @@ PluginModule::QERPluginGetCommandTitleList() * Invoke a plugin command. * * @param command The command token. - * @param vMin 3-element float vector definining min corner of + * @param vMin 3-element float vector defining min corner of * selection. - * @param vMax 3-element float vector definining max corner of + * @param vMax 3-element float vector defining max corner of * selection. * @param bSingleBrush Dummy arg; ignored. */ diff --git a/contrib/prtview/PrtView.txt b/contrib/prtview/PrtView.txt index 50228e02..039185f4 100644 --- a/contrib/prtview/PrtView.txt +++ b/contrib/prtview/PrtView.txt @@ -1,6 +1,6 @@ Put PrtView.dll in the Q3Radiant plugins directory. -This program is pretty self explanitary, but point needs to +This program is pretty self explanatory, but point needs to be mentioned. In the configuration menu for 3D view options, the lines and polygons flags are tri-state. In the third state, the lines or polygons will only be drawn if the have the diff --git a/contrib/sunplug/sunplug.cpp b/contrib/sunplug/sunplug.cpp index 92dba42e..3a9fea94 100644 --- a/contrib/sunplug/sunplug.cpp +++ b/contrib/sunplug/sunplug.cpp @@ -363,8 +363,8 @@ void MapCoordinator(){ globalOutputStream() << "SunPlug: calculating optimal coordinates\n"; // write to console that we are calculating the coordinates GetOptimalCoordinates( &levelBoundingBox ); // calculate optimal mapcoords with the dimensions of the level bounding box - globalOutputStream() << "SunPlug: adviced mapcoordsmins=" << minX << " " << maxY << "\n"; // console info about mapcoordsmins - globalOutputStream() << "SunPlug: adviced mapcoordsmaxs=" << maxX << " " << minY << "\n"; // console info about mapcoordsmaxs + globalOutputStream() << "SunPlug: advised mapcoordsmins=" << minX << " " << maxY << "\n"; // console info about mapcoordsmins + globalOutputStream() << "SunPlug: advised mapcoordsmaxs=" << maxX << " " << minY << "\n"; // console info about mapcoordsmaxs spinner_adj_MinX = (GtkAdjustment *)gtk_adjustment_new( map_minX, -65536.0, 65536.0, 1.0, 5.0, 0 ); // create adjustment for value and range of minimum x value spinner_adj_MinY = (GtkAdjustment *)gtk_adjustment_new( map_minY, -65536.0, 65536.0, 1.0, 5.0, 0 ); // create adjustment for value and range of minimum y value diff --git a/docs/fsr_readme.txt b/docs/fsr_readme.txt index d3856fd2..5adda7ab 100644 --- a/docs/fsr_readme.txt +++ b/docs/fsr_readme.txt @@ -97,7 +97,7 @@ Actually deluxemaps being converted to tangentspace in StoreLigtmaps phase. "-de - added "EmitMetaStats" printing in the end of BSP stage to show full meta statistics, not only for world. So all "_patchMeta 1" surfaces will be in it. -- added gametype-controlled structure fields for "-deluxe", "-subdivisions", "-nostyles", "-patchshadows". New "dq" (deluxequake), "prophecy" and "darkplaces" games uses them. Additionaly added "-nodeluxe", "-nopatchshadows", "-styles" to negate positive defaults. +- added gametype-controlled structure fields for "-deluxe", "-subdivisions", "-nostyles", "-patchshadows". New "dq" (deluxequake), "prophecy" and "darkplaces" games uses them. Additionally added "-nodeluxe", "-nopatchshadows", "-styles" to negate positive defaults. - Floodligting code is changed to handle custom surfaces. And "q3map_floodlight " shader keyword was added. Per-surfaces floodlight code does not intersect with global floodlight done by -floodlight of _floodlight worldspawn key, their effects get summarized. This is good way to light up surfacelight surfaces, such as water. diff --git a/docs/mbspc.html b/docs/mbspc.html index c8b0df25..1b0dc6fc 100644 --- a/docs/mbspc.html +++ b/docs/mbspc.html @@ -205,7 +205,7 @@ Several map bugs can cause these 'solid' places in the AAS file. snapping in the q3map tool those tiny brush faces can be snapped out of existence. Such faces will not show up in Quake3 and you'll see tiny peek holes or slits where you can view through the geometry. - Allign vertexes of and edges of adjacent brushes to remove and avoid + Align vertexes of and edges of adjacent brushes to remove and avoid such tiny faces. Placing a clip brush in front of the face that is snapped out of existence will also remove the 'solid' area but ofcourse it's much better to remove the peek holes and slits. diff --git a/docs/shaderManual/general-directives.html b/docs/shaderManual/general-directives.html index 63beb882..c5c6540b 100644 --- a/docs/shaderManual/general-directives.html +++ b/docs/shaderManual/general-directives.html @@ -172,7 +172,7 @@ textures/skies/xtoxicsky_dm9

Surfaces rendered with the polygonOffset keyword are rendered slightly off the polygon's surface. This is typically used for wall markings and "decals." The distance between the offset and the polygon is fixed. It is not a variable in Quake III Arena.

Design Notes:

-

Use this for wall or floor markings, particularily for direction arrows for team games. Texture the brush with the decal shader on one face and the other faces with a nodraw shader. Then place the brush flush with the surface of the wall or floor.

+

Use this for wall or floor markings, particularly for direction arrows for team games. Texture the brush with the decal shader on one face and the other faces with a nodraw shader. Then place the brush flush with the surface of the wall or floor.

When using a _decal entity for texture projection, polygonOffset must be used to prevent Z-fighting. If you experience problems with depth sorting, try using sort 6.

diff --git a/docs/shaderManual/q3map-surface-parameter-directives.html b/docs/shaderManual/q3map-surface-parameter-directives.html index d2b36832..78978c0a 100644 --- a/docs/shaderManual/q3map-surface-parameter-directives.html +++ b/docs/shaderManual/q3map-surface-parameter-directives.html @@ -93,7 +93,7 @@

Read as "do not enter". Like clusterportal, this is a bot-only property. A brush marked with donotenter will not affect non-bot players, but bots will not enter it. It should be used only when bots appear to have difficulty navigating around some map features. This does not physically stop the bot from entering a region (as with botclip). Bots will not enter the area on their own but may, for example, be blasted into the region with a rocket launcher. This keyword is found in "common/donotenter" so you shouldn't need to specify this.

Design Notes:

-

donotenter can be (sparingly) used in space maps around the void or around lava/slime in certain places where bots have an overwhelming tendancy to commit suicide (lemming style).

+

donotenter can be (sparingly) used in space maps around the void or around lava/slime in certain places where bots have an overwhelming tendency to commit suicide (lemming style).

surfaceparm dust

diff --git a/include/igl.h b/include/igl.h index 0f1f705c..1595ee3c 100644 --- a/include/igl.h +++ b/include/igl.h @@ -2088,7 +2088,7 @@ typedef unsigned int GLhandleARB; #include "gtkutil/glfont.h" /// \brief A module which wraps a runtime-binding of the standard OpenGL functions. -/// Provides convenience functions for querying availabiliy of extensions, rendering text and error-checking. +/// Provides convenience functions for querying availability of extensions, rendering text and error-checking. struct OpenGLBinding { INTEGER_CONSTANT( Version, 2 ); diff --git a/libs/gtkutil/glfont.cpp b/libs/gtkutil/glfont.cpp index 0bc357ff..cded7574 100644 --- a/libs/gtkutil/glfont.cpp +++ b/libs/gtkutil/glfont.cpp @@ -364,7 +364,7 @@ public: - //Now we just setup some texture paramaters. + //Now we just setup some texture parameters. glBindTexture( GL_TEXTURE_2D, tex ); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); @@ -791,7 +791,7 @@ GLFont *glfont_create( const char* font_string ){ glPixelStorei( GL_UNPACK_ALIGNMENT, 1 ); glGenTextures( 1, &atlas ); - //Now we just setup some texture paramaters. + //Now we just setup some texture parameters. glBindTexture( GL_TEXTURE_2D, atlas ); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE ); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE ); diff --git a/libs/gtkutil/window.h b/libs/gtkutil/window.h index 4425b826..eccffe09 100644 --- a/libs/gtkutil/window.h +++ b/libs/gtkutil/window.h @@ -131,7 +131,7 @@ public: } /** need to reapply pos on every hiding to keep wnd pos after hide+show (flickering between two positions, if doing on showing) - this stuff is weird: some wnds, like entity list, keep pos on hide/show... untill you resize them -) + this stuff is weird: some wnds, like entity list, keep pos on hide/show... until you resize them -) some, like floating xy/cam/groupdialog do not; if you remove glwidget from floating xy - it does xD if you gtk_window_set_position( window, GTK_WIN_POS_CENTER_ALWAYS ), they do keep it, except of random centering after resizing (ms windows) but this option doesn't sound healthy; diff --git a/libs/l_net/l_net.c b/libs/l_net/l_net.c index 1bcb2456..311a93ed 100644 --- a/libs/l_net/l_net.c +++ b/libs/l_net/l_net.c @@ -104,7 +104,7 @@ int Net_Send( socket_t *sock, netmessage_t *msg ){ return WINS_Write( sock->socket, msg->data, msg->size, NULL ); } //end of the function Net_SendSocketReliable //=========================================================================== -// returns the number of bytes recieved +// returns the number of bytes received // -1 on error // // Parameter: - diff --git a/libs/l_net/l_net_berkley.c b/libs/l_net/l_net_berkley.c index a0fc4bba..f2018ae9 100644 --- a/libs/l_net/l_net_berkley.c +++ b/libs/l_net/l_net_berkley.c @@ -91,7 +91,7 @@ static unsigned long myAddr; ERROR_STRUCT errlist[] = { {EACCES,"EACCES - The address is protected, user is not root"}, - {EAGAIN,"EAGAIN - Operation on non-blocking socket that cannot return immediatly"}, + {EAGAIN,"EAGAIN - Operation on non-blocking socket that cannot return immediately"}, {EBADF, "EBADF - sockfd is not a valid descriptor"}, {EFAULT, "EFAULT - The parameter is not in a writable part of the user address space"}, {EINVAL,"EINVAL - The socket is already bound to an address"}, diff --git a/libs/mathlib/bbox.c b/libs/mathlib/bbox.c index fc9c1e33..8aa4fed4 100644 --- a/libs/mathlib/bbox.c +++ b/libs/mathlib/bbox.c @@ -183,7 +183,7 @@ int aabb_intersect_ray( const aabb_t *aabb, const ray_t *ray, vec3_t intersectio const float *direction = ray->direction; /* Find candidate planes; this loop can be avoided if - rays cast all from the eye(assume perpsective view) */ + rays cast all from the eye(assume perspective view) */ for ( i = 0; i < NUMDIM; i++ ) { if ( origin[i] < ( aabb->origin[i] - aabb->extents[i] ) ) { diff --git a/libs/mathlib/mathlib.c b/libs/mathlib/mathlib.c index 9acb3b34..e88d9b54 100644 --- a/libs/mathlib/mathlib.c +++ b/libs/mathlib/mathlib.c @@ -473,7 +473,7 @@ void NormalToLatLong( const vec3_t normal, byte bytes[2] ) { b &= 0xff; bytes[0] = b; // longitude - bytes[1] = a; // lattitude + bytes[1] = a; // latitude } } diff --git a/libs/picomodel/pm_3ds.c b/libs/picomodel/pm_3ds.c index df9e59a9..5d509f0d 100644 --- a/libs/picomodel/pm_3ds.c +++ b/libs/picomodel/pm_3ds.c @@ -299,7 +299,7 @@ static int GetMeshVertices( T3dsLoaderPers *pers ){ printf( "Vertex: x: %f y: %f z: %f\n",v[0],v[1],v[2] ); #endif } - /* success (no errors occured) */ + /* success (no errors occurred) */ return 1; } @@ -334,7 +334,7 @@ static int GetMeshFaces( T3dsLoaderPers *pers ){ printf( "Face: a: %d b: %d c: %d (%d)\n",face.a,face.b,face.c,face.visible ); #endif } - /* success (no errors occured) */ + /* success (no errors occurred) */ return 1; } @@ -367,7 +367,7 @@ static int GetMeshTexCoords( T3dsLoaderPers *pers ){ printf( "u: %f v: %f\n",uv[0],uv[1] ); #endif } - /* success (no errors occured) */ + /* success (no errors occurred) */ return 1; } @@ -460,7 +460,7 @@ static int GetMeshShader( T3dsLoaderPers *pers ){ { GetWord( pers ); } - /* success (no errors occured) */ + /* success (no errors occurred) */ return 1; } @@ -483,7 +483,7 @@ static int GetDiffuseColor( T3dsLoaderPers *pers ){ #ifdef DEBUG_PM_3DS printf( "GetDiffuseColor: %d %d %d\n",color[0],color[1],color[2] ); #endif - /* success (no errors occured) */ + /* success (no errors occurred) */ return 1; } @@ -729,7 +729,7 @@ static picoModel_t *_3ds_load( PM_PARAMS_LOAD ){ strncpy( basename, _pico_nopath( fileName ), sizeof( basename ) - 1 ); _pico_setfext( basename, NULL ); - /* initialize persistant vars (formerly static) */ + /* initialize persistent vars (formerly static) */ pers.model = model; pers.bufptr = (picoByte_t *)_pico_alloc( bufSize ); memcpy( pers.bufptr, buffer, bufSize ); diff --git a/libs/quickhull/Tests/QuickHullTests.cpp b/libs/quickhull/Tests/QuickHullTests.cpp index 758a4f60..3c52854b 100644 --- a/libs/quickhull/Tests/QuickHullTests.cpp +++ b/libs/quickhull/Tests/QuickHullTests.cpp @@ -272,7 +272,7 @@ namespace quickhull { sphereTest(); testVector3(); testHalfEdgeOutput(); - std::cout << "QuickHull tests succesfully passed." << std::endl; + std::cout << "QuickHull tests successfully passed." << std::endl; } } diff --git a/libs/script/scripttokeniser.h b/libs/script/scripttokeniser.h index a086af25..520f5973 100644 --- a/libs/script/scripttokeniser.h +++ b/libs/script/scripttokeniser.h @@ -217,7 +217,7 @@ class ScriptTokeniser final : public Tokeniser pop(); if ( state() == Tokenise( &ScriptTokeniser::tokeniseToken ) ) { pop(); - m_emit = true; // emit token immediatly preceding comment + m_emit = true; // emit token immediately preceding comment } } return true; @@ -236,7 +236,7 @@ class ScriptTokeniser final : public Tokeniser pop(); if ( state() == Tokenise( &ScriptTokeniser::tokeniseToken ) ) { pop(); - m_emit = true; // emit token immediatly preceding comment + m_emit = true; // emit token immediately preceding comment } break; // dont emit comment case '*': diff --git a/libs/splines/q_shared.h b/libs/splines/q_shared.h index 6cad80bc..f1a76120 100644 --- a/libs/splines/q_shared.h +++ b/libs/splines/q_shared.h @@ -23,7 +23,7 @@ #define __Q_SHARED_H // q_shared.h -- included first by ALL program modules. -// these are the definitions that have no dependance on +// these are the definitions that have no dependence on // central system services, and can be used by any part // of the program without any state issues. @@ -262,7 +262,7 @@ typedef enum { #define MAX_NAME_LENGTH 32 // max length of a client name -// paramters for command buffer stuffing +// parameters for command buffer stuffing typedef enum { EXEC_NOW, // don't return until completed, a VM should NEVER use this, // because some commands might cause the VM to be unloaded... diff --git a/libs/splines/splines.cpp b/libs/splines/splines.cpp index 7e9eaa6c..1c561863 100644 --- a/libs/splines/splines.cpp +++ b/libs/splines/splines.cpp @@ -746,7 +746,7 @@ void idCameraDef::buildCamera() { newTotal /= count; int additive = newTotal; - // now propogate that difference out to each segment + // now propagate that difference out to each segment for (j = index; j < cameraSpline.numSegments(); j++) { cameraSpline.addSegmentTime(j, additive); additive += newTotal; @@ -1048,7 +1048,7 @@ const idVec3 *idInterpolatedPosition::getPosition( long t ) { percent = 0.0; } - // the following line does a straigt calc on percentage of time + // the following line does a straight calc on percentage of time // float percent = (float)(startTime + time - t) / time; idVec3 v1 = startPos; diff --git a/libs/splines/util_str.cpp b/libs/splines/util_str.cpp index af66bd9b..067d1760 100644 --- a/libs/splines/util_str.cpp +++ b/libs/splines/util_str.cpp @@ -464,7 +464,7 @@ void idStr::snprintf TestStringClass This is a fairly rigorous test of the idStr class's functionality. - Because of the fairly global and subtle ramifications of a bug occuring + Because of the fairly global and subtle ramifications of a bug occurring in this class, it should be run after any changes to the class. Add more tests as functionality is changed. Tests should include any possible bounds violation and NULL data tests. diff --git a/libs/xml/xmltextags.cpp b/libs/xml/xmltextags.cpp index d795c119..9f4da217 100644 --- a/libs/xml/xmltextags.cpp +++ b/libs/xml/xmltextags.cpp @@ -364,7 +364,7 @@ bool XmlTagBuilder::AddShaderTag( const char* shader, const char* content, NodeT int XmlTagBuilder::RenameShaderTag( const char* oldtag, CopiedString newtag ){ /* Replaces tag node contents - char* oldtag - the node content that sould be changed + char* oldtag - the node content that should be changed char* newtag - the new node content returns the number of renamed shaders diff --git a/plugins/md3model/md5.cpp b/plugins/md3model/md5.cpp index 61e06ddc..358296d8 100644 --- a/plugins/md3model/md5.cpp +++ b/plugins/md3model/md5.cpp @@ -180,7 +180,7 @@ bool MD5Anim_parse( Tokeniser& tokeniser ){ MD5_RETURN_FALSE_IF_FAIL( MD5_parseSize( tokeniser, numAnimatedComponents ) ); tokeniser.nextLine(); - // parse heirarchy + // parse hierarchy MD5_RETURN_FALSE_IF_FAIL( MD5_parseToken( tokeniser, "hierarchy" ) ); MD5_RETURN_FALSE_IF_FAIL( MD5_parseToken( tokeniser, "{" ) ); tokeniser.nextLine(); diff --git a/plugins/shaders/shaders.cpp b/plugins/shaders/shaders.cpp index 299bc6bb..c358fd48 100644 --- a/plugins/shaders/shaders.cpp +++ b/plugins/shaders/shaders.cpp @@ -1520,7 +1520,7 @@ GSList* Shaders_getShaderFileList(){ /* ================== DumpUnreferencedShaders - usefull function: dumps the list of .shader files that are not referenced to the console + useful function: dumps the list of .shader files that are not referenced to the console ================== */ void IfFound_dumpUnreferencedShader( bool& bFound, const char* filename ){ diff --git a/plugins/spritemodel/plugin.cpp b/plugins/spritemodel/plugin.cpp index 536c59b7..d0c195b7 100644 --- a/plugins/spritemodel/plugin.cpp +++ b/plugins/spritemodel/plugin.cpp @@ -43,7 +43,7 @@ Implemented as a model module, without any ISelect stuff. - For an entity to use an image (instead of a model) you just update the entity defintion file so that the eclass_t's modelpath is filled in with a relative path and filename of an image file. + For an entity to use an image (instead of a model) you just update the entity definition file so that the eclass_t's modelpath is filled in with a relative path and filename of an image file. e.g: @@ -73,7 +73,7 @@ =============== v0.1 - 27/May/2002 - - Created an inital implementation of a sprite model plugin. + - Created an initial implementation of a sprite model plugin. According to the powers that be, it seems creating a model plugin is hackish. It works ok, but there is no way to attach models (sprites if you will) diff --git a/plugins/textool/TexTool.cpp b/plugins/textool/TexTool.cpp index 70e6b680..bc199dec 100644 --- a/plugins/textool/TexTool.cpp +++ b/plugins/textool/TexTool.cpp @@ -188,7 +188,7 @@ _QERFaceData g_SelectedFaceData; // g_pSelectedFaceWindings gets allocated with MAX_POINTS_ON_WINDING at plugin startup ( QERPlug_Init ) winding_t *g_pSelectedFaceWinding = NULL; const float g_ViewportRatio = 1.2f; -// usefull class to manage the 2D view +// useful class to manage the 2D view C2DView g_2DView; // control points to move the polygon CControlPointsManagerBFace g_ControlPointsBFace; diff --git a/plugins/textool/changelog.txt b/plugins/textool/changelog.txt index 9d660cbc..9f54c8e5 100644 --- a/plugins/textool/changelog.txt +++ b/plugins/textool/changelog.txt @@ -5,4 +5,4 @@ here is the TODO-list for next release, ( most certainly a wish list ) - TODO: add hooks with the selected face and selected patch data. tell the plugin when selected face or selected patch has changed. the hooks should use a generic interface inside Radiant for "observers" -- TODO: add other usefull texturing tools, if designers come up with good ideas \ No newline at end of file +- TODO: add other useful texturing tools, if designers come up with good ideas \ No newline at end of file diff --git a/radiant/brush.h b/radiant/brush.h index d351d898..da4733b6 100644 --- a/radiant/brush.h +++ b/radiant/brush.h @@ -528,12 +528,12 @@ public: } void addScale(){ - ASSERT_MESSAGE( !m_scaleApplied, "texture scale aready added" ); + ASSERT_MESSAGE( !m_scaleApplied, "texture scale already added" ); m_scaleApplied = true; m_projection.m_brushprimit_texdef.addScale( m_shader.width(), m_shader.height() ); } void removeScale(){ - ASSERT_MESSAGE( m_scaleApplied, "texture scale aready removed" ); + ASSERT_MESSAGE( m_scaleApplied, "texture scale already removed" ); m_scaleApplied = false; m_projection.m_brushprimit_texdef.removeScale( m_shader.width(), m_shader.height() ); } diff --git a/radiant/brush_primit.cpp b/radiant/brush_primit.cpp index 3ab13194..b0744558 100644 --- a/radiant/brush_primit.cpp +++ b/radiant/brush_primit.cpp @@ -798,7 +798,7 @@ void BrushPrimitFaceToFace( face_t *face ){ // the general algorithm is the same for both lockings, it's only the geometric transformation part that changes // so I wanted to keep it in a single function // if there are more linear transformations that need the locking, going to a C++ or code pointer solution would be best -// (but right now I want to keep brush_primit.cpp striclty C) +// (but right now I want to keep brush_primit.cpp strictly C) bool txlock_bRotation; @@ -819,7 +819,7 @@ void TextureLockTransformation_BrushPrimit( face_t *f ){ Vector3 rOrig,rvecS,rvecT; // geometric transformation of (0,0) (1,0) (0,1) { initial plane axis base } Vector3 rNormal,rtexS,rtexT; // axis base for the transformed plane - Vector3 lOrig,lvecS,lvecT; // [2] are not used ( but usefull for debugging ) + Vector3 lOrig,lvecS,lvecT; // [2] are not used ( but useful for debugging ) Vector3 M[3]; float det; Vector3 D[2]; @@ -831,7 +831,7 @@ void TextureLockTransformation_BrushPrimit( face_t *f ){ // compute coordinates of (0,0) (1,0) (0,1) ( expressed in initial plane axis base ) after transformation // (0,0) (1,0) (0,1) ( expressed in initial plane axis base ) <-> (0,0,0) texS texT ( expressed world axis base ) // input: Orig, texS, texT (and the global locking params) - // ouput: rOrig, rvecS, rvecT, rNormal + // output: rOrig, rvecS, rvecT, rNormal if ( txlock_bRotation ) { // rotation vector VectorSet( vRotate, 0.0f, 0.0f, 0.0f ); diff --git a/radiant/console.cpp b/radiant/console.cpp index 00a13a60..58f9ec96 100644 --- a/radiant/console.cpp +++ b/radiant/console.cpp @@ -220,7 +220,7 @@ std::size_t Sys_Print( int level, const char* buf, std::size_t length ){ } } - // update console widget immediatly if we're doing something time-consuming + // update console widget immediately if we're doing something time-consuming if ( contains_newline ) { gtk_text_view_scroll_mark_onscreen( GTK_TEXT_VIEW( g_console ), end ); diff --git a/radiant/error.cpp b/radiant/error.cpp index c5c3adf9..d6a5112e 100644 --- a/radiant/error.cpp +++ b/radiant/error.cpp @@ -124,7 +124,7 @@ void Error( const char *error, ... ){ } #endif - strcat( text, "An unrecoverable error has occured.\n" ); + strcat( text, "An unrecoverable error has occurred.\n" ); ERROR_MESSAGE( text ); diff --git a/radiant/gtkdlgs.cpp b/radiant/gtkdlgs.cpp index c38060ec..6dabccf1 100644 --- a/radiant/gtkdlgs.cpp +++ b/radiant/gtkdlgs.cpp @@ -705,7 +705,7 @@ EMessageBoxReturn DoTextureLayout( float *fx, float *fy ){ sprintf( buf, "%f", last_used_texture_layout_scale_y ); gtk_entry_set_text( y, buf ); - // Set focus after intializing the values + // Set focus after initializing the values gtk_widget_grab_focus( GTK_WIDGET( x ) ); EMessageBoxReturn ret = modal_dialog_show( window, dialog ); diff --git a/radiant/map.cpp b/radiant/map.cpp index 6093232c..97cdae84 100644 --- a/radiant/map.cpp +++ b/radiant/map.cpp @@ -2362,7 +2362,7 @@ void map_autocaulk_selected(){ TextFileOutputStream file( filename.c_str() ); if ( file.failed() ) { - globalErrorStream() << "writting " << filename.c_str() << " failure\n"; + globalErrorStream() << "writing " << filename.c_str() << " failure\n"; return; } diff --git a/radiant/modelwindow.cpp b/radiant/modelwindow.cpp index 3b1689ed..f08c5d32 100644 --- a/radiant/modelwindow.cpp +++ b/radiant/modelwindow.cpp @@ -1010,7 +1010,7 @@ gboolean ModelBrowser_button_press( GtkWidget* widget, GdkEventButton* event, Mo else if ( event->type == GDK_2BUTTON_PRESS && event->button == 1 && modelBrowser->m_currentFolder != nullptr && modelBrowser->m_currentModelId >= 0 ) { UndoableCommand undo( "insertModel" ); // todo - // GlobalEntityClassManager() seach for "misc_model" + // GlobalEntityClassManager() search for "misc_model" // otherwise search for entityClass->miscmodel_is // otherwise go with GlobalEntityClassManager().findOrInsert( "misc_model", false ); EntityClass* entityClass = GlobalEntityClassManager().findOrInsert( "misc_model", false ); diff --git a/radiant/pluginmenu.cpp b/radiant/pluginmenu.cpp index 68bf1a54..440a0107 100644 --- a/radiant/pluginmenu.cpp +++ b/radiant/pluginmenu.cpp @@ -135,7 +135,7 @@ GtkMenuItem* create_plugins_menu(){ #if 0 create_menu_item_with_mnemonic( menu, "Refresh", FreeCaller() ); - // NOTE: the seperator is used when doing a refresh of the list, everything past the seperator is removed + // NOTE: the separator is used when doing a refresh of the list, everything past the separator is removed g_plugins_menu_separator = menu_separator( menu ); #endif diff --git a/radiant/preferences.h b/radiant/preferences.h index 3242b787..5f143cae 100644 --- a/radiant/preferences.h +++ b/radiant/preferences.h @@ -178,7 +178,7 @@ inline R LatchedImportCaller( LatchedValue& latchedValue ){ support for a new game) what we do now is fully generate the information for this during the setup. We might want to - generate a piece that just says "the game pack is there", but put the rest of the config somwhere + generate a piece that just says "the game pack is there", but put the rest of the config somewhere else (i.e. not generated, copied over during setup .. for instance in the game tools directory) */ class CGameDescription @@ -268,7 +268,7 @@ public: void AddPacksURL( StringOutputStream &s ); /*! - intialize the game dialog, called at CPrefsDlg::Init + initialize the game dialog, called at CPrefsDlg::Init will scan for games, load prefs, and do game selection dialog if needed */ void Init(); diff --git a/radiant/selection.cpp b/radiant/selection.cpp index 3d3e91f9..aeb6e005 100644 --- a/radiant/selection.cpp +++ b/radiant/selection.cpp @@ -527,7 +527,7 @@ private: Vector3 m_axis; Scalable& m_scalable; - Vector3 m_choosen_extent; + Vector3 m_chosen_extent; AABB m_bounds; public: @@ -537,7 +537,7 @@ public: void Construct( const Matrix4& device2manip, const float x, const float y, const AABB& bounds, const Vector3& transform_origin ){ m_start = point_on_axis( m_axis, device2manip, x, y ); - m_choosen_extent = Vector3( + m_chosen_extent = Vector3( std::max( bounds.origin[0] + bounds.extents[0] - transform_origin[0], - bounds.origin[0] + bounds.extents[0] + transform_origin[0] ), std::max( bounds.origin[1] + bounds.extents[1] - transform_origin[1], - bounds.origin[1] + bounds.extents[1] + transform_origin[1] ), std::max( bounds.origin[2] + bounds.extents[2] - transform_origin[2], - bounds.origin[2] + bounds.extents[2] + transform_origin[2] ) @@ -568,8 +568,8 @@ public: ); /* try bbox way */ for( std::size_t i = 0; i < 3; i++ ){ - if( m_choosen_extent[i] > 0.0625f && m_axis[i] != 0.f ){ //epsilon to prevent super high scale for set of models, having really small extent, formed by origins - scale[i] = ( m_choosen_extent[i] + delta[i] ) / m_choosen_extent[i]; + if( m_chosen_extent[i] > 0.0625f && m_axis[i] != 0.f ){ //epsilon to prevent super high scale for set of models, having really small extent, formed by origins + scale[i] = ( m_chosen_extent[i] + delta[i] ) / m_chosen_extent[i]; if( snapbbox ){ const float snappdwidth = float_snapped( scale[i] * m_bounds.extents[i] * 2.f, GetSnapGridSize() ); scale[i] = snappdwidth / ( m_bounds.extents[i] * 2.f ); @@ -600,7 +600,7 @@ private: Vector3 m_axis2; Scalable& m_scalable; - Vector3 m_choosen_extent; + Vector3 m_chosen_extent; AABB m_bounds; public: @@ -610,7 +610,7 @@ public: void Construct( const Matrix4& device2manip, const float x, const float y, const AABB& bounds, const Vector3& transform_origin ){ m_start = point_on_plane( device2manip, x, y ); - m_choosen_extent = Vector3( + m_chosen_extent = Vector3( std::max( bounds.origin[0] + bounds.extents[0] - transform_origin[0], -( bounds.origin[0] - bounds.extents[0] - transform_origin[0] ) ), std::max( bounds.origin[1] + bounds.extents[1] - transform_origin[1], -( bounds.origin[1] - bounds.extents[1] - transform_origin[1] ) ), std::max( bounds.origin[2] + bounds.extents[2] - transform_origin[2], -( bounds.origin[2] - bounds.extents[2] - transform_origin[2] ) ) @@ -645,8 +645,8 @@ public: //globalOutputStream() << "m_start: " << m_start << " start: " << start << " delta: " << delta <<"\n"; for( std::size_t i = 0; i < 3; i++ ){ - if( m_choosen_extent[i] > 0.0625f && start[i] != 0.f ){ - scale[i] = ( m_choosen_extent[i] + delta[i] ) / m_choosen_extent[i]; + if( m_chosen_extent[i] > 0.0625f && start[i] != 0.f ){ + scale[i] = ( m_chosen_extent[i] + delta[i] ) / m_chosen_extent[i]; if( snapbbox ){ const float snappdwidth = float_snapped( scale[i] * m_bounds.extents[i] * 2.f, GetSnapGridSize() ); scale[i] = snappdwidth / ( m_bounds.extents[i] * 2.f ); diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index deccce4a..aa1d9de3 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -652,7 +652,7 @@ typedef ReferenceCaller1= AAS_MAX_PORTALINDEXSIZE) @@ -1172,7 +1172,7 @@ void AAS_RemoveNotClusterClosingPortals(void) if (aasworld.areasettings[otherareanum].contents & AREACONTENTS_CLUSTERPORTAL) continue; //if the area already has a cluster set if (aasworld.areasettings[otherareanum].cluster) continue; - //another cluster is seperated by this portal + //another cluster is separated by this portal numseperatedclusters++; //flood the cluster AAS_FloodCluster_r(otherareanum, numseperatedclusters); @@ -1189,13 +1189,13 @@ void AAS_RemoveNotClusterClosingPortals(void) if (aasworld.areasettings[otherareanum].contents & AREACONTENTS_CLUSTERPORTAL) continue; //if the area already has a cluster set if (aasworld.areasettings[otherareanum].cluster) continue; - //another cluster is seperated by this portal + //another cluster is separated by this portal numseperatedclusters++; //flood the cluster AAS_FloodCluster_r(otherareanum, numseperatedclusters); AAS_FloodClusterReachabilities(numseperatedclusters); } //end for - //a portal must seperate no more and no less than 2 clusters + //a portal must separate no more and no less than 2 clusters if (numseperatedclusters != 2) { aasworld.areasettings[i].contents &= ~AREACONTENTS_CLUSTERPORTAL; diff --git a/tools/mbspc/botlib/be_aas_reach.c b/tools/mbspc/botlib/be_aas_reach.c index 7c85a49c..a163bea9 100644 --- a/tools/mbspc/botlib/be_aas_reach.c +++ b/tools/mbspc/botlib/be_aas_reach.c @@ -1423,7 +1423,7 @@ int AAS_Reachability_Step_Barrier_WaterJump_WalkOffLedge(int area1num, int area2 //if there IS water the sv_maxwaterjump height below the bestend point if (aasworld.areasettings[AAS_PointAreaNum(testpoint)].areaflags & AREA_LIQUID) { - //don't create rediculous water jump reachabilities from areas very far below + //don't create ridiculous water jump reachabilities from areas very far below //the water surface if (water_bestdist < aassettings.phys_maxwaterjump + 24) { diff --git a/tools/mbspc/botlib/be_aas_sample.c b/tools/mbspc/botlib/be_aas_sample.c index 603b251a..ce57d738 100644 --- a/tools/mbspc/botlib/be_aas_sample.c +++ b/tools/mbspc/botlib/be_aas_sample.c @@ -689,7 +689,7 @@ aas_trace_t AAS_TraceClientBBox(vec3_t start, vec3_t end, int presencetype, side = front < 0; //first put the end part of the line on the stack (back side) VectorCopy(cur_mid, tstack_p->start); - //not necesary to store because still on stack + //not necessary to store because still on stack //VectorCopy(cur_end, tstack_p->end); tstack_p->planenum = aasnode->planenum; tstack_p->nodenum = aasnode->children[!side]; @@ -875,7 +875,7 @@ int AAS_TraceAreas(vec3_t start, vec3_t end, int *areas, vec3_t *points, int max side = front < 0; //first put the end part of the line on the stack (back side) VectorCopy(cur_mid, tstack_p->start); - //not necesary to store because still on stack + //not necessary to store because still on stack //VectorCopy(cur_end, tstack_p->end); tstack_p->planenum = aasnode->planenum; tstack_p->nodenum = aasnode->children[!side]; @@ -960,7 +960,7 @@ qboolean AAS_InsideFace(aas_face_t *face, vec3_t pnormal, vec3_t point, float ep //edge) and through both the edge vector and the normal vector //of the plane AAS_OrthogonalToVectors(edgevec, pnormal, sepnormal); - //check on wich side of the above plane the point is + //check on which side of the above plane the point is //this is done by checking the sign of the dot product of the //vector orthogonal vector from above and the vector from the //origin (first vertex of edge) to the point diff --git a/tools/mbspc/botlib/l_precomp.c b/tools/mbspc/botlib/l_precomp.c index ada95e9d..8f1d50b0 100644 --- a/tools/mbspc/botlib/l_precomp.c +++ b/tools/mbspc/botlib/l_precomp.c @@ -1313,7 +1313,7 @@ define_t *PC_DefineFromString(char *string) #endif //DEFINEHASHING // FreeScript(script); - //if the define was created succesfully + //if the define was created successfully if (res > 0) return def; //free the define is created if (src.defines) PC_FreeDefine(def); @@ -2909,7 +2909,7 @@ void PC_UnreadToken(source_t *source, token_t *token) void PC_SetIncludePath(source_t *source, char *path) { strncpy(source->includepath, path, MAX_PATH); - //add trailing path seperator + //add trailing path separator if (source->includepath[strlen(source->includepath)-1] != '\\' && source->includepath[strlen(source->includepath)-1] != '/') { diff --git a/tools/mbspc/botlib/l_script.c b/tools/mbspc/botlib/l_script.c index 8f363502..a05d5956 100644 --- a/tools/mbspc/botlib/l_script.c +++ b/tools/mbspc/botlib/l_script.c @@ -171,7 +171,7 @@ char *PunctuationFromNum(script_t *script, int num) { if (script->punctuations[i].n == num) return script->punctuations[i].p; } //end for - return "unkown punctuation"; + return "unknown punctuation"; } //end of the function PunctuationFromNum //=========================================================================== // @@ -357,7 +357,7 @@ int PS_ReadEscapeCharacter(script_t *script, char *ch) script->script_p++; //store the escape character *ch = c; - //succesfully read escape character + //successfully read escape character return 1; } //end of the function PS_ReadEscapeCharacter //============================================================================ @@ -367,7 +367,7 @@ int PS_ReadEscapeCharacter(script_t *script, char *ch) // // Parameter: script : script to read from // token : buffer to store the string -// Returns: true when a string was read succesfully +// Returns: true when a string was read successfully // Changes Globals: - //============================================================================ int PS_ReadString(script_t *script, token_t *token, int quote) @@ -411,7 +411,7 @@ int PS_ReadString(script_t *script, token_t *token, int quote) // tmpscript_p = script->script_p; tmpline = script->line; - //read unusefull stuff between possible two following strings + //read unuseful stuff between possible two following strings if (!PS_ReadWhiteSpace(script)) { script->script_p = tmpscript_p; @@ -774,7 +774,7 @@ int PS_ReadPrimitive(script_t *script, token_t *token) token->string[len] = 0; //copy the token into the script structure Com_Memcpy(&script->token, token, sizeof(token_t)); - //primitive reading successfull + //primitive reading successful return 1; } //end of the function PS_ReadPrimitive //============================================================================ @@ -801,7 +801,7 @@ int PS_ReadToken(script_t *script, token_t *token) //start of the white space script->whitespace_p = script->script_p; token->whitespace_p = script->script_p; - //read unusefull stuff + //read unuseful stuff if (!PS_ReadWhiteSpace(script)) return 0; //end of the white space script->endwhitespace_p = script->script_p; @@ -848,7 +848,7 @@ int PS_ReadToken(script_t *script, token_t *token) } //end if //copy the token into the script structure Com_Memcpy(&script->token, token, sizeof(token_t)); - //succesfully read a token + //successfully read a token return 1; } //end of the function PS_ReadToken //============================================================================ diff --git a/tools/mbspc/mbspc.html b/tools/mbspc/mbspc.html index c8b0df25..1b0dc6fc 100644 --- a/tools/mbspc/mbspc.html +++ b/tools/mbspc/mbspc.html @@ -205,7 +205,7 @@ Several map bugs can cause these 'solid' places in the AAS file. snapping in the q3map tool those tiny brush faces can be snapped out of existence. Such faces will not show up in Quake3 and you'll see tiny peek holes or slits where you can view through the geometry. - Allign vertexes of and edges of adjacent brushes to remove and avoid + Align vertexes of and edges of adjacent brushes to remove and avoid such tiny faces. Placing a clip brush in front of the face that is snapped out of existence will also remove the 'solid' area but ofcourse it's much better to remove the peek holes and slits. diff --git a/tools/mbspc/mbspc/aas_areamerging.c b/tools/mbspc/mbspc/aas_areamerging.c index f9de65ff..bc7df2f1 100644 --- a/tools/mbspc/mbspc/aas_areamerging.c +++ b/tools/mbspc/mbspc/aas_areamerging.c @@ -116,9 +116,9 @@ int AAS_TryMergeFaceAreas(tmp_face_t *seperatingface) //debug: check if the area belongs to the area if (face1->frontarea != tmparea1 && face1->backarea != tmparea1) Error("face does not belong to area1"); - //just continue if the face is seperating the two areas + //just continue if the face is separating the two areas //NOTE: a result of this is that ground and gap areas can - // be merged if the seperating face is the gap + // be merged if the separating face is the gap if ((face1->frontarea == tmparea1 && face1->backarea == tmparea2) || (face1->frontarea == tmparea2 && @@ -133,9 +133,9 @@ int AAS_TryMergeFaceAreas(tmp_face_t *seperatingface) //debug: check if the area belongs to the area if (face2->frontarea != tmparea2 && face2->backarea != tmparea2) Error("face does not belong to area2"); - //just continue if the face is seperating the two areas + //just continue if the face is separating the two areas //NOTE: a result of this is that ground and gap areas can - // be merged if the seperating face is the gap + // be merged if the separating face is the gap if ((face2->frontarea == tmparea1 && face2->backarea == tmparea2) || (face2->frontarea == tmparea2 && @@ -147,8 +147,8 @@ int AAS_TryMergeFaceAreas(tmp_face_t *seperatingface) if (NonConvex(face1, face2, side1, side2)) return false; } //end for } //end for - //if one area has gap faces (that aren't seperating the two areas) - //and the other has ground faces (that aren't seperating the two areas), + //if one area has gap faces (that aren't separating the two areas) + //and the other has ground faces (that aren't separating the two areas), //the areas can't be merged if (((area1faceflags & FACE_GROUND) && (area2faceflags & FACE_GAP)) || ((area2faceflags & FACE_GROUND) && (area1faceflags & FACE_GAP))) @@ -169,13 +169,13 @@ int AAS_TryMergeFaceAreas(tmp_face_t *seperatingface) newarea->modelnum = tmparea1->modelnum; newarea->tmpfaces = NULL; - //add all the faces (except the seperating ones) from the first area + //add all the faces (except the separating ones) from the first area //to the new area for (face1 = tmparea1->tmpfaces; face1; face1 = nextface1) { side1 = (face1->frontarea != tmparea1); nextface1 = face1->next[side1]; - //don't add seperating faces + //don't add separating faces if ((face1->frontarea == tmparea1 && face1->backarea == tmparea2) || (face1->frontarea == tmparea2 && @@ -187,13 +187,13 @@ int AAS_TryMergeFaceAreas(tmp_face_t *seperatingface) AAS_RemoveFaceFromArea(face1, tmparea1); AAS_AddFaceSideToArea(face1, side1, newarea); } //end for - //add all the faces (except the seperating ones) from the second area + //add all the faces (except the separating ones) from the second area //to the new area for (face2 = tmparea2->tmpfaces; face2; face2 = nextface2) { side2 = (face2->frontarea != tmparea2); nextface2 = face2->next[side2]; - //don't add seperating faces + //don't add separating faces if ((face2->frontarea == tmparea1 && face2->backarea == tmparea2) || (face2->frontarea == tmparea2 && diff --git a/tools/mbspc/mbspc/aas_create.h b/tools/mbspc/mbspc/aas_create.h index 7f41f02d..7c7bc916 100644 --- a/tools/mbspc/mbspc/aas_create.h +++ b/tools/mbspc/mbspc/aas_create.h @@ -62,7 +62,7 @@ typedef struct tmp_area_s tmp_areasettings_t *settings; //area settings struct tmp_area_s *mergedarea; //points to the new area after merging //when mergedarea != 0 the area has only the - //seperating face of the merged areas + //separating face of the merged areas int aasareanum; //number of the aas area created for this tmp area //links in the list with areas struct tmp_area_s *l_prev, *l_next; diff --git a/tools/mbspc/mbspc/aas_facemerging.c b/tools/mbspc/mbspc/aas_facemerging.c index c921c2da..b5b57dc7 100644 --- a/tools/mbspc/mbspc/aas_facemerging.c +++ b/tools/mbspc/mbspc/aas_facemerging.c @@ -149,7 +149,7 @@ void AAS_MergeAreaFaces(void) for (face2 = face1->next[side1]; face2; face2 = face2->next[side2]) { side2 = face2->frontarea != tmparea; - //if succesfully merged + //if successfully merged if (AAS_TryMergeFaces(face1, face2)) { //start over again after merging two faces diff --git a/tools/mbspc/mbspc/aas_gsubdiv.c b/tools/mbspc/mbspc/aas_gsubdiv.c index 862bc95a..967e123d 100644 --- a/tools/mbspc/mbspc/aas_gsubdiv.c +++ b/tools/mbspc/mbspc/aas_gsubdiv.c @@ -372,7 +372,7 @@ int AAS_FindBestAreaSplitPlane(tmp_area_t *tmparea, vec3_t normal, float *dist) //only split between gaps and ground if (!(((face1->faceflags & FACE_GROUND) && AAS_GapFace(face2, side2)) || ((face2->faceflags & FACE_GROUND) && AAS_GapFace(face1, side1)))) continue; - //find a plane seperating the windings of the faces + //find a plane separating the windings of the faces if (!FindPlaneSeperatingWindings(face1->winding, face2->winding, invgravity, tmpnormal, &tmpdist)) continue; #ifdef AW_DEBUG diff --git a/tools/mbspc/mbspc/aasfile.h b/tools/mbspc/mbspc/aasfile.h index fc3dc778..e3e2aea1 100644 --- a/tools/mbspc/mbspc/aasfile.h +++ b/tools/mbspc/mbspc/aasfile.h @@ -176,7 +176,7 @@ typedef struct aas_edge_s //edge index, negative if vertexes are reversed typedef int aas_edgeindex_t; -//a face bounds a convex area, often it will also seperate two convex areas +//a face bounds a convex area, often it will also separate two convex areas typedef struct aas_face_s { int planenum; //number of the plane this face is in diff --git a/tools/mbspc/mbspc/brushbsp.c b/tools/mbspc/mbspc/brushbsp.c index 7a563fa0..43b82750 100644 --- a/tools/mbspc/mbspc/brushbsp.c +++ b/tools/mbspc/mbspc/brushbsp.c @@ -808,7 +808,7 @@ int TestBrushToPlanenum (bspbrush_t *brush, int planenum, } //end of the function TestBrushToPlanenum //=========================================================================== // Returns true if the winding would be crunched out of -// existance by the vertex snapping. +// existence by the vertex snapping. // // Parameter: - // Returns: - @@ -1000,9 +1000,9 @@ side_t *SelectSplitSide (bspbrush_t *brushes, node_t *node) if (!side->winding) continue; // nothing visible, so it can't split if (side->texinfo == TEXINFO_NODE) - continue; // allready a node splitter + continue; // already a node splitter if (side->flags & SFL_TESTED) - continue; // we allready have metrics for this plane + continue; // we already have metrics for this plane // if (side->surf & SURF_SKIP) // continue; // skip surfaces are never chosen @@ -1058,7 +1058,7 @@ side_t *SelectSplitSide (bspbrush_t *brushes, node_t *node) value = -9999999; // save off the side test so we don't need - // to recalculate it when we actually seperate + // to recalculate it when we actually separate // the brushes if (value > bestvalue) { @@ -1370,7 +1370,7 @@ void SplitBrushList (bspbrush_t *brushes, newbrush = CopyBrush (brush); - // if the planenum is actualy a part of the brush + // if the planenum is actually a part of the brush // find the plane and flag it as used so it won't be tried // as a splitter again if (sides & PSIDE_FACING) diff --git a/tools/mbspc/mbspc/csg.c b/tools/mbspc/mbspc/csg.c index fc7c3276..4db714d0 100644 --- a/tools/mbspc/mbspc/csg.c +++ b/tools/mbspc/mbspc/csg.c @@ -412,7 +412,7 @@ bspbrush_t *IntersectBrush (bspbrush_t *a, bspbrush_t *b) return in; } //end of the function IntersectBrush //=========================================================================== -// Returns true if the two brushes definately do not intersect. +// Returns true if the two brushes definitely do not intersect. // There will be false negatives for some non-axial combinations. // // Parameter: - diff --git a/tools/mbspc/mbspc/l_poly.c b/tools/mbspc/mbspc/l_poly.c index 25ee4a9d..4c9d4220 100644 --- a/tools/mbspc/mbspc/l_poly.c +++ b/tools/mbspc/mbspc/l_poly.c @@ -852,7 +852,7 @@ winding_t *MergeWindings(winding_t *w1, winding_t *w2, vec3_t planenormal) if (DotProduct(v, sepnormal) - dist < -0.1) sides[j] = SIDE_BACK; else sides[j] = SIDE_FRONT; } //end for - //remove all unnecesary points + //remove all unnecessary points for (j = 0; j < numpoints;) { if (sides[j] == SIDE_BACK @@ -1179,7 +1179,7 @@ int FindPlaneSeperatingWindings(winding_t *w1, winding_t *w2, vec3_t dir, if (diff < -0.0001 || diff > 0.0001) break; } //end for if (n != 3) continue; - //check on which side of the seperating plane the points of + //check on which side of the separating plane the points of //the first winding are sides1[0] = sides1[1] = sides1[2] = 0; for (n = 0; n < w1->numpoints; n++) @@ -1189,7 +1189,7 @@ int FindPlaneSeperatingWindings(winding_t *w1, winding_t *w2, vec3_t dir, else if (dot < -0.1) sides1[1]++; else sides1[2]++; } //end for - //check on which side of the seperating plane the points of + //check on which side of the separating plane the points of //the second winding are sides2[0] = sides2[1] = sides2[2] = 0; for (n = 0; n < w2->numpoints; n++) @@ -1215,10 +1215,10 @@ int FindPlaneSeperatingWindings(winding_t *w1, winding_t *w2, vec3_t dir, // if ((!sides1[0] && !sides1[1]) || (!sides2[0] && !sides2[1])) { - //don't use one of the winding planes as the seperating plane + //don't use one of the winding planes as the separating plane continue; } //end if - //the windings must be at different sides of the seperating plane + //the windings must be at different sides of the separating plane if ((!sides1[0] && !sides2[1]) || (!sides1[1] && !sides2[0])) { VectorCopy(normal1, normal); @@ -1308,29 +1308,29 @@ winding_t *AAS_MergeWindings(winding_t *w1, winding_t *w2, vec3_t windingnormal) { if (n == 0) winding = w1; else winding = w2; - //get the points of the winding which are on the seperating plane + //get the points of the winding which are on the separating plane for (i = 0; i < winding->numpoints; i++) { dot = DotProduct(winding->p[i], normal) - dist; if (dot > -ON_EPSILON && dot < ON_EPSILON) { - //don't allow more than 64 points on the seperating plane - if (numpoints[n] >= 64) Error("AAS_MergeWindings: more than 64 points on seperating plane\n"); + //don't allow more than 64 points on the separating plane + if (numpoints[n] >= 64) Error("AAS_MergeWindings: more than 64 points on separating plane\n"); points[n][numpoints[n]++] = i; } //end if } //end for - //there must be at least two points of each winding on the seperating plane + //there must be at least two points of each winding on the separating plane if (numpoints[n] < 2) return NULL; } //end for - //if the first point of winding1 (which is on the seperating plane) is unequal - //to the last point of winding2 (which is on the seperating plane) + //if the first point of winding1 (which is on the separating plane) is unequal + //to the last point of winding2 (which is on the separating plane) if (!EqualVertexes(w1->p[points[0][0]], w2->p[points[1][numpoints[1]-1]])) { return NULL; } //end if - //if the last point of winding1 (which is on the seperating plane) is unequal - //to the first point of winding2 (which is on the seperating plane) + //if the last point of winding1 (which is on the separating plane) is unequal + //to the first point of winding2 (which is on the separating plane) if (!EqualVertexes(w1->p[points[0][numpoints[0]-1]], w2->p[points[1][0]])) { return NULL; @@ -1339,7 +1339,7 @@ winding_t *AAS_MergeWindings(winding_t *w1, winding_t *w2, vec3_t windingnormal) // check slope of connected lines // if the slopes are colinear, the point can be removed // - //first point of winding1 which is on the seperating plane + //first point of winding1 which is on the separating plane p1 = points[0][0]; //point before p1 p2 = (p1 + w1->numpoints - 1) % w1->numpoints; @@ -1347,7 +1347,7 @@ winding_t *AAS_MergeWindings(winding_t *w1, winding_t *w2, vec3_t windingnormal) CrossProduct(windingnormal, delta, normal); VectorNormalize(normal, normal); - //last point of winding2 which is on the seperating plane + //last point of winding2 which is on the separating plane p1 = points[1][numpoints[1]-1]; //point after p1 p2 = (p1 + 1) % w2->numpoints; @@ -1356,7 +1356,7 @@ winding_t *AAS_MergeWindings(winding_t *w1, winding_t *w2, vec3_t windingnormal) if (dot > CONTINUOUS_EPSILON) return NULL; //merging would create a non-convex polygon keep[0] = (qboolean)(dot < -CONTINUOUS_EPSILON); - //first point of winding2 which is on the seperating plane + //first point of winding2 which is on the separating plane p1 = points[1][0]; //point before p1 p2 = (p1 + w2->numpoints - 1) % w2->numpoints; @@ -1364,7 +1364,7 @@ winding_t *AAS_MergeWindings(winding_t *w1, winding_t *w2, vec3_t windingnormal) CrossProduct(windingnormal, delta, normal); VectorNormalize(normal, normal); - //last point of winding1 which is on the seperating plane + //last point of winding1 which is on the separating plane p1 = points[0][numpoints[0]-1]; //point after p1 p2 = (p1 + 1) % w1->numpoints; @@ -1386,7 +1386,7 @@ winding_t *AAS_MergeWindings(winding_t *w1, winding_t *w2, vec3_t windingnormal) if (n == 0) winding = w1; else winding = w2; //copy the points of the winding starting with the last point on the - //seperating plane and ending before the first point on the seperating plane + //separating plane and ending before the first point on the separating plane for (i = points[n][numpoints[n]-1]; i != points[n][0]; i = (i+1)%winding->numpoints) { if (k >= newnumpoints) diff --git a/tools/mbspc/mbspc/l_poly.h b/tools/mbspc/mbspc/l_poly.h index 21a3bd1c..bfc2975d 100644 --- a/tools/mbspc/mbspc/l_poly.h +++ b/tools/mbspc/mbspc/l_poly.h @@ -105,9 +105,9 @@ winding_t *AddWindingPoint(winding_t *w, vec3_t point, int spot); //when the point is on one of the edged the number of the first //point of the edge is stored in 'spot' int PointOnWinding(winding_t *w, vec3_t normal, float dist, vec3_t point, int *spot); -//find a plane seperating the two windings +//find a plane separating the two windings //true is returned when the windings area adjacent -//the seperating plane normal and distance area stored in 'normal' and 'dist' +//the separating plane normal and distance area stored in 'normal' and 'dist' //this plane will contain both the piece of common edge of the two windings //and the vector 'dir' int FindPlaneSeperatingWindings(winding_t *w1, winding_t *w2, vec3_t dir, diff --git a/tools/mbspc/mbspc/l_utils.h b/tools/mbspc/mbspc/l_utils.h index d0e165a2..5dd1a539 100644 --- a/tools/mbspc/mbspc/l_utils.h +++ b/tools/mbspc/mbspc/l_utils.h @@ -66,7 +66,7 @@ typedef struct foundfile_s //set the correct path seperators void ConvertPath(char *path); -//append a path seperator to the given path not exceeding the length +//append a path separator to the given path not exceeding the length void AppendPathSeperator(char *path, int length); //find a file in a pak file qboolean FindFileInPak(char *pakfile, char *filename, foundfile_t *file); diff --git a/tools/mbspc/mbspc/map.c b/tools/mbspc/mbspc/map.c index 2dfe1d68..051da759 100644 --- a/tools/mbspc/mbspc/map.c +++ b/tools/mbspc/mbspc/map.c @@ -362,7 +362,7 @@ void AddBrushBevels (mapbrush_t *b) { for (dir=-1 ; dir <= 1 ; dir+=2, order++) { - // see if the plane is allready present + // see if the plane is already present for (i=0, s=b->original_sides ; inumsides ; i++,s++) { if (mapplanes[s->planenum].normal[axis] == dir) @@ -455,7 +455,7 @@ void AddBrushBevels (mapbrush_t *b) // behind this plane, it is a proper edge bevel for (k=0 ; knumsides ; k++) { - // if this plane has allready been used, skip it + // if this plane has already been used, skip it if (PlaneEqual (&mapplanes[b->original_sides[k].planenum] , normal, dist) ) break; diff --git a/tools/mbspc/mbspc/map_hl.c b/tools/mbspc/mbspc/map_hl.c index bbd00cb5..c745aee1 100644 --- a/tools/mbspc/mbspc/map_hl.c +++ b/tools/mbspc/mbspc/map_hl.c @@ -1026,7 +1026,7 @@ void HL_CreateMapBrushes(entity_t *mapent, int modelnum) //create brushes from the model BSP tree brushlist = HL_CreateBrushesFromBSP(modelnum); - //texture the brushes and split them when necesary + //texture the brushes and split them when necessary brushlist = HL_TextureBrushes(brushlist, modelnum); //fix the contents textures of all brushes HL_FixContentsTextures(brushlist); diff --git a/tools/mbspc/mbspc/map_q1.c b/tools/mbspc/mbspc/map_q1.c index 0a9750e3..3649ffe9 100644 --- a/tools/mbspc/mbspc/map_q1.c +++ b/tools/mbspc/mbspc/map_q1.c @@ -1084,7 +1084,7 @@ void Q1_CreateMapBrushes(entity_t *mapent, int modelnum) //create brushes from the model BSP tree brushlist = Q1_CreateBrushesFromBSP(modelnum); - //texture the brushes and split them when necesary + //texture the brushes and split them when necessary brushlist = Q1_TextureBrushes(brushlist, modelnum); //fix the contents textures of all brushes Q1_FixContentsTextures(brushlist); diff --git a/tools/mbspc/mbspc/portals.c b/tools/mbspc/mbspc/portals.c index 3086c420..f9186956 100644 --- a/tools/mbspc/mbspc/portals.c +++ b/tools/mbspc/mbspc/portals.c @@ -192,7 +192,7 @@ int c_tinyportals; void AddPortalToNodes (portal_t *p, node_t *front, node_t *back) { if (p->nodes[0] || p->nodes[1]) - Error ("AddPortalToNode: allready included"); + Error ("AddPortalToNode: already included"); p->nodes[0] = front; p->next[0] = front->portals; @@ -999,7 +999,7 @@ void FloodAreas_r (node_t *node) b = node->brushlist; e = &entities[b->original->entitynum]; - // if the current area has allready touched this + // if the current area has already touched this // portal, we are done if (e->portalareas[0] == c_areas || e->portalareas[1] == c_areas) return; @@ -1019,7 +1019,7 @@ void FloodAreas_r (node_t *node) } //end if if (node->area) - return; // allready got it + return; // already got it node->area = c_areas; for (p=node->portals ; p ; p = p->next[s]) @@ -1053,7 +1053,7 @@ void FindAreas_r (node_t *node) } if (node->area) - return; // allready got it + return; // already got it if (node->contents & CONTENTS_SOLID) return; @@ -1092,7 +1092,7 @@ void SetAreaPortalAreas_r (node_t *node) if (node->contents == CONTENTS_AREAPORTAL) { if (node->area) - return; // allready set + return; // already set b = node->brushlist; e = &entities[b->original->entitynum]; diff --git a/tools/mbspc/mbspc/prtfile.c b/tools/mbspc/mbspc/prtfile.c index 58d12065..682de581 100644 --- a/tools/mbspc/mbspc/prtfile.c +++ b/tools/mbspc/mbspc/prtfile.c @@ -83,7 +83,7 @@ void WritePortalFile_r (node_t *node) // sometimes planes get turned around when they are very near // the changeover point between different axis. interpret the // plane the same way vis will, and flip the side orders if needed - // FIXME: is this still relevent? + // FIXME: is this still relevant? WindingPlane (w, normal, &dist); if ( DotProduct (p->plane.normal, normal) < 0.99 ) { // backwards... diff --git a/tools/mbspc/mbspc/q2files.h b/tools/mbspc/mbspc/q2files.h index 317e47cc..fcb829e6 100644 --- a/tools/mbspc/mbspc/q2files.h +++ b/tools/mbspc/mbspc/q2files.h @@ -325,7 +325,7 @@ typedef struct } dplane_t; -// contents flags are seperate bits +// contents flags are separate bits // a given brush can contribute multiple content bits // multiple brushes can be in a single leaf diff --git a/tools/mbspc/mbspc/q3files.h b/tools/mbspc/mbspc/q3files.h index 3788fb8c..586ba6d0 100644 --- a/tools/mbspc/mbspc/q3files.h +++ b/tools/mbspc/mbspc/q3files.h @@ -206,7 +206,7 @@ typedef struct { #define Q3_BSP_VERSION 46 // quick fix for creating aas files for ql bsp's. -// (later this will probably need to be seperated, if we plan to add further support for ql) +// (later this will probably need to be separated, if we plan to add further support for ql) #define QL_BSP_IDENT (('P'<<24)+('S'<<16)+('B'<<8)+'I') // little-endian "IBSP" diff --git a/tools/mbspc/mbspc/qbsp.h b/tools/mbspc/mbspc/qbsp.h index b1211818..4bd3d8c7 100644 --- a/tools/mbspc/mbspc/qbsp.h +++ b/tools/mbspc/mbspc/qbsp.h @@ -62,7 +62,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define CLIP_EPSILON 0.1 #define MAX_MAP_BOUNDS 65535 #define BOGUS_RANGE (MAX_MAP_BOUNDS+128) //somewhere outside the map -#define TEXINFO_NODE -1 //side is allready on a node +#define TEXINFO_NODE -1 //side is already on a node #define PLANENUM_LEAF -1 //used for leaf nodes #define MAXEDGES 20 //maximum number of face edges #define MAX_NODE_BRUSHES 8 //maximum brushes in a node diff --git a/tools/mbspc/mbspc/qfiles.h b/tools/mbspc/mbspc/qfiles.h index 8df67a7e..55e4891e 100644 --- a/tools/mbspc/mbspc/qfiles.h +++ b/tools/mbspc/mbspc/qfiles.h @@ -325,7 +325,7 @@ typedef struct } dplane_t; -// contents flags are seperate bits +// contents flags are separate bits // a given brush can contribute multiple content bits // multiple brushes can be in a single leaf diff --git a/tools/mbspc/mbspc/sinfiles.h b/tools/mbspc/mbspc/sinfiles.h index bcb5ee68..f4cfd38d 100644 --- a/tools/mbspc/mbspc/sinfiles.h +++ b/tools/mbspc/mbspc/sinfiles.h @@ -145,7 +145,7 @@ typedef struct } sin_dplane_t; -// contents flags are seperate bits +// contents flags are separate bits // a given brush can contribute multiple content bits // multiple brushes can be in a single leaf diff --git a/tools/mbspc/mbspc/tree.c b/tools/mbspc/mbspc/tree.c index bc3cb8e7..f71dfc7e 100644 --- a/tools/mbspc/mbspc/tree.c +++ b/tools/mbspc/mbspc/tree.c @@ -217,7 +217,7 @@ void Tree_Print_r (node_t *node, int depth) Tree_Print_r (node->children[1], depth+1); } //end of the function Tree_Print_r //=========================================================================== -// NODES THAT DON'T SEPERATE DIFFERENT CONTENTS CAN BE PRUNED +// NODES THAT DON'T SEPARATE DIFFERENT CONTENTS CAN BE PRUNED // // Parameter: - // Returns: - @@ -242,7 +242,7 @@ void Tree_PruneNodes_r (node_t *node) && (node->children[1]->contents & CONTENTS_SOLID)) { if (node->faces) - Error ("node->faces seperating CONTENTS_SOLID"); + Error ("node->faces separating CONTENTS_SOLID"); if (node->children[0]->faces || node->children[1]->faces) Error ("!node->faces with children"); // FIXME: free stuff diff --git a/tools/mbspc/mbspc/writebsp.c b/tools/mbspc/mbspc/writebsp.c index 4a66af76..40c8f3de 100644 --- a/tools/mbspc/mbspc/writebsp.c +++ b/tools/mbspc/mbspc/writebsp.c @@ -39,7 +39,7 @@ int planeused[MAX_MAP_PLANES]; ============ EmitPlanes -There is no oportunity to discard planes, because all of the original +There is no opportunity to discard planes, because all of the original brushes will be saved in the map. ============ */ diff --git a/tools/mbspc/qcommon/cm_patch.c b/tools/mbspc/qcommon/cm_patch.c index 50c8d2d9..94935dd0 100644 --- a/tools/mbspc/qcommon/cm_patch.c +++ b/tools/mbspc/qcommon/cm_patch.c @@ -295,7 +295,7 @@ static void CM_SubdivideGridColumns( cGrid_t *grid ) { // grid->points[i+2][x] is an interpolating control point // - // first see if we can collapse the aproximating collumn away + // first see if we can collapse the aproximating column away // for ( j = 0 ; j < grid->height ; j++ ) { if ( CM_NeedsSubdivision( grid->points[i][j], grid->points[i+1][j], grid->points[i+2][j] ) ) { @@ -851,7 +851,7 @@ void CM_AddFacetBevels( facet_t *facet ) { if (CM_PlaneEqual(&planes[facet->surfacePlane], plane, &flipped)) { continue; } - // see if the plane is allready present + // see if the plane is already present for ( i = 0 ; i < facet->numBorders ; i++ ) { if (CM_PlaneEqual(&planes[facet->borderPlanes[i]], plane, &flipped)) break; @@ -912,7 +912,7 @@ void CM_AddFacetBevels( facet_t *facet ) { if (CM_PlaneEqual(&planes[facet->surfacePlane], plane, &flipped)) { continue; } - // see if the plane is allready present + // see if the plane is already present for ( i = 0 ; i < facet->numBorders ; i++ ) { if (CM_PlaneEqual(&planes[facet->borderPlanes[i]], plane, &flipped)) { break; @@ -1078,7 +1078,7 @@ static void CM_PatchCollideFromGrid( cGrid_t *grid, patchCollide_t *pf ) { numFacets++; } } else { - // two seperate triangles + // two separate triangles facet->surfacePlane = gridPlanes[i][j][0]; facet->numBorders = 3; facet->borderPlanes[0] = borders[EN_TOP]; @@ -1187,7 +1187,7 @@ struct patchCollide_s *CM_GeneratePatchCollide( int width, int height, vec3_t *p CM_RemoveDegenerateColumns( &grid ); // we now have a grid of points exactly on the curve - // the aproximate surface defined by these points will be + // the approximate surface defined by these points will be // collided against pf = Hunk_Alloc( sizeof( *pf ), h_high ); ClearBounds( pf->bounds[0], pf->bounds[1] ); @@ -1342,7 +1342,7 @@ int CM_CheckFacetPlane(float *plane, vec3_t start, vec3_t end, float *enterFrac, return false; } - // if it doesn't cross the plane, the plane isn't relevent + // if it doesn't cross the plane, the plane isn't relevant if (d1 <= 0 && d2 <= 0 ) { return true; } @@ -1407,7 +1407,7 @@ void CM_TraceThroughPatchCollide( traceWork_t *tw, const struct patchCollide_s * VectorCopy(planes->plane, plane); plane[3] = planes->plane[3]; if ( tw->sphere.use ) { - // adjust the plane distance apropriately for radius + // adjust the plane distance appropriately for radius plane[3] += tw->sphere.radius; // find the closest point on the capsule to the plane @@ -1446,7 +1446,7 @@ void CM_TraceThroughPatchCollide( traceWork_t *tw, const struct patchCollide_s * plane[3] = planes->plane[3]; } if ( tw->sphere.use ) { - // adjust the plane distance apropriately for radius + // adjust the plane distance appropriately for radius plane[3] += tw->sphere.radius; // find the closest point on the capsule to the plane @@ -1535,7 +1535,7 @@ qboolean CM_PositionTestInPatchCollide( traceWork_t *tw, const struct patchColli VectorCopy(planes->plane, plane); plane[3] = planes->plane[3]; if ( tw->sphere.use ) { - // adjust the plane distance apropriately for radius + // adjust the plane distance appropriately for radius plane[3] += tw->sphere.radius; // find the closest point on the capsule to the plane @@ -1568,7 +1568,7 @@ qboolean CM_PositionTestInPatchCollide( traceWork_t *tw, const struct patchColli plane[3] = planes->plane[3]; } if ( tw->sphere.use ) { - // adjust the plane distance apropriately for radius + // adjust the plane distance appropriately for radius plane[3] += tw->sphere.radius; // find the closest point on the capsule to the plane diff --git a/tools/mbspc/qcommon/cm_trace.c b/tools/mbspc/qcommon/cm_trace.c index 746c187b..8e1b2ba2 100644 --- a/tools/mbspc/qcommon/cm_trace.c +++ b/tools/mbspc/qcommon/cm_trace.c @@ -189,7 +189,7 @@ void CM_TestBoxInBrush( traceWork_t *tw, cbrush_t *brush ) { side = brush->sides + i; plane = side->plane; - // adjust the plane distance apropriately for radius + // adjust the plane distance appropriately for radius dist = plane->dist + tw->sphere.radius; // find the closest point on the capsule to the plane t = DotProduct( plane->normal, tw->sphere.offset ); @@ -214,7 +214,7 @@ void CM_TestBoxInBrush( traceWork_t *tw, cbrush_t *brush ) { side = brush->sides + i; plane = side->plane; - // adjust the plane distance apropriately for mins/maxs + // adjust the plane distance appropriately for mins/maxs dist = plane->dist - DotProduct( tw->offsets[ plane->signbits ], plane->normal ); d1 = DotProduct( tw->start, plane->normal ) - dist; @@ -517,7 +517,7 @@ void CM_TraceThroughBrush( traceWork_t *tw, cbrush_t *brush ) { side = brush->sides + i; plane = side->plane; - // adjust the plane distance apropriately for radius + // adjust the plane distance appropriately for radius dist = plane->dist + tw->sphere.radius; // find the closest point on the capsule to the plane @@ -548,7 +548,7 @@ void CM_TraceThroughBrush( traceWork_t *tw, cbrush_t *brush ) { return; } - // if it doesn't cross the plane, the plane isn't relevent + // if it doesn't cross the plane, the plane isn't relevant if (d1 <= 0 && d2 <= 0 ) { continue; } @@ -584,7 +584,7 @@ void CM_TraceThroughBrush( traceWork_t *tw, cbrush_t *brush ) { side = brush->sides + i; plane = side->plane; - // adjust the plane distance apropriately for mins/maxs + // adjust the plane distance appropriately for mins/maxs dist = plane->dist - DotProduct( tw->offsets[ plane->signbits ], plane->normal ); d1 = DotProduct( tw->start, plane->normal ) - dist; @@ -602,7 +602,7 @@ void CM_TraceThroughBrush( traceWork_t *tw, cbrush_t *brush ) { return; } - // if it doesn't cross the plane, the plane isn't relevent + // if it doesn't cross the plane, the plane isn't relevant if (d1 <= 0 && d2 <= 0 ) { continue; } @@ -1046,13 +1046,13 @@ void CM_TraceThroughTree( traceWork_t *tw, int num, float p1f, float p2f, vec3_t } // - // find the point distances to the seperating plane + // find the point distances to the separating plane // and the offset for the size of the box // node = cm.nodes + num; plane = node->plane; - // adjust the plane distance apropriately for mins/maxs + // adjust the plane distance appropriately for mins/maxs if ( plane->type < 3 ) { t1 = p1[plane->type] - plane->dist; t2 = p2[plane->type] - plane->dist; @@ -1208,7 +1208,7 @@ void CM_Trace( trace_t *results, const vec3_t start, const vec3_t end, vec3_t mi tw.maxOffset = tw.size[1][0] + tw.size[1][1] + tw.size[1][2]; - // tw.offsets[signbits] = vector to apropriate corner from origin + // tw.offsets[signbits] = vector to appropriate corner from origin tw.offsets[0][0] = tw.size[0][0]; tw.offsets[0][1] = tw.size[0][1]; tw.offsets[0][2] = tw.size[0][2]; diff --git a/tools/mbspc/qcommon/q_shared.h b/tools/mbspc/qcommon/q_shared.h index 6ee20e2b..6341a55d 100644 --- a/tools/mbspc/qcommon/q_shared.h +++ b/tools/mbspc/qcommon/q_shared.h @@ -170,7 +170,7 @@ typedef int clipHandle_t; #define MAX_SAY_TEXT 150 -// paramters for command buffer stuffing +// parameters for command buffer stuffing typedef enum { EXEC_NOW, // don't return until completed, a VM should NEVER use this, // because some commands might cause the VM to be unloaded... @@ -1041,7 +1041,7 @@ typedef struct playerState_s { #define BUTTON_TALK 2 // displays talk balloon and disables actions #define BUTTON_USE_HOLDABLE 4 #define BUTTON_GESTURE 8 -#define BUTTON_WALKING 16 // walking can't just be infered from MOVE_RUN +#define BUTTON_WALKING 16 // walking can't just be inferred from MOVE_RUN // because a key pressed late in the frame will // only generate a small move value for that frame // walking will use different animations and diff --git a/tools/mbspc/qcommon/qcommon.h b/tools/mbspc/qcommon/qcommon.h index 24f30340..d3bb4c6c 100644 --- a/tools/mbspc/qcommon/qcommon.h +++ b/tools/mbspc/qcommon/qcommon.h @@ -622,7 +622,7 @@ extern int cvar_modifiedFlags; FILESYSTEM No stdio calls should be used by any part of the game, because -we need to deal with all sorts of directory and seperator char +we need to deal with all sorts of directory and separator char issues. ============================================================== */ @@ -700,7 +700,7 @@ void FS_FCloseFile( fileHandle_t f ); int FS_ReadFile( const char *qpath, void **buffer ); // returns the length of the file // a null buffer will just return the file length without loading -// as a quick check for existance. -1 length == not present +// as a quick check for existence. -1 length == not present // A 0 byte will always be appended at the end, so string ops are safe. // the buffer should be considered read-only, because it may be cached // for other uses. diff --git a/tools/mbspc/qcommon/surfaceflags.h b/tools/mbspc/qcommon/surfaceflags.h index 92e28d26..f668c5f7 100644 --- a/tools/mbspc/qcommon/surfaceflags.h +++ b/tools/mbspc/qcommon/surfaceflags.h @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // // This file must be identical in the quake and utils directories -// contents flags are seperate bits +// contents flags are separate bits // a given brush can contribute multiple content bits // these definitions also need to be in q_shared.h! diff --git a/tools/mbspc/qcommon/unzip.c b/tools/mbspc/qcommon/unzip.c index 99f6d673..835aea6b 100644 --- a/tools/mbspc/qcommon/unzip.c +++ b/tools/mbspc/qcommon/unzip.c @@ -1079,7 +1079,7 @@ static void zcfree OF((voidp opaque, voidp ptr)); /* =========================================================================== Read a byte from a gz_stream; update next_in and avail_in. Return EOF for end of file. - IN assertion: the stream s has been sucessfully opened for reading. + IN assertion: the stream s has been successfully opened for reading. */ /* @@ -1163,8 +1163,8 @@ static int strcmpcasenosensitive_internal (const char* fileName1,const char* fil /* Compare two filename (fileName1,fileName2). - If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp) - If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi + If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp) + If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi or strcasecmp) If iCaseSenisivity = 0, case sensitivity is defaut of your operating system (like 1 on Unix, 2 on Windows) @@ -2448,7 +2448,7 @@ static int inflate_flush OF(( end-of-block. Note however that the static length tree defines 288 codes just to fill out the Huffman codes. Codes 286 and 287 cannot be used though, since there is no length base or extra bits - defined for them. Similarily, there are up to 30 distance codes. + defined for them. Similarly, there are up to 30 distance codes. However, static trees define 32 codes (all 5 bits) to fill out the Huffman codes, but the last two had better not show up in the data. 7. Unzip can check dynamic Huffman blocks for complete code sets. diff --git a/tools/mbspc/qcommon/unzip.h b/tools/mbspc/qcommon/unzip.h index 2c312983..38f4e1b1 100644 --- a/tools/mbspc/qcommon/unzip.h +++ b/tools/mbspc/qcommon/unzip.h @@ -171,8 +171,8 @@ extern int unzStringFileNameCompare (const char* fileName1, const char* fileName /* Compare two filename (fileName1,fileName2). - If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp) - If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi + If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp) + If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi or strcasecmp) If iCaseSenisivity = 0, case sensitivity is defaut of your operating system (like 1 on Unix, 2 on Windows) diff --git a/tools/quake2/common/cmdlib.c b/tools/quake2/common/cmdlib.c index 072e88b3..b4b59d2e 100644 --- a/tools/quake2/common/cmdlib.c +++ b/tools/quake2/common/cmdlib.c @@ -618,7 +618,7 @@ int LoadFile( const char *filename, void **bufferptr ){ ============== LoadFileBlock - - rounds up memory allocation to 4K boundry + rounds up memory allocation to 4K boundary - ============== */ diff --git a/tools/quake2/common/inout.c b/tools/quake2/common/inout.c index 2fa75543..c6d98677 100644 --- a/tools/quake2/common/inout.c +++ b/tools/quake2/common/inout.c @@ -267,7 +267,7 @@ void FPrintf( int flag, char *buf ){ return; } - // ouput an XML file of the run + // output an XML file of the run // use the DOM interface to build a tree /* diff --git a/tools/quake2/common/qfiles.h b/tools/quake2/common/qfiles.h index d2b6f106..520b24a4 100644 --- a/tools/quake2/common/qfiles.h +++ b/tools/quake2/common/qfiles.h @@ -402,7 +402,7 @@ typedef struct } dplane_t; -// contents flags are seperate bits +// contents flags are separate bits // a given brush can contribute multiple content bits // multiple brushes can be in a single leaf diff --git a/tools/quake2/common/scriplib.c b/tools/quake2/common/scriplib.c index 9069de71..b38cea41 100644 --- a/tools/quake2/common/scriplib.c +++ b/tools/quake2/common/scriplib.c @@ -158,7 +158,7 @@ qboolean EndOfScript( qboolean crossline ){ qboolean GetToken( qboolean crossline ){ char *token_p; - if ( tokenready ) { // is a token allready waiting? + if ( tokenready ) { // is a token already waiting? tokenready = false; return true; } diff --git a/tools/quake2/extra/Unpack/Unpack.java b/tools/quake2/extra/Unpack/Unpack.java index a18e72fa..d35bd6c6 100644 --- a/tools/quake2/extra/Unpack/Unpack.java +++ b/tools/quake2/extra/Unpack/Unpack.java @@ -159,7 +159,7 @@ class Unpack { readLump.readFully(buffer); // quake uses forward slashes, but java requires - // they only by the host's seperator, which + // they only by the host's separator, which // varies from win to unix fixedString = new StringBuffer (args[2] + File.separator + nameString); for (index = 0 ; index < fixedString.length() ; index++) { diff --git a/tools/quake2/extra/bsp/qbsp3/brushbsp.c b/tools/quake2/extra/bsp/qbsp3/brushbsp.c index a111bd3b..bc99e2bf 100644 --- a/tools/quake2/extra/bsp/qbsp3/brushbsp.c +++ b/tools/quake2/extra/bsp/qbsp3/brushbsp.c @@ -612,7 +612,7 @@ int TestBrushToPlanenum (bspbrush_t *brush, int planenum, WindingIsTiny Returns true if the winding would be crunched out of -existance by the vertex snapping. +existence by the vertex snapping. ================ */ #define EDGE_LENGTH 0.2 @@ -780,9 +780,9 @@ side_t *SelectSplitSide (bspbrush_t *brushes, node_t *node) if (!side->winding) continue; // nothing visible, so it can't split if (side->texinfo == TEXINFO_NODE) - continue; // allready a node splitter + continue; // already a node splitter if (side->tested) - continue; // we allready have metrics for this plane + continue; // we already have metrics for this plane if (side->surf & SURF_SKIP) continue; // skip surfaces are never chosen if ( side->visible ^ (pass<2) ) @@ -845,7 +845,7 @@ side_t *SelectSplitSide (bspbrush_t *brushes, node_t *node) value = -9999999; // save off the side test so we don't need - // to recalculate it when we actually seperate + // to recalculate it when we actually separate // the brushes if (value > bestvalue) { @@ -1155,7 +1155,7 @@ void SplitBrushList (bspbrush_t *brushes, newbrush = CopyBrush (brush); - // if the planenum is actualy a part of the brush + // if the planenum is actually a part of the brush // find the plane and flag it as used so it won't be tried // as a splitter again if (sides & PSIDE_FACING) diff --git a/tools/quake2/extra/bsp/qbsp3/csg.c b/tools/quake2/extra/bsp/qbsp3/csg.c index 2d69aa22..37210cb4 100644 --- a/tools/quake2/extra/bsp/qbsp3/csg.c +++ b/tools/quake2/extra/bsp/qbsp3/csg.c @@ -142,7 +142,7 @@ bspbrush_t *IntersectBrush (bspbrush_t *a, bspbrush_t *b) =============== BrushesDisjoint -Returns true if the two brushes definately do not intersect. +Returns true if the two brushes definitely do not intersect. There will be false negatives for some non-axial combinations. =============== */ diff --git a/tools/quake2/extra/bsp/qbsp3/map.c b/tools/quake2/extra/bsp/qbsp3/map.c index 232979c7..d4d0de6c 100644 --- a/tools/quake2/extra/bsp/qbsp3/map.c +++ b/tools/quake2/extra/bsp/qbsp3/map.c @@ -360,7 +360,7 @@ void AddBrushBevels (mapbrush_t *b) { for (dir=-1 ; dir <= 1 ; dir+=2, order++) { - // see if the plane is allready present + // see if the plane is already present for (i=0, s=b->original_sides ; inumsides ; i++,s++) { if (mapplanes[s->planenum].normal[axis] == dir) @@ -444,7 +444,7 @@ void AddBrushBevels (mapbrush_t *b) // behind this plane, it is a proper edge bevel for (k=0 ; knumsides ; k++) { - // if this plane has allready been used, skip it + // if this plane has already been used, skip it if (PlaneEqual (&mapplanes[b->original_sides[k].planenum] , normal, dist) ) break; diff --git a/tools/quake2/extra/bsp/qbsp3/portals.c b/tools/quake2/extra/bsp/qbsp3/portals.c index ef57caef..b4bcd672 100644 --- a/tools/quake2/extra/bsp/qbsp3/portals.c +++ b/tools/quake2/extra/bsp/qbsp3/portals.c @@ -179,7 +179,7 @@ AddPortalToNodes void AddPortalToNodes (portal_t *p, node_t *front, node_t *back) { if (p->nodes[0] || p->nodes[1]) - Error ("AddPortalToNode: allready included"); + Error ("AddPortalToNode: already included"); p->nodes[0] = front; p->next[0] = front->portals; @@ -751,7 +751,7 @@ void FloodAreas_r (node_t *node) b = node->brushlist; e = &entities[b->original->entitynum]; - // if the current area has allready touched this + // if the current area has already touched this // portal, we are done if (e->portalareas[0] == c_areas || e->portalareas[1] == c_areas) return; @@ -771,7 +771,7 @@ void FloodAreas_r (node_t *node) } if (node->area) - return; // allready got it + return; // already got it node->area = c_areas; for (p=node->portals ; p ; p = p->next[s]) @@ -806,7 +806,7 @@ void FindAreas_r (node_t *node) } if (node->area) - return; // allready got it + return; // already got it if (node->contents & CONTENTS_SOLID) return; @@ -846,7 +846,7 @@ void SetAreaPortalAreas_r (node_t *node) if (node->contents == CONTENTS_AREAPORTAL) { if (node->area) - return; // allready set + return; // already set b = node->brushlist; e = &entities[b->original->entitynum]; diff --git a/tools/quake2/extra/bsp/qbsp3/prtfile.c b/tools/quake2/extra/bsp/qbsp3/prtfile.c index 2a5b08f4..8a522cad 100644 --- a/tools/quake2/extra/bsp/qbsp3/prtfile.c +++ b/tools/quake2/extra/bsp/qbsp3/prtfile.c @@ -83,7 +83,7 @@ void WritePortalFile_r (node_t *node) // sometimes planes get turned around when they are very near // the changeover point between different axis. interpret the // plane the same way vis will, and flip the side orders if needed - // FIXME: is this still relevent? + // FIXME: is this still relevant? WindingPlane (w, normal, &dist); if ( DotProduct (p->plane.normal, normal) < 0.99 ) { // backwards... diff --git a/tools/quake2/extra/bsp/qbsp3/qbsp.h b/tools/quake2/extra/bsp/qbsp3/qbsp.h index af032e43..47c14889 100644 --- a/tools/quake2/extra/bsp/qbsp3/qbsp.h +++ b/tools/quake2/extra/bsp/qbsp3/qbsp.h @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define BOGUS_RANGE 8192 -#define TEXINFO_NODE -1 // side is allready on a node +#define TEXINFO_NODE -1 // side is already on a node typedef struct plane_s { @@ -61,7 +61,7 @@ typedef struct side_s int contents; // from miptex int surf; // from miptex qboolean visible; // choose visble planes first - qboolean tested; // this plane allready checked as a split + qboolean tested; // this plane already checked as a split qboolean bevel; // don't ever use for bsp splitting } side_t; diff --git a/tools/quake2/extra/bsp/qbsp3/qbsp3.c b/tools/quake2/extra/bsp/qbsp3/qbsp3.c index 1cc5b907..fe0cad78 100644 --- a/tools/quake2/extra/bsp/qbsp3/qbsp3.c +++ b/tools/quake2/extra/bsp/qbsp3/qbsp3.c @@ -80,7 +80,7 @@ node_t *BlockTree (int xl, int yl, int xh, int yh) return node; } - // create a seperator along the largest axis + // create a separator along the largest axis node = AllocNode (); if (xh - xl > yh - yl) diff --git a/tools/quake2/extra/bsp/qbsp3/tree.c b/tools/quake2/extra/bsp/qbsp3/tree.c index a6c1f34c..02e867fa 100644 --- a/tools/quake2/extra/bsp/qbsp3/tree.c +++ b/tools/quake2/extra/bsp/qbsp3/tree.c @@ -156,7 +156,7 @@ void PrintTree_r (node_t *node, int depth) /* ========================================================= -NODES THAT DON'T SEPERATE DIFFERENT CONTENTS CAN BE PRUNED +NODES THAT DON'T SEPARATE DIFFERENT CONTENTS CAN BE PRUNED ========================================================= */ @@ -181,7 +181,7 @@ void PruneNodes_r (node_t *node) && (node->children[1]->contents & CONTENTS_SOLID) ) { if (node->faces) - Error ("node->faces seperating CONTENTS_SOLID"); + Error ("node->faces separating CONTENTS_SOLID"); if (node->children[0]->faces || node->children[1]->faces) Error ("!node->faces with children"); diff --git a/tools/quake2/extra/bsp/qbsp3/writebsp.c b/tools/quake2/extra/bsp/qbsp3/writebsp.c index cc5c3266..42234927 100644 --- a/tools/quake2/extra/bsp/qbsp3/writebsp.c +++ b/tools/quake2/extra/bsp/qbsp3/writebsp.c @@ -39,7 +39,7 @@ int planeused[MAX_MAP_PLANES]; ============ EmitPlanes -There is no oportunity to discard planes, because all of the original +There is no opportunity to discard planes, because all of the original brushes will be saved in the map. ============ */ diff --git a/tools/quake2/extra/bsp/qrad3/lightmap.c b/tools/quake2/extra/bsp/qrad3/lightmap.c index e6a5aaaa..dbfbf7b3 100644 --- a/tools/quake2/extra/bsp/qrad3/lightmap.c +++ b/tools/quake2/extra/bsp/qrad3/lightmap.c @@ -225,7 +225,7 @@ void TriEdge_r (triangulation_t *trian, triedge_t *e) triangle_t *nt; if (e->tri) - return; // allready connected by someone + return; // already connected by someone // find the point with the best angle p0 = trian->points[e->p0]->origin; @@ -998,7 +998,7 @@ skipadd: ; AddSampleToPatch Take the sample's collected light and -add it back into the apropriate patch +add it back into the appropriate patch for the radiosity pass. The sample is added to all patches that might include diff --git a/tools/quake2/extra/bsp/qrad3/patches.c b/tools/quake2/extra/bsp/qrad3/patches.c index fbae0c32..f02c9810 100644 --- a/tools/quake2/extra/bsp/qrad3/patches.c +++ b/tools/quake2/extra/bsp/qrad3/patches.c @@ -60,7 +60,7 @@ void CalcTextureReflectivity (void) for (i=0 ; itexinfo]; if (!(tx->flags & SURF_LIGHT) || tx->value == 0) @@ -321,7 +321,7 @@ void MakePatches (void) } } - qprintf ("%i sqaure feet\n", (int)(totalarea/64)); + qprintf ("%i square feet\n", (int)(totalarea/64)); } /* diff --git a/tools/quake2/extra/bsp/qrad3/qrad3.c b/tools/quake2/extra/bsp/qrad3/qrad3.c index 9c7caddc..1563e37e 100644 --- a/tools/quake2/extra/bsp/qrad3/qrad3.c +++ b/tools/quake2/extra/bsp/qrad3/qrad3.c @@ -287,7 +287,7 @@ void MakeTransfers (int i) // // normalize all transfers so all of the light - // is transfered to the surroundings + // is transferred to the surroundings // t = patch->transfers; itotal = 0; diff --git a/tools/quake2/extra/bsp/qvis3/flow.c b/tools/quake2/extra/bsp/qvis3/flow.c index 66af998e..732fe017 100644 --- a/tools/quake2/extra/bsp/qvis3/flow.c +++ b/tools/quake2/extra/bsp/qvis3/flow.c @@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA for p2 = all other portals in leaf get sperating planes for all portals that might be seen by p2 - mark as unseen if not present in seperating plane + mark as unseen if not present in separating plane flood fill a new mightsee save as passagemightsee @@ -106,7 +106,7 @@ void FreeStackWinding (winding_t *w, pstack_t *stack) return; // not from local if (stack->freewindings[i]) - Error ("FreeStackWinding: allready free"); + Error ("FreeStackWinding: already free"); stack->freewindings[i] = 1; } @@ -225,7 +225,7 @@ ClipToSeperators Source, pass, and target are an ordering of portals. -Generates seperating planes canidates by taking two points from source and one +Generates separating planes canidates by taking two points from source and one point from pass, and clips target by them. If target is totally clipped away, that portal can not be seen through. @@ -280,7 +280,7 @@ winding_t *ClipToSeperators (winding_t *source, winding_t *pass, winding_t *targ plane.dist = DotProduct (pass->points[j], plane.normal); // - // find out which side of the generated seperating plane has the + // find out which side of the generated separating plane has the // source portal // #if 1 @@ -319,7 +319,7 @@ winding_t *ClipToSeperators (winding_t *source, winding_t *pass, winding_t *targ #if 1 // // if all of the pass portal points are now on the positive side, - // this is the seperating plane + // this is the separating plane // counts[0] = counts[1] = counts[2] = 0; for (k=0 ; knumpoints ; k++) @@ -335,10 +335,10 @@ winding_t *ClipToSeperators (winding_t *source, winding_t *pass, winding_t *targ counts[2]++; } if (k != pass->numpoints) - continue; // points on negative side, not a seperating plane + continue; // points on negative side, not a separating plane if (!counts[0]) - continue; // planar with seperating plane + continue; // planar with separating plane #else k = (j+1)%pass->numpoints; d = DotProduct (pass->points[k], plane.normal) - plane.dist; @@ -359,7 +359,7 @@ winding_t *ClipToSeperators (winding_t *source, winding_t *pass, winding_t *targ } // - // clip target by the seperating plane + // clip target by the separating plane // target = ChopWinding (target, stack, &plane); if (!target) @@ -415,7 +415,7 @@ void RecursiveLeafFlow (int leafnum, threaddata_t *thread, pstack_t *prevstack) continue; // can't possibly see it } - // if the portal can't see anything we haven't allready seen, skip it + // if the portal can't see anything we haven't already seen, skip it if (p->status == stat_done) { test = (long *)p->portalvis; @@ -608,7 +608,7 @@ calc portal visibility for a portal to be visible to a passage, it must be on the front of -all seperating planes, and both portals must be behind the mew portal +all separating planes, and both portals must be behind the mew portal =============================================================================== */ diff --git a/tools/quake2/extra/common/qfiles.h b/tools/quake2/extra/common/qfiles.h index d7a85563..7e2a47f9 100644 --- a/tools/quake2/extra/common/qfiles.h +++ b/tools/quake2/extra/common/qfiles.h @@ -325,7 +325,7 @@ typedef struct } dplane_t; -// contents flags are seperate bits +// contents flags are separate bits // a given brush can contribute multiple content bits // multiple brushes can be in a single leaf diff --git a/tools/quake2/extra/common/scriplib.c b/tools/quake2/extra/common/scriplib.c index a9e2f3b5..31b61d72 100644 --- a/tools/quake2/extra/common/scriplib.c +++ b/tools/quake2/extra/common/scriplib.c @@ -164,7 +164,7 @@ qboolean GetToken (qboolean crossline) { char *token_p; - if (tokenready) // is a token allready waiting? + if (tokenready) // is a token already waiting? { tokenready = false; return true; diff --git a/tools/quake2/extra/qdata/images.c b/tools/quake2/extra/qdata/images.c index 90934f13..2f287475 100644 --- a/tools/quake2/extra/qdata/images.c +++ b/tools/quake2/extra/qdata/images.c @@ -296,7 +296,7 @@ void Cmd_Colormap (void) *lump_p++ = c; } -// 66% transparancy table +// 66% transparency table for (l=0;l<255;l++) { for (c=0 ; c<255 ; c++) diff --git a/tools/quake2/extra/qdata/models.c b/tools/quake2/extra/qdata/models.c index d6922cb7..df84c7ec 100644 --- a/tools/quake2/extra/qdata/models.c +++ b/tools/quake2/extra/qdata/models.c @@ -305,7 +305,7 @@ void FinishModel (void) // finish writing header file H_printf("\n"); - // scale_up is usefull to allow step distances to be adjusted + // scale_up is useful to allow step distances to be adjusted H_printf("#define MODEL_SCALE\t\t%f\n", scale_up); fclose (headerouthandle); @@ -787,7 +787,7 @@ char *FindFrameFile (char *frame) char *s; if (strstr (frame, ".")) - return frame; // allready in dot format + return frame; // already in dot format // split 'run1' into 'run' and '1' s = frame + strlen(frame)-1; diff --git a/tools/quake2/extra/qdata/qdata.c b/tools/quake2/extra/qdata/qdata.c index 2f93b728..ea931ad1 100644 --- a/tools/quake2/extra/qdata/qdata.c +++ b/tools/quake2/extra/qdata/qdata.c @@ -337,7 +337,7 @@ void ReleaseTexture (char *name) =============== Cmd_Maps -Only relevent for release and pak files. +Only relevant for release and pak files. Releases the .bsp files for the maps, and scans all of the files to build a list of all textures used, which are then released. =============== diff --git a/tools/quake2/extra/qe4/brush.c b/tools/quake2/extra/qe4/brush.c index e8a2b53a..c12f712c 100644 --- a/tools/quake2/extra/qe4/brush.c +++ b/tools/quake2/extra/qe4/brush.c @@ -556,7 +556,7 @@ void DrawBrushEntityName (brush_t *b) int i; if (!b->owner) - return; // during contruction + return; // during construction if (b->owner == world_entity) return; @@ -1120,7 +1120,7 @@ brush_t *Brush_Clone (brush_t *b) Brush_Ray Itersects a ray with a brush -Returns the face hit and the distance along the ray the intersection occured at +Returns the face hit and the distance along the ray the intersection occurred at Returns NULL and 0 if not hit at all ============== */ @@ -1173,7 +1173,7 @@ face_t *Brush_Ray (vec3_t origin, vec3_t dir, brush_t *b, float *dist) void Brush_AddToList (brush_t *b, brush_t *list) { if (b->next || b->prev) - Error ("Brush_RemoveFromList: allready linked"); + Error ("Brush_RemoveFromList: already linked"); b->next = list->next; list->next->prev = b; list->next = b; @@ -1262,7 +1262,7 @@ void Brush_SelectFaceForDragging (brush_t *b, face_t *f, qboolean shear) for (i=0 ; i<3 ; i++) c += AddPlanept (f->planepts[i]); if (c == 0) - return; // allready completely added + return; // already completely added // select all points on this plane in all brushes the selection for (b2=selected_brushes.next ; b2 != &selected_brushes ; b2 = b2->next) diff --git a/tools/quake2/extra/qe4/bspfile.h b/tools/quake2/extra/qe4/bspfile.h index 89c56a34..088676b5 100644 --- a/tools/quake2/extra/qe4/bspfile.h +++ b/tools/quake2/extra/qe4/bspfile.h @@ -140,7 +140,7 @@ typedef struct } dplane_t; -// contents flags are seperate bits +// contents flags are separate bits // a given brush can contribute multiple content bits // multiple brushes can be in a single leaf @@ -188,7 +188,7 @@ typedef struct texinfo_s float vecs[2][4]; // [s/t][xyz offset] int miptex; int flags; // miptex flags + overrides - int value; // light emition, etc + int value; // light emission, etc } texinfo_t; #define TEX_SPECIAL 1 // sky or slime, no lightmap or 256 subdivision diff --git a/tools/quake2/extra/qe4/csg.c b/tools/quake2/extra/qe4/csg.c index e36a2ade..7e87479a 100644 --- a/tools/quake2/extra/qe4/csg.c +++ b/tools/quake2/extra/qe4/csg.c @@ -147,7 +147,7 @@ void CSG_Subtract (void) || b->maxs[i] <= s->mins[i] + ON_EPSILON) break; if (i != 3) - continue; // definately don't touch + continue; // definitely don't touch frag = s; for (f = b->brush_faces ; f && frag ; f=f->next) diff --git a/tools/quake2/extra/qe4/drag.c b/tools/quake2/extra/qe4/drag.c index 2418325e..074e82fd 100644 --- a/tools/quake2/extra/qe4/drag.c +++ b/tools/quake2/extra/qe4/drag.c @@ -365,7 +365,7 @@ void MoveSelection (vec3_t move) break; } - // if any of the brushes were crushed out of existance + // if any of the brushes were crushed out of existence // calcel the entire move if (b != &selected_brushes) { diff --git a/tools/quake2/extra/qe4/entity.c b/tools/quake2/extra/qe4/entity.c index 7cbe14ae..a0a6ff33 100644 --- a/tools/quake2/extra/qe4/entity.c +++ b/tools/quake2/extra/qe4/entity.c @@ -336,7 +336,7 @@ Entity_Create Creates a new entity out of the selected_brushes list. If the entity class is fixed size, the brushes are only used to find a midpoint. Otherwise, the brushes have -their ownershi[ transfered to the new entity. +their ownershi[ transferred to the new entity. ============ */ entity_t *Entity_Create (eclass_t *c) @@ -420,7 +420,7 @@ Entity_LinkBrush void Entity_LinkBrush (entity_t *e, brush_t *b) { if (b->oprev || b->onext) - Error ("Entity_LinkBrush: Allready linked"); + Error ("Entity_LinkBrush: Already linked"); b->owner = e; b->onext = e->brushes.onext; diff --git a/tools/quake2/extra/qe4/map.c b/tools/quake2/extra/qe4/map.c index 9528e152..96eb33b6 100644 --- a/tools/quake2/extra/qe4/map.c +++ b/tools/quake2/extra/qe4/map.c @@ -77,7 +77,7 @@ void Map_SaveBetween (void) { for (e2=between_entities.next ; e2 != &between_entities ; e2=e2->next) if (e2 == e) - goto next; // allready got the entity + goto next; // already got the entity // move the entity over e->prev->next = e->next; e->next->prev = e->prev; diff --git a/tools/quake2/extra/qe4/mru.c b/tools/quake2/extra/qe4/mru.c index 84a5a3eb..794c2d4d 100644 --- a/tools/quake2/extra/qe4/mru.c +++ b/tools/quake2/extra/qe4/mru.c @@ -329,7 +329,7 @@ WORD i,j; // // Comments: // Used when used open a file, using MRU, and when an error -// occured (by example, when file was deleted) +// occurred (by example, when file was deleted) // // History: Date Author Comment // 09/24/94 G. Vollant Created diff --git a/tools/quake2/extra/qe4/parse.c b/tools/quake2/extra/qe4/parse.c index 8258a4ad..ae8d76a7 100644 --- a/tools/quake2/extra/qe4/parse.c +++ b/tools/quake2/extra/qe4/parse.c @@ -38,7 +38,7 @@ qboolean GetToken (qboolean crossline) { char *token_p; - if (unget) // is a token allready waiting? + if (unget) // is a token already waiting? return true; // diff --git a/tools/quake2/extra/qe4/qfiles.h b/tools/quake2/extra/qe4/qfiles.h index e7dbbdfe..f0365494 100644 --- a/tools/quake2/extra/qe4/qfiles.h +++ b/tools/quake2/extra/qe4/qfiles.h @@ -264,7 +264,7 @@ typedef struct } dplane_t; -// contents flags are seperate bits +// contents flags are separate bits // a given brush can contribute multiple content bits // multiple brushes can be in a single leaf diff --git a/tools/quake2/extra/qe4/textures.c b/tools/quake2/extra/qe4/textures.c index 21fa8ce0..ff369af0 100644 --- a/tools/quake2/extra/qe4/textures.c +++ b/tools/quake2/extra/qe4/textures.c @@ -357,7 +357,7 @@ qtexture_t *Texture_LoadTexture (miptex_t *qtex) =============== Texture_CreateSolid -Create a single pixel texture of the apropriate color +Create a single pixel texture of the appropriate color =============== */ qtexture_t *Texture_CreateSolid (char *name) @@ -1064,7 +1064,7 @@ LONG WINAPI WTex_WndProc ( ================== CreateTextureWindow -We need to create a seperate window for the textures +We need to create a separate window for the textures in the inspector window, because we can't share gl and gdi drawing in a single window ================== diff --git a/tools/quake2/extra/texpaint/win_skin.c b/tools/quake2/extra/texpaint/win_skin.c index bffc0d82..ced63c48 100644 --- a/tools/quake2/extra/texpaint/win_skin.c +++ b/tools/quake2/extra/texpaint/win_skin.c @@ -247,7 +247,7 @@ void SetSizes (int width, int height) height2<<=1; } - // compatability shit for auto sizing of old skins + // compatibility shit for auto sizing of old skins if (skin_width != 320 || skin_height != 200) { skinwidth = skin_width; diff --git a/tools/quake2/q2map/brushbsp.c b/tools/quake2/q2map/brushbsp.c index 03a8bee4..6c452dad 100644 --- a/tools/quake2/q2map/brushbsp.c +++ b/tools/quake2/q2map/brushbsp.c @@ -621,7 +621,7 @@ int TestBrushToPlanenum( bspbrush_t *brush, int planenum, WindingIsTiny Returns true if the winding would be crunched out of - existance by the vertex snapping. + existence by the vertex snapping. ================ */ #define EDGE_LENGTH 0.2 @@ -789,10 +789,10 @@ side_t *SelectSplitSide( bspbrush_t *brushes, node_t *node ){ continue; // nothing visible, so it can't split } if ( side->texinfo == TEXINFO_NODE ) { - continue; // allready a node splitter + continue; // already a node splitter } if ( side->tested ) { - continue; // we allready have metrics for this plane + continue; // we already have metrics for this plane } if ( side->surf & SURF_SKIP ) { continue; // skip surfaces are never chosen @@ -865,7 +865,7 @@ side_t *SelectSplitSide( bspbrush_t *brushes, node_t *node ){ } // save off the side test so we don't need - // to recalculate it when we actually seperate + // to recalculate it when we actually separate // the brushes if ( value > bestvalue ) { bestvalue = value; @@ -1169,7 +1169,7 @@ void SplitBrushList( bspbrush_t *brushes, newbrush = CopyBrush( brush ); - // if the planenum is actualy a part of the brush + // if the planenum is actually a part of the brush // find the plane and flag it as used so it won't be tried // as a splitter again if ( sides & PSIDE_FACING ) { diff --git a/tools/quake2/q2map/csg.c b/tools/quake2/q2map/csg.c index 0b0bda93..514a0f63 100644 --- a/tools/quake2/q2map/csg.c +++ b/tools/quake2/q2map/csg.c @@ -144,7 +144,7 @@ bspbrush_t *IntersectBrush( bspbrush_t *a, bspbrush_t *b ){ =============== BrushesDisjoint - Returns true if the two brushes definately do not intersect. + Returns true if the two brushes definitely do not intersect. There will be false negatives for some non-axial combinations. =============== */ diff --git a/tools/quake2/q2map/flow.c b/tools/quake2/q2map/flow.c index 587e1902..7d92210f 100644 --- a/tools/quake2/q2map/flow.c +++ b/tools/quake2/q2map/flow.c @@ -31,7 +31,7 @@ for p2 = all other portals in leaf get sperating planes for all portals that might be seen by p2 - mark as unseen if not present in seperating plane + mark as unseen if not present in separating plane flood fill a new mightsee save as passagemightsee @@ -104,7 +104,7 @@ void FreeStackWinding( winding_t *w, pstack_t *stack ){ } if ( stack->freewindings[i] ) { - Error( "FreeStackWinding: allready free" ); + Error( "FreeStackWinding: already free" ); } stack->freewindings[i] = 1; } @@ -225,7 +225,7 @@ winding_t *Vis_ChopWinding( winding_t *in, pstack_t *stack, plane_t *split ){ Source, pass, and target are an ordering of portals. - Generates seperating planes canidates by taking two points from source and one + Generates separating planes canidates by taking two points from source and one point from pass, and clips target by them. If target is totally clipped away, that portal can not be seen through. @@ -280,7 +280,7 @@ winding_t *ClipToSeperators( winding_t *source, winding_t *pass, winding_t *ta plane.dist = DotProduct( pass->points[j], plane.normal ); // - // find out which side of the generated seperating plane has the + // find out which side of the generated separating plane has the // source portal // #if 1 @@ -318,7 +318,7 @@ winding_t *ClipToSeperators( winding_t *source, winding_t *pass, winding_t *ta #if 1 // // if all of the pass portal points are now on the positive side, - // this is the seperating plane + // this is the separating plane // counts[0] = counts[1] = counts[2] = 0; for ( k = 0 ; k < pass->numpoints ; k++ ) @@ -338,11 +338,11 @@ winding_t *ClipToSeperators( winding_t *source, winding_t *pass, winding_t *ta } } if ( k != pass->numpoints ) { - continue; // points on negative side, not a seperating plane + continue; // points on negative side, not a separating plane } if ( !counts[0] ) { - continue; // planar with seperating plane + continue; // planar with separating plane } #else k = ( j + 1 ) % pass->numpoints; @@ -365,7 +365,7 @@ winding_t *ClipToSeperators( winding_t *source, winding_t *pass, winding_t *ta } // - // clip target by the seperating plane + // clip target by the separating plane // target = Vis_ChopWinding( target, stack, &plane ); if ( !target ) { @@ -420,7 +420,7 @@ void RecursiveLeafFlow( int leafnum, threaddata_t *thread, pstack_t *prevstack ) continue; // can't possibly see it } - // if the portal can't see anything we haven't allready seen, skip it + // if the portal can't see anything we haven't already seen, skip it if ( p->status == stat_done ) { test = (long *)p->portalvis; } @@ -611,7 +611,7 @@ void PortalFlow( int portalnum ){ for a portal to be visible to a passage, it must be on the front of - all seperating planes, and both portals must be behind the mew portal + all separating planes, and both portals must be behind the mew portal =============================================================================== */ diff --git a/tools/quake2/q2map/lightmap.c b/tools/quake2/q2map/lightmap.c index ae284a70..50fd329e 100644 --- a/tools/quake2/q2map/lightmap.c +++ b/tools/quake2/q2map/lightmap.c @@ -219,7 +219,7 @@ void TriEdge_r( triangulation_t *trian, triedge_t *e ){ triangle_t *nt; if ( e->tri ) { - return; // allready connected by someone + return; // already connected by someone } // find the point with the best angle @@ -1002,7 +1002,7 @@ skipadd: ; AddSampleToPatch Take the sample's collected light and - add it back into the apropriate patch + add it back into the appropriate patch for the radiosity pass. The sample is added to all patches that might include diff --git a/tools/quake2/q2map/main.c b/tools/quake2/q2map/main.c index 12cfa9ec..4bbeb3b4 100644 --- a/tools/quake2/q2map/main.c +++ b/tools/quake2/q2map/main.c @@ -158,7 +158,7 @@ int BSPInfo(){ /* ScaleBSPMain() - amaze and confuse your enemies with wierd scaled maps! + amaze and confuse your enemies with weird scaled maps! */ /* int ScaleBSPMain( int argc, char **argv ) diff --git a/tools/quake2/q2map/map.c b/tools/quake2/q2map/map.c index 0ac10960..bc6993cb 100644 --- a/tools/quake2/q2map/map.c +++ b/tools/quake2/q2map/map.c @@ -354,7 +354,7 @@ void AddBrushBevels( mapbrush_t *b ){ { for ( dir = -1 ; dir <= 1 ; dir += 2, order++ ) { - // see if the plane is allready present + // see if the plane is already present for ( i = 0, s = b->original_sides ; i < b->numsides ; i++,s++ ) { if ( mapplanes[s->planenum].normal[axis] == dir ) { @@ -446,7 +446,7 @@ void AddBrushBevels( mapbrush_t *b ){ // behind this plane, it is a proper edge bevel for ( k = 0 ; k < b->numsides ; k++ ) { - // if this plane has allready been used, skip it + // if this plane has already been used, skip it if ( PlaneEqual( &mapplanes[b->original_sides[k].planenum] , normal, dist ) ) { break; diff --git a/tools/quake2/q2map/patches.c b/tools/quake2/q2map/patches.c index acea436e..432a528e 100644 --- a/tools/quake2/q2map/patches.c +++ b/tools/quake2/q2map/patches.c @@ -60,7 +60,7 @@ void CalcTextureReflectivity_Quake2( void ){ for ( i = 0 ; i < numtexinfo ; i++ ) { - // see if an earlier texinfo allready got the value + // see if an earlier texinfo already got the value for ( j = 0 ; j < i ; j++ ) { if ( !strcmp( texinfo[i].texture, texinfo[j].texture ) ) { @@ -136,7 +136,7 @@ void CalcTextureReflectivity_Heretic2( void ){ for ( i = 0 ; i < numtexinfo ; i++ ) { - // see if an earlier texinfo allready got the value + // see if an earlier texinfo already got the value for ( j = 0 ; j < i ; j++ ) { if ( !strcmp( texinfo[i].texture, texinfo[j].texture ) ) { @@ -249,7 +249,7 @@ void BaseLightForFace( dface_t *f, vec3_t color ){ texinfo_t *tx; // - // check for light emited by texture + // check for light emitted by texture // tx = &texinfo[f->texinfo]; if ( !( tx->flags & SURF_LIGHT ) || tx->value == 0 ) { @@ -406,7 +406,7 @@ void MakePatches( void ){ } } - Sys_FPrintf( SYS_VRB, "%i sqaure feet\n", (int)( totalarea / 64 ) ); + Sys_FPrintf( SYS_VRB, "%i square feet\n", (int)( totalarea / 64 ) ); } /* diff --git a/tools/quake2/q2map/portals.c b/tools/quake2/q2map/portals.c index 1c83d75d..0013670d 100644 --- a/tools/quake2/q2map/portals.c +++ b/tools/quake2/q2map/portals.c @@ -187,7 +187,7 @@ int c_tinyportals; */ void AddPortalToNodes( portal_t *p, node_t *front, node_t *back ){ if ( p->nodes[0] || p->nodes[1] ) { - Error( "AddPortalToNode: allready included" ); + Error( "AddPortalToNode: already included" ); } p->nodes[0] = front; @@ -748,7 +748,7 @@ void FloodAreas_r( node_t *node ){ b = node->brushlist; e = &entities[b->original->entitynum]; - // if the current area has allready touched this + // if the current area has already touched this // portal, we are done if ( e->portalareas[0] == c_areas || e->portalareas[1] == c_areas ) { return; @@ -770,7 +770,7 @@ void FloodAreas_r( node_t *node ){ } if ( node->area ) { - return; // allready got it + return; // already got it } node->area = c_areas; @@ -806,7 +806,7 @@ void FindAreas_r( node_t *node ){ } if ( node->area ) { - return; // allready got it + return; // already got it } if ( node->contents & CONTENTS_SOLID ) { @@ -847,7 +847,7 @@ void SetAreaPortalAreas_r( node_t *node ){ if ( node->contents == CONTENTS_AREAPORTAL ) { if ( node->area ) { - return; // allready set + return; // already set } b = node->brushlist; diff --git a/tools/quake2/q2map/prtfile.c b/tools/quake2/q2map/prtfile.c index c15916b7..9f74da28 100644 --- a/tools/quake2/q2map/prtfile.c +++ b/tools/quake2/q2map/prtfile.c @@ -82,7 +82,7 @@ void WritePortalFile_r( node_t *node ){ // sometimes planes get turned around when they are very near // the changeover point between different axis. interpret the // plane the same way vis will, and flip the side orders if needed - // FIXME: is this still relevent? + // FIXME: is this still relevant? WindingPlane( w, normal, &dist ); if ( DotProduct( p->plane.normal, normal ) < 0.99 ) { // backwards... fprintf( pf,"%i %i %i ",w->numpoints, p->nodes[1]->cluster, p->nodes[0]->cluster ); diff --git a/tools/quake2/q2map/qbsp.c b/tools/quake2/q2map/qbsp.c index dab908c0..9a350c06 100644 --- a/tools/quake2/q2map/qbsp.c +++ b/tools/quake2/q2map/qbsp.c @@ -78,7 +78,7 @@ node_t *BlockTree( int xl, int yl, int xh, int yh ){ return node; } - // create a seperator along the largest axis + // create a separator along the largest axis node = AllocNode(); if ( xh - xl > yh - yl ) { // split x axis diff --git a/tools/quake2/q2map/qbsp.h b/tools/quake2/q2map/qbsp.h index 56ac1b2f..10fec15e 100644 --- a/tools/quake2/q2map/qbsp.h +++ b/tools/quake2/q2map/qbsp.h @@ -59,7 +59,7 @@ #define BOGUS_RANGE 8192 -#define TEXINFO_NODE -1 // side is allready on a node +#define TEXINFO_NODE -1 // side is already on a node typedef struct plane_s { @@ -88,7 +88,7 @@ typedef struct side_s int contents; // from miptex int surf; // from miptex qboolean visible; // choose visble planes first - qboolean tested; // this plane allready checked as a split + qboolean tested; // this plane already checked as a split qboolean bevel; // don't ever use for bsp splitting } side_t; diff --git a/tools/quake2/q2map/qrad.c b/tools/quake2/q2map/qrad.c index f18af843..0d91cf39 100644 --- a/tools/quake2/q2map/qrad.c +++ b/tools/quake2/q2map/qrad.c @@ -291,7 +291,7 @@ void MakeTransfers( int i ){ // // normalize all transfers so all of the light - // is transfered to the surroundings + // is transferred to the surroundings // t = patch->transfers; itotal = 0; diff --git a/tools/quake2/q2map/tree.c b/tools/quake2/q2map/tree.c index c73f6229..c0f728b7 100644 --- a/tools/quake2/q2map/tree.c +++ b/tools/quake2/q2map/tree.c @@ -152,7 +152,7 @@ void PrintTree_r( node_t *node, int depth ){ /* ========================================================= - NODES THAT DON'T SEPERATE DIFFERENT CONTENTS CAN BE PRUNED + NODES THAT DON'T SEPARATE DIFFERENT CONTENTS CAN BE PRUNED ========================================================= */ @@ -176,7 +176,7 @@ void PruneNodes_r( node_t *node ){ if ( ( node->children[0]->contents & CONTENTS_SOLID ) && ( node->children[1]->contents & CONTENTS_SOLID ) ) { if ( node->faces ) { - Error( "node->faces seperating CONTENTS_SOLID" ); + Error( "node->faces separating CONTENTS_SOLID" ); } if ( node->children[0]->faces || node->children[1]->faces ) { Error( "!node->faces with children" ); diff --git a/tools/quake2/q2map/writebsp.c b/tools/quake2/q2map/writebsp.c index c2f313a6..6d77ffba 100644 --- a/tools/quake2/q2map/writebsp.c +++ b/tools/quake2/q2map/writebsp.c @@ -38,7 +38,7 @@ int planeused[MAX_MAP_PLANES]; ============ EmitPlanes - There is no oportunity to discard planes, because all of the original + There is no opportunity to discard planes, because all of the original brushes will be saved in the map. ============ */ diff --git a/tools/quake2/qdata/images.c b/tools/quake2/qdata/images.c index ecbb7e2b..61ede3f7 100644 --- a/tools/quake2/qdata/images.c +++ b/tools/quake2/qdata/images.c @@ -294,7 +294,7 @@ void Cmd_Colormap( void ){ *lump_p++ = c; } -// 66% transparancy table +// 66% transparency table for ( l = 0; l < 255; l++ ) { for ( c = 0 ; c < 255 ; c++ ) diff --git a/tools/quake2/qdata/models.c b/tools/quake2/qdata/models.c index 95f167ea..95ecd153 100644 --- a/tools/quake2/qdata/models.c +++ b/tools/quake2/qdata/models.c @@ -301,7 +301,7 @@ void FinishModel( void ){ // finish writing header file H_printf( "\n" ); - // scale_up is usefull to allow step distances to be adjusted + // scale_up is useful to allow step distances to be adjusted H_printf( "#define MODEL_SCALE\t\t%f\n", scale_up ); fclose( headerouthandle ); @@ -796,7 +796,7 @@ char *FindFrameFile( char *frame ){ char *s; if ( strstr( frame, "." ) ) { - return frame; // allready in dot format + return frame; // already in dot format } // split 'run1' into 'run' and '1' diff --git a/tools/quake2/qdata/qdata.c b/tools/quake2/qdata/qdata.c index 56e7675b..3c4c7ed4 100644 --- a/tools/quake2/qdata/qdata.c +++ b/tools/quake2/qdata/qdata.c @@ -329,7 +329,7 @@ void ReleaseTexture( char *name ){ =============== Cmd_Maps - Only relevent for release and pak files. + Only relevant for release and pak files. Releases the .bsp files for the maps, and scans all of the files to build a list of all textures used, which are then released. =============== diff --git a/tools/quake2/qdata_heretic2/common/cmdlib.c b/tools/quake2/qdata_heretic2/common/cmdlib.c index b35afe39..c160ffc6 100644 --- a/tools/quake2/qdata_heretic2/common/cmdlib.c +++ b/tools/quake2/qdata_heretic2/common/cmdlib.c @@ -623,7 +623,7 @@ int LoadFile( const char *filename, void **bufferptr ){ ============== LoadFileBlock - - rounds up memory allocation to 4K boundry + rounds up memory allocation to 4K boundary - ============== */ diff --git a/tools/quake2/qdata_heretic2/common/inout.c b/tools/quake2/qdata_heretic2/common/inout.c index 2fa75543..c6d98677 100644 --- a/tools/quake2/qdata_heretic2/common/inout.c +++ b/tools/quake2/qdata_heretic2/common/inout.c @@ -267,7 +267,7 @@ void FPrintf( int flag, char *buf ){ return; } - // ouput an XML file of the run + // output an XML file of the run // use the DOM interface to build a tree /* diff --git a/tools/quake2/qdata_heretic2/common/qfiles.h b/tools/quake2/qdata_heretic2/common/qfiles.h index 7e68c6c4..942f9817 100644 --- a/tools/quake2/qdata_heretic2/common/qfiles.h +++ b/tools/quake2/qdata_heretic2/common/qfiles.h @@ -420,7 +420,7 @@ typedef struct } dplane_t; -// contents flags are seperate bits +// contents flags are separate bits // a given brush can contribute multiple content bits // multiple brushes can be in a single leaf diff --git a/tools/quake2/qdata_heretic2/common/scriplib.c b/tools/quake2/qdata_heretic2/common/scriplib.c index 925fcfd1..9bdc4fb8 100644 --- a/tools/quake2/qdata_heretic2/common/scriplib.c +++ b/tools/quake2/qdata_heretic2/common/scriplib.c @@ -159,7 +159,7 @@ qboolean EndOfScript( qboolean crossline ){ qboolean GetScriptToken( qboolean crossline ){ char *token_p; - if ( tokenready ) { // is a token allready waiting? + if ( tokenready ) { // is a token already waiting? tokenready = false; return true; } diff --git a/tools/quake2/qdata_heretic2/fmodels.c b/tools/quake2/qdata_heretic2/fmodels.c index c0329a65..b0a7dcad 100644 --- a/tools/quake2/qdata_heretic2/fmodels.c +++ b/tools/quake2/qdata_heretic2/fmodels.c @@ -1075,7 +1075,7 @@ void FMFinishModel( void ){ // finish writing header file H_printf( "\n" ); - // scale_up is usefull to allow step distances to be adjusted + // scale_up is useful to allow step distances to be adjusted H_printf( "#define MODEL_SCALE\t\t%f\n", scale_up ); // mesh nodes diff --git a/tools/quake2/qdata_heretic2/images.c b/tools/quake2/qdata_heretic2/images.c index b36adc75..204de365 100644 --- a/tools/quake2/qdata_heretic2/images.c +++ b/tools/quake2/qdata_heretic2/images.c @@ -756,7 +756,7 @@ void Cmd_Colormap( void ){ *lump_p++ = c; } -// 66% transparancy table +// 66% transparency table for ( l = 0; l < 255; l++ ) { for ( c = 0 ; c < 255 ; c++ ) diff --git a/tools/quake2/qdata_heretic2/models.c b/tools/quake2/qdata_heretic2/models.c index f5c55781..95d61ed2 100644 --- a/tools/quake2/qdata_heretic2/models.c +++ b/tools/quake2/qdata_heretic2/models.c @@ -588,7 +588,7 @@ void FinishModel( void ){ // finish writing header file H_printf( "\n" ); - // scale_up is usefull to allow step distances to be adjusted + // scale_up is useful to allow step distances to be adjusted H_printf( "#define MODEL_SCALE\t\t%f\n", scale_up ); fclose( headerouthandle ); @@ -1320,7 +1320,7 @@ char *FindFrameFile( char *frame ){ char *s; if ( strstr( frame, "." ) ) { - return frame; // allready in dot format + return frame; // already in dot format } // split 'run1' into 'run' and '1' diff --git a/tools/quake2/qdata_heretic2/qcommon/qfiles.h b/tools/quake2/qdata_heretic2/qcommon/qfiles.h index f787779c..5f4186a1 100644 --- a/tools/quake2/qdata_heretic2/qcommon/qfiles.h +++ b/tools/quake2/qdata_heretic2/qcommon/qfiles.h @@ -454,7 +454,7 @@ typedef struct } dplane_t; -// contents flags are seperate bits +// contents flags are separate bits // a given brush can contribute multiple content bits // multiple brushes can be in a single leaf diff --git a/tools/quake2/qdata_heretic2/qdata.c b/tools/quake2/qdata_heretic2/qdata.c index 80f8b4c2..95657aa9 100644 --- a/tools/quake2/qdata_heretic2/qdata.c +++ b/tools/quake2/qdata_heretic2/qdata.c @@ -319,7 +319,7 @@ void ReleaseTexture( char *name ){ =============== Cmd_Maps - Only relevent for release and pak files. + Only relevant for release and pak files. Releases the .bsp files for the maps, and scans all of the files to build a list of all textures used, which are then released. =============== @@ -430,7 +430,7 @@ void ParseScript( void ){ else if ( !strcmp( token, "$fm_frame" ) ) { MODELCMD_Frame( MODEL_FM ); } - else if ( !strcmp( token, "$fm_skeletal_frame" ) ) { // left in for compadibility with qdt already using fm_skeletal_frame + else if ( !strcmp( token, "$fm_skeletal_frame" ) ) { // left in for compatibility with qdt already using fm_skeletal_frame MODELCMD_Frame( MODEL_FM ); } else if ( !strcmp( token, "$fm_skin" ) ) { diff --git a/tools/quake2/qdata_heretic2/tmix.c b/tools/quake2/qdata_heretic2/tmix.c index 0f26438e..1b16489d 100644 --- a/tools/quake2/qdata_heretic2/tmix.c +++ b/tools/quake2/qdata_heretic2/tmix.c @@ -179,7 +179,7 @@ void RemoveExt( char *name ){ } /****************************************************/ -/* Misc calcualtions */ +/* Misc calculations */ /****************************************************/ int TotalArea(){ diff --git a/tools/quake3/common/cmdlib.cpp b/tools/quake3/common/cmdlib.cpp index c17d4722..15ac913c 100644 --- a/tools/quake3/common/cmdlib.cpp +++ b/tools/quake3/common/cmdlib.cpp @@ -21,7 +21,7 @@ // cmdlib.c // TTimo 09/30/2000 -// from an intial copy of common/cmdlib.c +// from an initial copy of common/cmdlib.c // stripped out the Sys_Printf Sys_Printf stuff // SPoG 05/27/2001 @@ -485,7 +485,7 @@ int LoadFile( const char *filename, void **bufferptr ){ ============== LoadFileBlock - - rounds up memory allocation to 4K boundry + rounds up memory allocation to 4K boundary - ============== */ diff --git a/tools/quake3/common/inout.cpp b/tools/quake3/common/inout.cpp index dbc57bc5..f3adbff3 100644 --- a/tools/quake3/common/inout.cpp +++ b/tools/quake3/common/inout.cpp @@ -345,7 +345,7 @@ void FPrintf( int flag, char *buf ){ return; } - // ouput an XML file of the run + // output an XML file of the run // use the DOM interface to build a tree /* diff --git a/tools/quake3/common/polylib.cpp b/tools/quake3/common/polylib.cpp index eed054c1..85c3eeb4 100644 --- a/tools/quake3/common/polylib.cpp +++ b/tools/quake3/common/polylib.cpp @@ -336,7 +336,7 @@ winding_t *BaseWindingForPlane( const Plane3f& plane ){ // LordHavoc: this has to use *2 because otherwise some created points may // be inside the world (think of a diagonal case), and any brush with such - // points should be removed, failure to detect such cases is disasterous + // points should be removed, failure to detect such cases is disastrous vup *= MAX_WORLD_COORD * 2; vright *= MAX_WORLD_COORD * 2; diff --git a/tools/quake3/common/qmath.h b/tools/quake3/common/qmath.h index 7bc9e96a..7918b597 100644 --- a/tools/quake3/common/qmath.h +++ b/tools/quake3/common/qmath.h @@ -301,7 +301,7 @@ inline void NormalToLatLong( const Vector3& normal, byte bytes[2] ) { const int b = radians_to_degrees( acos( normal[2] ) ) * ( 255.0 / 360.0 ); bytes[0] = b & 0xff; // longitude - bytes[1] = a & 0xff; // lattitude + bytes[1] = a & 0xff; // latitude } } diff --git a/tools/quake3/common/stringfixedsize.h b/tools/quake3/common/stringfixedsize.h index 1ed59ac9..d8dd134f 100644 --- a/tools/quake3/common/stringfixedsize.h +++ b/tools/quake3/common/stringfixedsize.h @@ -27,7 +27,7 @@ #include "cmdlib.h" -/// \brief A TextOutputStream which writes to a null terminated fixed lenght char array. +/// \brief A TextOutputStream which writes to a null terminated fixed length char array. /// Similar to std::stringstream. template class StringFixedSize : public TextOutputStream diff --git a/tools/quake3/common/surfaceflags.h b/tools/quake3/common/surfaceflags.h index e9f1b5cc..36a3eb70 100644 --- a/tools/quake3/common/surfaceflags.h +++ b/tools/quake3/common/surfaceflags.h @@ -23,7 +23,7 @@ // // This file must be identical in the quake and utils directories -// contents flags are seperate bits +// contents flags are separate bits // a given brush can contribute multiple content bits // these definitions also need to be in q_shared.h! diff --git a/tools/quake3/common/unzip.cpp b/tools/quake3/common/unzip.cpp index d941fc68..599ba145 100644 --- a/tools/quake3/common/unzip.cpp +++ b/tools/quake3/common/unzip.cpp @@ -1237,7 +1237,7 @@ static void zcfree OF((voidp opaque, voidp ptr)); /* =========================================================================== Read a byte from a gz_stream; update next_in and avail_in. Return EOF for end of file. - IN assertion: the stream s has been sucessfully opened for reading. + IN assertion: the stream s has been successfully opened for reading. */ /* @@ -1369,8 +1369,8 @@ static int strcmpcasenosensitive_internal (const char* fileName1,const char* fil /* Compare two filename (fileName1,fileName2). - If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp) - If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi + If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp) + If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi or strcasecmp) If iCaseSenisivity = 0, case sensitivity is defaut of your operating system (like 1 on Unix, 2 on Windows) @@ -2788,7 +2788,7 @@ extern int inflate_flush OF(( end-of-block. Note however that the static length tree defines 288 codes just to fill out the Huffman codes. Codes 286 and 287 cannot be used though, since there is no length base or extra bits - defined for them. Similarily, there are up to 30 distance codes. + defined for them. Similarly, there are up to 30 distance codes. However, static trees define 32 codes (all 5 bits) to fill out the Huffman codes, but the last two had better not show up in the data. 7. Unzip can check dynamic Huffman blocks for complete code sets. diff --git a/tools/quake3/common/unzip.h b/tools/quake3/common/unzip.h index 260d90d6..00af867e 100644 --- a/tools/quake3/common/unzip.h +++ b/tools/quake3/common/unzip.h @@ -170,8 +170,8 @@ extern int unzStringFileNameCompare( const char* fileName1, const char* fileName /* Compare two filename (fileName1,fileName2). - If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp) - If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi + If iCaseSenisivity = 1, comparison is case sensitivity (like strcmp) + If iCaseSenisivity = 2, comparison is not case sensitivity (like strcmpi or strcasecmp) If iCaseSenisivity = 0, case sensitivity is defaut of your operating system (like 1 on Unix, 2 on Windows) diff --git a/tools/quake3/q3data/images.cpp b/tools/quake3/q3data/images.cpp index a4ba4666..23cfbe9f 100644 --- a/tools/quake3/q3data/images.cpp +++ b/tools/quake3/q3data/images.cpp @@ -265,7 +265,7 @@ void Cmd_Colormap( void ){ *lump_p++ = c; } -// 66% transparancy table +// 66% transparency table for ( l = 0; l < 255; l++ ) { for ( c = 0 ; c < 255 ; c++ ) diff --git a/tools/quake3/q3data/oldstuff.cpp b/tools/quake3/q3data/oldstuff.cpp index 3ae9677c..2789b94c 100644 --- a/tools/quake3/q3data/oldstuff.cpp +++ b/tools/quake3/q3data/oldstuff.cpp @@ -111,7 +111,7 @@ const char *FindFrameFile( const char *frame ){ const char *s; if ( strchr( frame, '.' ) ) { - return frame; // allready in dot format + return frame; // already in dot format } // split 'run1' into 'run' and '1' diff --git a/tools/quake3/q3data/q3data.cpp b/tools/quake3/q3data/q3data.cpp index 923a7aa1..39b8f683 100644 --- a/tools/quake3/q3data/q3data.cpp +++ b/tools/quake3/q3data/q3data.cpp @@ -404,7 +404,7 @@ void ReleaseTexture( char *name ){ =============== Cmd_Maps - Only relevent for release and pak files. + Only relevant for release and pak files. Releases the .bsp files for the maps, and scans all of the files to build a list of all textures used, which are then released. =============== diff --git a/tools/quake3/q3map2/brush.cpp b/tools/quake3/q3map2/brush.cpp index d4db011e..7b83e1f4 100644 --- a/tools/quake3/q3map2/brush.cpp +++ b/tools/quake3/q3map2/brush.cpp @@ -778,7 +778,7 @@ node_t *AllocNode( void ){ WindingIsTiny Returns true if the winding would be crunched out of - existance by the vertex snapping. + existence by the vertex snapping. ================ */ #define EDGE_LENGTH 0.2 diff --git a/tools/quake3/q3map2/bsp.cpp b/tools/quake3/q3map2/bsp.cpp index 706dc653..2bd8d896 100644 --- a/tools/quake3/q3map2/bsp.cpp +++ b/tools/quake3/q3map2/bsp.cpp @@ -477,7 +477,7 @@ void ProcessWorldModel( void ){ } } - /* add references to the final drawsurfs in the apropriate clusters */ + /* add references to the final drawsurfs in the appropriate clusters */ FilterDrawsurfsIntoTree( e, tree ); /* match drawsurfaces back to original brushsides (sof2) */ @@ -561,7 +561,7 @@ void ProcessSubModel( void ){ FixMetaTJunctions(); MergeMetaTriangles(); - /* add references to the final drawsurfs in the apropriate clusters */ + /* add references to the final drawsurfs in the appropriate clusters */ FilterDrawsurfsIntoTree( e, tree ); /* match drawsurfaces back to original brushsides (sof2) */ diff --git a/tools/quake3/q3map2/changelog.q3map1 b/tools/quake3/q3map2/changelog.q3map1 index 21b0cb99..5a7fa1b8 100644 --- a/tools/quake3/q3map2/changelog.q3map1 +++ b/tools/quake3/q3map2/changelog.q3map1 @@ -70,7 +70,7 @@ Date Version Notes vlight to crash. 2001-12-27 1.2 (ydnar 13) Alpha - Fixed broken PVS check. - - Cheap now supresses sun + - Cheap now suppresses sun Sun trace skipped if sample is "cheapened." - Experimental -smooth @@ -272,7 +272,7 @@ Date Version Notes 2002-02-26 2.0.0-a10 thru a11 Adjacent coplanar surfaces now will share lightmaps. This prevents - most wierd edge cases with filter + most weird edge cases with filter and speeds things up a bit. Patches too. diff --git a/tools/quake3/q3map2/changelog.q3map2.txt b/tools/quake3/q3map2/changelog.q3map2.txt index d58c0242..7419b169 100644 --- a/tools/quake3/q3map2/changelog.q3map2.txt +++ b/tools/quake3/q3map2/changelog.q3map2.txt @@ -200,7 +200,7 @@ Q3Map2 Version History + Changelog (Reverse Chronological Order) 2.5.5 - New: -scale N.N mode to scale the BSP -- New: -light -lomem switch to supress trace BSP optimization. This +- New: -light -lomem switch to suppress trace BSP optimization. This feature trades lighting performance for decreased memory usage - New: Added negative light support (note: will not darken below _minlight value) might screw up radiosity, haven't tested much. Should work with entity @@ -210,7 +210,7 @@ Q3Map2 Version History + Changelog (Reverse Chronological Order) RTCW, ET, EF. Only works with lightmapped surfaces, use with care - Fixed long standing terrain texturing bug, should produce exact desired results all of the time now. May require fixing alphamaps that were - kludged together to accomodate this bug on existing maps + kludged together to accommodate this bug on existing maps - Fixed bug (huh, wtf) causing misc_model surfaces to not be fogged - Fixed bug where fog brushes wouldn't fog surfaces if a global map fog shader was present @@ -535,7 +535,7 @@ TODO Known issues: - Lightmap projection and surface merging on large ASE models sometimes flakes -- Surface to brush surfaceparm propogation doesn't work properly with large +- Surface to brush surfaceparm propagation doesn't work properly with large metasurfaces: http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=654 @@ -553,7 +553,7 @@ Known issues: Note: This only matters in SOF2/JK2 now. Make a light targetted (a spotlight) to get it to aim the correct direction, otherwise it defaults to pointing downward. You cannot have omnidirectional flares -- Lightgrid size is automatically increased to accomodate large maps. The +- Lightgrid size is automatically increased to accommodate large maps. The MAX_MAP_LIGHTGRID error will never happen again diff --git a/tools/quake3/q3map2/convert_bsp.cpp b/tools/quake3/q3map2/convert_bsp.cpp index 30cfc888..c0fd5334 100644 --- a/tools/quake3/q3map2/convert_bsp.cpp +++ b/tools/quake3/q3map2/convert_bsp.cpp @@ -391,7 +391,7 @@ static void ExtrapolateTexcoords( const float *axyz, const float *ast, /* ScaleBSPMain() - amaze and confuse your enemies with wierd scaled maps! + amaze and confuse your enemies with weird scaled maps! */ int ScaleBSPMain( int argc, char **argv ){ diff --git a/tools/quake3/q3map2/fog.cpp b/tools/quake3/q3map2/fog.cpp index d483043c..d29a4129 100644 --- a/tools/quake3/q3map2/fog.cpp +++ b/tools/quake3/q3map2/fog.cpp @@ -282,7 +282,7 @@ bool ChopPatchSurfaceByBrush( entity_t *e, mapDrawSurface_t *ds, brush_t *b ){ } } - /* all of outside fragments become seperate drawsurfs */ + /* all of outside fragments become separate drawsurfs */ numFogPatchFragments += numOutside; for ( i = 0; i < numOutside; i++ ) { @@ -423,7 +423,7 @@ bool ChopFaceSurfaceByBrush( entity_t *e, mapDrawSurface_t *ds, brush_t *b ){ /* fixme: celshaded surface fragment errata */ - /* all of outside fragments become seperate drawsurfs */ + /* all of outside fragments become separate drawsurfs */ numFogFragments += numOutside; s = ds->sideRef->side; for ( i = 0; i < numOutside; i++ ) diff --git a/tools/quake3/q3map2/light.cpp b/tools/quake3/q3map2/light.cpp index 9ece3699..a755e3be 100644 --- a/tools/quake3/q3map2/light.cpp +++ b/tools/quake3/q3map2/light.cpp @@ -208,7 +208,7 @@ void CreateEntityLights( void ){ const entity_t *e, *e2; - /* go throught entity list and find lights */ + /* go through entity list and find lights */ for ( std::size_t i = 0; i < entities.size(); ++i ) { /* get entity */ @@ -493,7 +493,7 @@ void CreateSurfaceLights( void ){ clipWork_t cw; - /* get sun shader supressor */ + /* get sun shader suppressor */ const bool nss = entities[ 0 ].boolForKey( "_noshadersun" ); /* walk the list of surfaces */ diff --git a/tools/quake3/q3map2/light_bounce.cpp b/tools/quake3/q3map2/light_bounce.cpp index de44bb49..1999a606 100644 --- a/tools/quake3/q3map2/light_bounce.cpp +++ b/tools/quake3/q3map2/light_bounce.cpp @@ -290,7 +290,7 @@ static void RadSample( int lightmapNum, bspDrawSurface_t *ds, rawLightmap_t *lm, rv[ 1 ] = &rw->verts[ v ]; rv[ 2 ] = &rw->verts[ v + 1 ]; - /* this code is embarassing (really should just rasterize the triangle) */ + /* this code is embarrassing (really should just rasterize the triangle) */ for ( i = 1; i < SAMPLE_GRANULARITY && samples < MAX_SAMPLES; i++ ) { for ( j = 1; j < SAMPLE_GRANULARITY && samples < MAX_SAMPLES; j++ ) diff --git a/tools/quake3/q3map2/light_ydnar.cpp b/tools/quake3/q3map2/light_ydnar.cpp index 81ea782f..9bdf36dc 100644 --- a/tools/quake3/q3map2/light_ydnar.cpp +++ b/tools/quake3/q3map2/light_ydnar.cpp @@ -1589,7 +1589,7 @@ static bool SubmapRawLuxel( const rawLightmap_t *lm, int x, int y, float bx, flo Vector3 originVecs[ 2 ]; - /* calulate x vector */ + /* calculate x vector */ if ( ( x < ( lm->sw - 1 ) && bx >= 0.0f ) || ( x == 0 && bx <= 0.0f ) ) { origin = &lm->getSuperOrigin( x, y ); //% normal = SUPER_NORMAL( x, y ); @@ -1610,7 +1610,7 @@ static bool SubmapRawLuxel( const rawLightmap_t *lm, int x, int y, float bx, flo originVecs[ 0 ] = *origin2 - *origin; //% VectorSubtract( normal2, normal, normalVecs[ 0 ] ); - /* calulate y vector */ + /* calculate y vector */ if ( ( y < ( lm->sh - 1 ) && bx >= 0.0f ) || ( y == 0 && bx <= 0.0f ) ) { origin = &lm->getSuperOrigin( x, y ); //% normal = SUPER_NORMAL( x, y ); diff --git a/tools/quake3/q3map2/map.cpp b/tools/quake3/q3map2/map.cpp index 09ac5df0..67723ff3 100644 --- a/tools/quake3/q3map2/map.cpp +++ b/tools/quake3/q3map2/map.cpp @@ -594,7 +594,7 @@ void AddBrushBevels( void ){ order = 0; for ( axis = 0; axis < 3; axis++ ) { for ( dir = -1; dir <= 1; dir += 2, order++ ) { - // see if the plane is allready present + // see if the plane is already present for ( i = 0, s = buildBrush->sides; i < buildBrush->numsides; i++, s++ ) { /* ydnar: testing disabling of mre code */ @@ -727,7 +727,7 @@ void AddBrushBevels( void ){ // behind this plane, it is a proper edge bevel for ( k = 0; k < buildBrush->numsides; k++ ) { - // if this plane has allready been used, skip it + // if this plane has already been used, skip it if ( PlaneEqual( mapplanes[buildBrush->sides[k].planenum], plane ) ) { if( buildBrush->sides[k].bevel ){ /* handle bevel surfaceflags */ buildBrush->sides[k].surfaceFlags |= ( s->surfaceFlags & surfaceFlagsMask ); @@ -1003,7 +1003,7 @@ void QuakeTextureVecs( const plane_t& plane, float shift[ 2 ], float rotate, flo added exclusive brush primitive parsing Timo - 08/08/99 support for old brush format back in - NOTE: it would be "cleaner" to have seperate functions to parse between old and new brushes + NOTE: it would be "cleaner" to have separate functions to parse between old and new brushes */ static void ParseRawBrush( bool onlyLights ){ diff --git a/tools/quake3/q3map2/portals.cpp b/tools/quake3/q3map2/portals.cpp index 9769c5ad..a9ab8cf9 100644 --- a/tools/quake3/q3map2/portals.cpp +++ b/tools/quake3/q3map2/portals.cpp @@ -99,7 +99,7 @@ int c_badportals; /* ydnar */ */ void AddPortalToNodes( portal_t *p, node_t *front, node_t *back ){ if ( p->nodes[0] || p->nodes[1] ) { - Error( "AddPortalToNode: allready included" ); + Error( "AddPortalToNode: already included" ); } p->nodes[0] = front; diff --git a/tools/quake3/q3map2/prtfile.cpp b/tools/quake3/q3map2/prtfile.cpp index bddc899a..dba58d23 100644 --- a/tools/quake3/q3map2/prtfile.cpp +++ b/tools/quake3/q3map2/prtfile.cpp @@ -129,7 +129,7 @@ void WritePortalFile_r( node_t *node ){ // sometimes planes get turned around when they are very near // the changeover point between different axis. interpret the // plane the same way vis will, and flip the side orders if needed - // FIXME: is this still relevent? + // FIXME: is this still relevant? if ( vector3_dot( p->plane.normal(), WindingPlane( w ).normal() ) < 0.99 ) { // backwards... fprintf( pf, "%i %i %i ", w->numpoints, p->nodes[1]->cluster, p->nodes[0]->cluster ); } diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h index 47050a9e..10f0f951 100644 --- a/tools/quake3/q3map2/q3map2.h +++ b/tools/quake3/q3map2/q3map2.h @@ -195,7 +195,7 @@ enum class EBrushType /* vis */ #define VIS_HEADER_SIZE 8 -#define SEPERATORCACHE /* seperator caching helps a bit */ +#define SEPERATORCACHE /* separator caching helps a bit */ #define PORTALFILE "PRT1" @@ -2408,7 +2408,7 @@ Q_EXTERN int numBSPLightmaps Q_ASSIGN( 0 ); Q_EXTERN int numExtLightmaps Q_ASSIGN( 0 ); Q_EXTERN outLightmap_t *outLightmaps Q_ASSIGN( NULL ); -/* vortex: per surface floodlight statictics */ +/* vortex: per surface floodlight statistics */ Q_EXTERN int numSurfacesFloodlighten Q_ASSIGN( 0 ); /* grid points */ diff --git a/tools/quake3/q3map2/surface.cpp b/tools/quake3/q3map2/surface.cpp index 214ebefa..96973422 100644 --- a/tools/quake3/q3map2/surface.cpp +++ b/tools/quake3/q3map2/surface.cpp @@ -3008,7 +3008,7 @@ int AddSurfaceModelsToTriangle_r( mapDrawSurface_t *ds, const surfaceModel_t& mo /* translate */ matrix4_translate_by_vec3( transform, origin ); - /* tranform into axis space */ + /* transform into axis space */ matrix4_multiply_by_matrix4( transform, temp ); } @@ -3281,7 +3281,7 @@ static void VolumeColorMods( entity_t *e, mapDrawSurface_t *ds ){ /* FilterDrawsurfsIntoTree() upon completion, all drawsurfs that actually generate a reference - will have been emited to the bspfile arrays, and the references + will have been emitted to the bspfile arrays, and the references will have valid final indexes */ @@ -3500,5 +3500,5 @@ void FilterDrawsurfsIntoTree( entity_t *e, tree_t *tree ){ for ( std::size_t i = 0; i < ARRAY_SIZE( numSurfacesByType ); i++ ) Sys_FPrintf( SYS_VRB, "%9d %s surfaces\n", numSurfacesByType[ i ], surfaceTypeName( static_cast( i ) ) ); - Sys_FPrintf( SYS_VRB, "%9d redundant indexes supressed, saving %d Kbytes\n", numRedundantIndexes, ( numRedundantIndexes * 4 / 1024 ) ); + Sys_FPrintf( SYS_VRB, "%9d redundant indexes suppressed, saving %d Kbytes\n", numRedundantIndexes, ( numRedundantIndexes * 4 / 1024 ) ); } diff --git a/tools/quake3/q3map2/visflow.cpp b/tools/quake3/q3map2/visflow.cpp index 9f806ea5..2abc6a60 100644 --- a/tools/quake3/q3map2/visflow.cpp +++ b/tools/quake3/q3map2/visflow.cpp @@ -45,7 +45,7 @@ for p2 = all other portals in leaf get sperating planes for all portals that might be seen by p2 - mark as unseen if not present in seperating plane + mark as unseen if not present in separating plane flood fill a new mightsee save as passagemightsee @@ -109,7 +109,7 @@ void FreeStackWinding( fixedWinding_t *w, pstack_t *stack ){ } if ( stack->freewindings[i] ) { - Error( "FreeStackWinding: allready free" ); + Error( "FreeStackWinding: already free" ); } stack->freewindings[i] = 1; } @@ -226,7 +226,7 @@ fixedWinding_t *VisChopWinding( fixedWinding_t *in, pstack_t *stack, const visP Source, pass, and target are an ordering of portals. - Generates seperating planes canidates by taking two points from source and one + Generates separating planes canidates by taking two points from source and one point from pass, and clips target by them. If target is totally clipped away, that portal can not be seen through. @@ -259,7 +259,7 @@ fixedWinding_t *ClipToSeperators( fixedWinding_t *source, fixedWinding_t *pass, } // - // find out which side of the generated seperating plane has the + // find out which side of the generated separating plane has the // source portal // #if 1 @@ -296,7 +296,7 @@ fixedWinding_t *ClipToSeperators( fixedWinding_t *source, fixedWinding_t *pass, #if 1 // // if all of the pass portal points are now on the positive side, - // this is the seperating plane + // this is the separating plane // counts[0] = counts[1] = counts[2] = 0; for ( k = 0 ; k < pass->numpoints ; k++ ) @@ -316,11 +316,11 @@ fixedWinding_t *ClipToSeperators( fixedWinding_t *source, fixedWinding_t *pass, } } if ( k != pass->numpoints ) { - continue; // points on negative side, not a seperating plane + continue; // points on negative side, not a separating plane } if ( !counts[0] ) { - continue; // planar with seperating plane + continue; // planar with separating plane } #else k = ( j + 1 ) % pass->numpoints; @@ -349,17 +349,17 @@ fixedWinding_t *ClipToSeperators( fixedWinding_t *source, fixedWinding_t *pass, #endif //MrE: fast check first d = plane3_distance_to_point( plane, stack->portal->origin ); - //if completely at the back of the seperator plane + //if completely at the back of the separator plane if ( d < -stack->portal->radius ) { return NULL; } - //if completely on the front of the seperator plane + //if completely on the front of the separator plane if ( d > stack->portal->radius ) { break; } // - // clip target by the seperating plane + // clip target by the separating plane // target = VisChopWinding( target, stack, plane ); if ( !target ) { @@ -442,7 +442,7 @@ void RecursiveLeafFlow( int leafnum, threaddata_t *thread, pstack_t *prevstack ) continue; // can't possibly see it } - // if the portal can't see anything we haven't allready seen, skip it + // if the portal can't see anything we haven't already seen, skip it if ( p->status == EVStatus::Done ) { test = (long *)p->portalvis; } @@ -1144,7 +1144,7 @@ int AddSeperators( fixedWinding_t *source, fixedWinding_t *pass, bool flipclip, } // - // find out which side of the generated seperating plane has the + // find out which side of the generated separating plane has the // source portal // #if 1 @@ -1181,7 +1181,7 @@ int AddSeperators( fixedWinding_t *source, fixedWinding_t *pass, bool flipclip, #if 1 // // if all of the pass portal points are now on the positive side, - // this is the seperating plane + // this is the separating plane // counts[0] = counts[1] = counts[2] = 0; for ( k = 0 ; k < pass->numpoints ; k++ ) @@ -1201,11 +1201,11 @@ int AddSeperators( fixedWinding_t *source, fixedWinding_t *pass, bool flipclip, } } if ( k != pass->numpoints ) { - continue; // points on negative side, not a seperating plane + continue; // points on negative side, not a separating plane } if ( !counts[0] ) { - continue; // planar with seperating plane + continue; // planar with separating plane } #else k = ( j + 1 ) % pass->numpoints; @@ -1305,19 +1305,19 @@ void CreatePassages( int portalnum ){ } for ( k = 0; k < numseperators; k++ ) { - //if completely at the back of the seperator plane + //if completely at the back of the separator plane if ( plane3_distance_to_point( seperators[k], p->origin ) < -p->radius + ON_EPSILON ) { break; } w = p->winding; for ( n = 0; n < w->numpoints; n++ ) { - //if at the front of the seperator + //if at the front of the separator if ( plane3_distance_to_point( seperators[k], w->points[n] ) > ON_EPSILON ) { break; } } - //if no points are at the front of the seperator + //if no points are at the front of the separator if ( n >= w->numpoints ) { break; } @@ -1430,7 +1430,7 @@ void PassageMemory( void ){ for a portal to be visible to a passage, it must be on the front of - all seperating planes, and both portals must be behind the new portal + all separating planes, and both portals must be behind the new portal =============================================================================== */ diff --git a/tools/quake3/q3map2/writebsp.cpp b/tools/quake3/q3map2/writebsp.cpp index 595c0e1f..1c943102 100644 --- a/tools/quake3/q3map2/writebsp.cpp +++ b/tools/quake3/q3map2/writebsp.cpp @@ -106,7 +106,7 @@ int EmitShader( const char *shader, int *contentFlags, int *surfaceFlags ){ /* EmitPlanes() - there is no oportunity to discard planes, because all of the original + there is no opportunity to discard planes, because all of the original brushes will be saved in the map */ diff --git a/uncrustify.cfg b/uncrustify.cfg index 4951686b..cda2ba34 100644 --- a/uncrustify.cfg +++ b/uncrustify.cfg @@ -208,10 +208,10 @@ sp_before_semi = ignore # ignore/add/remove/force # Add or remove space before ';' in non-empty 'for' statements sp_before_semi_for = ignore # ignore/add/remove/force -# Add or remove space before a semicolon of an empty part of a for statment. +# Add or remove space before a semicolon of an empty part of a for statement. sp_before_semi_for_empty = ignore # ignore/add/remove/force -# Add or remove space after the final semicolon of an empty part of a for statment: for ( ; ; ). +# Add or remove space after the final semicolon of an empty part of a for statement: for ( ; ; ). sp_after_semi_for_empty = ignore # ignore/add/remove/force # Add or remove space before '[' (except '[]') @@ -790,7 +790,7 @@ mod_full_brace_do = ignore # ignore/add/remove/force # Add or remove braces on single-line 'for' statement mod_full_brace_for = ignore # ignore/add/remove/force -# Add or remove braces on single-line function defintions. (Pawn) +# Add or remove braces on single-line function definitions. (Pawn) mod_full_brace_function = ignore # ignore/add/remove/force # Add or remove braces on single-line 'if' statement @@ -870,16 +870,16 @@ cmt_sp_before_star_cont = 0 # number cmt_sp_after_star_cont = 0 # number # The filename that contains text to insert at the head of a file if the file doesn't start with a C/C++ comment. -# Will substitue $(filename) with the current file's name. +# Will substitute $(filename) with the current file's name. cmt_insert_file_header = "" # string -# The filename that contains text to insert before a function implementation if the function isn't preceeded with a C/C++ comment. -# Will substitue $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. +# The filename that contains text to insert before a function implementation if the function isn't preceded with a C/C++ comment. +# Will substitute $(function) with the function name and $(javaparam) with the javadoc @param and @return stuff. # Will also substitute $(fclass) with the class name: void CFoo::Bar() { ... } cmt_insert_func_header = "" # string -# The filename that contains text to insert before a class if the class isn't preceeded with a C/C++ comment. -# Will substitue $(class) with the class name. +# The filename that contains text to insert before a class if the class isn't preceded with a C/C++ comment. +# Will substitute $(class) with the class name. cmt_insert_class_header = "" # string #