diff --git a/CHANGELOG.md b/CHANGELOG.md index b22ad49f..7e34ad57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,7 +40,7 @@ Descent 3 now runs on 64-bit Linux, Windows and MacOS using SDL2, on AMD64 as we - Modernize build system: require CMake 3.20, use present-day CMake practices (#20, #63, #77, #86, #99, #104, #127, #131, #144, #220, #225, #227, #235, #256, #318, #340, #400, #407, #422, #460, #463, #482, #504) - Ensure compatibility with popular compilers, convert misc. pieces of code to modern C++ (#17, #20, #23, #40, #54, #58, #70, #108, #304, #328, #344, #358, #388, #405, #416) - Mark relevant variables and functions as static (#185) - - Update the module system: isolate code for independant sub-modules in separate directories and CMake targets (#76, #89, #91, #195, #367, #374, #448, #470, #502) + - Update the module system: isolate code for independent sub-modules in separate directories and CMake targets (#76, #89, #91, #195, #367, #374, #448, #470, #502) - Document build procedure and usage on all platforms (#116, #118, #119, #124, #147, #154, #170, #174, #175, #184, #190, #204, #210, #211, #222, #259, #261, #270, #285, #297, #384, #413, #435) - Unifiy Windows & Unix command line arguments: --foo, -foo and +foo is accepted on any OS (#199) - Refactor CleanupStr in misc/pstring.cpp (#207) @@ -89,4 +89,4 @@ Descent 3 now runs on 64-bit Linux, Windows and MacOS using SDL2, on AMD64 as we - DDAccess.h header and access ring definitions (#342) - DMFC_DLL definition (#441) - Misc. removal of unfinished or unused code (#21, #55, #189, #197, #234, #245, #299, #303, #334, #396, #408) - \ No newline at end of file + diff --git a/Descent3/AImain.cpp b/Descent3/AImain.cpp index 6ecaf9ff..b0446218 100644 --- a/Descent3/AImain.cpp +++ b/Descent3/AImain.cpp @@ -1048,7 +1048,7 @@ * other. I found a temp solution * * 157 5/26/98 9:45a Chris - * DIstance and vec_to_target are independant + * DIstance and vec_to_target are independent * * 156 5/26/98 9:34a Chris * Added XZ distances for circle dist. :) @@ -1219,7 +1219,7 @@ * added some soar_helpers and some debug mprintf's * * 100 3/23/98 10:01a Chris - * Added independant wb animations + * Added independent wb animations * * 99 3/17/98 11:27a Chris * Added object bump notifies for AI @@ -6226,7 +6226,7 @@ void AIDoFrame(object *obj) { speed = vm_GetMagnitude(&obj->mtype.phys_info.velocity); - // Removes the framerate independance from objects moving within 2x of there normal max speed + // Removes the framerate independence from objects moving within 2x of there normal max speed if (speed > 0.1f && speed <= ai_info->max_velocity * 2.0) { if (obj->mtype.phys_info.drag > 0.0f && obj->mtype.phys_info.mass > 0.0f) { obj->mtype.phys_info.flags |= PF_USES_THRUST; diff --git a/Descent3/BOA.cpp b/Descent3/BOA.cpp index e33ab510..fcc8a943 100644 --- a/Descent3/BOA.cpp +++ b/Descent3/BOA.cpp @@ -2234,7 +2234,7 @@ void ComputeAABB(bool f_full) { } } - // Determine number of independant structures and classify each face + // Determine number of independent structures and classify each face for (i = 0; i <= Highest_room_index; i++) { if (Rooms[i].used) { room *rp = &Rooms[i]; diff --git a/Descent3/aistruct.h b/Descent3/aistruct.h index 8b48ab68..54b773ec 100644 --- a/Descent3/aistruct.h +++ b/Descent3/aistruct.h @@ -274,7 +274,7 @@ * version 1.0 of the new AI ranged firing code. * * 37 3/23/98 10:03a Chris - * Added independant wb animations + * Added independent wb animations * * 36 3/17/98 12:14p Chris * Fixed bug with bumping player causing awareness diff --git a/Descent3/damage.cpp b/Descent3/damage.cpp index 19ecb6de..49cc7658 100644 --- a/Descent3/damage.cpp +++ b/Descent3/damage.cpp @@ -120,7 +120,7 @@ * flag in the dying info. * * 138 4/21/99 12:40p Jason - * made explosion system framerate independant + * made explosion system framerate independent * * 137 4/21/99 12:22p Matt * Added extra time to delay-from-anim time to allow object to finish its diff --git a/Descent3/fireball.cpp b/Descent3/fireball.cpp index 115b1da5..a456d8e3 100644 --- a/Descent3/fireball.cpp +++ b/Descent3/fireball.cpp @@ -116,7 +116,7 @@ * flag in the dying info. * * 214 4/21/99 12:41p Jason - * make explosion system framerate independant + * make explosion system framerate independent * * 213 4/21/99 11:05a Kevin * new ps_rand and ps_srand to replace rand & srand diff --git a/Descent3/terrainrender.cpp b/Descent3/terrainrender.cpp index 52cada57..7d2a8500 100644 --- a/Descent3/terrainrender.cpp +++ b/Descent3/terrainrender.cpp @@ -379,7 +379,7 @@ * Added an editor bool to skip Terrain object rendering * * 125 3/26/98 10:54a Jason - * tweaked some stuff for size independant terrain + * tweaked some stuff for size independent terrain * * 124 3/17/98 5:02p Jason * sped up rendering the terrain from the mine by a large amount diff --git a/Descent3/vclip.cpp b/Descent3/vclip.cpp index ca5933dd..cdde06b1 100644 --- a/Descent3/vclip.cpp +++ b/Descent3/vclip.cpp @@ -113,7 +113,7 @@ * Saves us alot of memory * * 14 5/08/97 1:16p Jason - * made ChangeEndName work with device independant calls + * made ChangeEndName work with device independent calls * * 13 5/01/97 1:05p Mark * FROM JASON: Fixed stupid =/== bug in vclip loading diff --git a/bitmap/bitmain.cpp b/bitmap/bitmain.cpp index 34b7a7e1..a46c70c6 100644 --- a/bitmap/bitmain.cpp +++ b/bitmap/bitmain.cpp @@ -260,7 +260,7 @@ * Saves us alot of memory * * 41 5/08/97 1:16p Jason - * made ChangeEndName work with device independant calls + * made ChangeEndName work with device independent calls * * 40 5/02/97 5:22p Jason * added bm_rowsize to return bytes per row diff --git a/editor/RobotEditWeaponsDialog.cpp b/editor/RobotEditWeaponsDialog.cpp index 656d3bf7..490769a4 100644 --- a/editor/RobotEditWeaponsDialog.cpp +++ b/editor/RobotEditWeaponsDialog.cpp @@ -71,7 +71,7 @@ * I added support of random next firing masks * * 19 3/23/98 10:03a Chris - * Added independant wb animations + * Added independent wb animations * * 18 2/09/98 11:12a Chris * Allowed for the edititng of multiple weapon batteries diff --git a/lib/object_external_struct.h b/lib/object_external_struct.h index 85104619..095c6da4 100644 --- a/lib/object_external_struct.h +++ b/lib/object_external_struct.h @@ -33,7 +33,7 @@ * Deleted sounds array from the object struct, since it was never used. * * 17 4/21/99 12:41p Jason - * make explosion system framerate independant + * make explosion system framerate independent * * 16 4/18/99 8:13p Chris * Fixed the floating flare problems (where windows where broken out and diff --git a/lib/win/wincontroller.h b/lib/win/wincontroller.h index f74a991a..c00a7a35 100644 --- a/lib/win/wincontroller.h +++ b/lib/win/wincontroller.h @@ -47,7 +47,7 @@ * get_mouse_raw_values now returns screen coords, not deltas. * * 21 4/24/99 5:39p Samir - * mouse control now framerate independant. + * mouse control now framerate independent. * * 20 4/16/99 2:02p Kevin * Added mouselook support diff --git a/manage/generic.cpp b/manage/generic.cpp index d6131570..84916896 100644 --- a/manage/generic.cpp +++ b/manage/generic.cpp @@ -229,7 +229,7 @@ * added memory lib * * 39 3/23/98 10:03a Chris - * Added independant wb animations + * Added independent wb animations * * 38 3/13/98 5:55p Chris * Added the new collision spheres diff --git a/manage/manage.cpp b/manage/manage.cpp index ade285d9..0c909401 100644 --- a/manage/manage.cpp +++ b/manage/manage.cpp @@ -373,7 +373,7 @@ * correctly in init local table files * * 40 5/13/97 3:41p Jason - * made all manage code work with the new device independant database + * made all manage code work with the new device independent database * * 39 5/08/97 12:41p Jason * made manage system work with device dependant path names diff --git a/model/polymodel.cpp b/model/polymodel.cpp index eedcd731..2542b8b8 100644 --- a/model/polymodel.cpp +++ b/model/polymodel.cpp @@ -266,7 +266,7 @@ * added assert * * 78 3/23/98 10:03a Chris - * Added independant wb animations + * Added independent wb animations * * 77 3/19/98 4:30p Samir * added ability to mark subobjects as layered. @@ -545,7 +545,7 @@ * fixed bug with animation rotation keyframes * * 21 5/08/97 1:16p Jason - * made ChangeEndName work with device independant calls + * made ChangeEndName work with device independent calls * * 20 4/30/97 5:43p Jason * remap polymodels when pagefile is done loading diff --git a/model/polymodel.h b/model/polymodel.h index 8c19e920..cb83e771 100644 --- a/model/polymodel.h +++ b/model/polymodel.h @@ -165,7 +165,7 @@ * upped polyvecs for that fucker brent * * 41 3/23/98 10:03a Chris - * Added independant wb animations + * Added independent wb animations * * 40 3/19/98 4:30p Samir * added ability to mark subobjects as layered. diff --git a/physics/findintersection.cpp b/physics/findintersection.cpp index 585cc6f4..2144bcb8 100644 --- a/physics/findintersection.cpp +++ b/physics/findintersection.cpp @@ -1091,8 +1091,8 @@ static const int ij_table[3][2] = { // see if a point in inside a face by projecting into 2d uint32_t check_point_to_face(vector *colp, vector *face_normal, int nv, vector **vertex_ptr_list) { - vector_array *colp_array; // Axis-independant version of the collision point - vector_array *norm; // Axis-independant version of the plane's normal + vector_array *colp_array; // Axis-independent version of the collision point + vector_array *norm; // Axis-independent version of the plane's normal vector t; // Temporary vector that holds the magnatude of the normal's x,y,z components (ABS) int biggest; // Index of the largest of the three components (0-x, 1-y, 2-z) Axis to ignore :) int i, j, edge; // Index for i-axis, Index for j-axis, and the current edge diff --git a/sndlib/ddsoundload.cpp b/sndlib/ddsoundload.cpp index e7201a02..55dc55c1 100644 --- a/sndlib/ddsoundload.cpp +++ b/sndlib/ddsoundload.cpp @@ -41,7 +41,7 @@ * B.A. Macintosh code merge * * 13 4/17/99 1:53a Jeff - * made platform 'independant' so other low-level sound libs can include + * made platform 'independent' so other low-level sound libs can include * without having to double code * * 12 4/06/99 8:29p Samir diff --git a/sndlib/hlsoundlib.cpp b/sndlib/hlsoundlib.cpp index 19d00008..b21b0115 100644 --- a/sndlib/hlsoundlib.cpp +++ b/sndlib/hlsoundlib.cpp @@ -442,7 +442,7 @@ * * $NoKeywords: $ */ -// High level sound object. This code is 100% machine independant and +// High level sound object. This code is 100% machine independent and // completely encapsulates the lowel-level machine-dependant sound code. #include @@ -568,7 +568,7 @@ void hlsSystem::KillSoundLib(bool f_kill_sound_list) { delete m_ll_sound_ptr; m_ll_sound_ptr = NULL; } - // This is independant of the actual sound_lib status. It happened because sounds + // This is independent of the actual sound_lib status. It happened because sounds // use the manage system. // moved this from beginning of function because won't the data freed here screw up streaming/looping sounds? // before the sound library is closed? diff --git a/sndlib/hlsoundlib.h b/sndlib/hlsoundlib.h index 6c65b8d9..d1e3ee39 100644 --- a/sndlib/hlsoundlib.h +++ b/sndlib/hlsoundlib.h @@ -22,7 +22,7 @@ * $Date: 3/20/00 12:26p $ * $Author: Matt $ * - * Descent III Device-independant sound library + * Descent III Device-independent sound library * * $Log: /DescentIII/Main/lib/hlsoundlib.h $ * diff --git a/win32/WinController.cpp b/win32/WinController.cpp index 053d88dd..e427a831 100644 --- a/win32/WinController.cpp +++ b/win32/WinController.cpp @@ -96,7 +96,7 @@ * get_mouse_raw_values now returns screen coords, not deltas. * * 60 4/24/99 5:39p Samir - * mouse control now framerate independant. + * mouse control now framerate independent. * * 59 4/21/99 10:58a Samir * set sensitivity for all controllers, not just active ones.