Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a bunch of spellos in comments and strings #567

Merged
merged 14 commits into from
Sep 7, 2024
2 changes: 1 addition & 1 deletion 2dlib/pen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
*
* 5 2/04/97 11:14a Samir
* Improved clipping system by adding a separate clipport based off of the
* viewport's rectangle in it's parent surface
* viewport's rectangle in its parent surface
*
* $NoKeywords: $
*/
Expand Down Expand Up @@ -133,7 +133,7 @@
// draws a clipped line

void grViewport::line(ddgr_color color, int x1, int y1, int x2, int y2) {
int xa, ya, xb, yb;

Check warning on line 136 in 2dlib/pen.cpp

View workflow job for this annotation

GitHub Actions / Linux-x64, Debug

variable ‘xa’ set but not used [-Wunused-but-set-variable]

Check warning on line 136 in 2dlib/pen.cpp

View workflow job for this annotation

GitHub Actions / Linux-x64, Debug

variable ‘ya’ set but not used [-Wunused-but-set-variable]

Check warning on line 136 in 2dlib/pen.cpp

View workflow job for this annotation

GitHub Actions / Linux-x64, Debug

variable ‘xb’ set but not used [-Wunused-but-set-variable]

Check warning on line 136 in 2dlib/pen.cpp

View workflow job for this annotation

GitHub Actions / Linux-x64, Debug

variable ‘yb’ set but not used [-Wunused-but-set-variable]

Check warning on line 136 in 2dlib/pen.cpp

View workflow job for this annotation

GitHub Actions / Linux-x64-clang, Debug

variable 'yb' set but not used [-Wunused-but-set-variable]

Check warning on line 136 in 2dlib/pen.cpp

View workflow job for this annotation

GitHub Actions / Linux-x64-clang, Debug

variable 'xa' set but not used [-Wunused-but-set-variable]

Check warning on line 136 in 2dlib/pen.cpp

View workflow job for this annotation

GitHub Actions / Linux-x64-clang, Debug

variable 'ya' set but not used [-Wunused-but-set-variable]

Check warning on line 136 in 2dlib/pen.cpp

View workflow job for this annotation

GitHub Actions / Linux-x64-clang, Debug

variable 'xb' set but not used [-Wunused-but-set-variable]

Check warning on line 136 in 2dlib/pen.cpp

View workflow job for this annotation

GitHub Actions / Linux-x64, Release

variable ‘xa’ set but not used [-Wunused-but-set-variable]

Check warning on line 136 in 2dlib/pen.cpp

View workflow job for this annotation

GitHub Actions / Linux-x64-clang, Release

variable 'ya' set but not used [-Wunused-but-set-variable]

Check warning on line 136 in 2dlib/pen.cpp

View workflow job for this annotation

GitHub Actions / Linux-x64-clang, Release

variable 'xb' set but not used [-Wunused-but-set-variable]

Check warning on line 136 in 2dlib/pen.cpp

View workflow job for this annotation

GitHub Actions / Linux-x64-clang, Release

variable 'yb' set but not used [-Wunused-but-set-variable]

Check warning on line 136 in 2dlib/pen.cpp

View workflow job for this annotation

GitHub Actions / Linux-x64-clang, Release

variable 'xa' set but not used [-Wunused-but-set-variable]
ASSERT(vp_Locked);

xa = global_x(x1);
Expand Down
2 changes: 1 addition & 1 deletion 2dlib/pentext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
*
* 7 2/04/97 11:14a Samir
* Improved clipping system by adding a separate clipport based off of the
* viewport's rectangle in it's parent surface
* viewport's rectangle in its parent surface
*
* 6 2/03/97 3:00p Samir
* Fixed x updating problem in draw_text_line
Expand All @@ -96,7 +96,7 @@

#define STR_BUF_SIZE 512
static char Str_buf[STR_BUF_SIZE]; // String buffer for variable arguments
static char Draw_str_buf[STR_BUF_SIZE]; // used to buffer words in a string

Check warning on line 99 in 2dlib/pentext.cpp

View workflow job for this annotation

GitHub Actions / Linux-x64-clang, Debug

unused variable 'Draw_str_buf' [-Wunused-variable]

// ---------------------------------------------------------------------------
// Viewport font and text funcitons
Expand Down Expand Up @@ -340,7 +340,7 @@
supports bitmap fonts or color(alpha) mapped fonts.
*/
cur_x = x;
for (i = 0; i < (int)strlen(str); i++) {

Check warning on line 343 in 2dlib/pentext.cpp

View workflow job for this annotation

GitHub Actions / Linux-x64, Debug

comparison of integer expressions of different signedness: ‘unsigned int’ and ‘int’ [-Wsign-compare]
uint8_t ch;

ch = (uint8_t)str[i];
Expand Down
2 changes: 1 addition & 1 deletion 2dlib/viewport.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
*
* 7 2/04/97 11:14a Samir
* Improved clipping system by adding a separate clipport based off of the
* viewport's rectangle in it's parent surface
* viewport's rectangle in its parent surface
*
* 6 2/03/97 7:56p Samir
*
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)


10 changes: 5 additions & 5 deletions Descent3/AIGoal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
*
* 125 5/20/99 1:15a Chris
* Improved BNode Path Following for end points on the path. Fixed bugs
* with non-auto targetting
* with non-auto targeting
*
* 124 5/18/99 10:57a Chris
* Various bug fixes
Expand Down Expand Up @@ -282,7 +282,7 @@
* AIGetToObj is not enabled when the target is NULL or OBJ_GHOST
*
* 61 10/13/98 1:08p Chris
* Greatly improved the AI's use of paths. Improved visability checking
* Greatly improved the AI's use of paths. Improved visibility checking
* algorithm. Probably needs a second pass for further cleanup.
*
* 60 10/07/98 3:37p Chris
Expand Down Expand Up @@ -591,7 +591,7 @@ float GoalDetermineTrackDist(object *obj) {
dist = cur_goal->ramp_influence_dists[3];
}
} else {
// Influence isn't distnace based; so, check out to max dist
// Influence isn't distance based; so, check out to max dist
dist = MAX_NEAR_OBJ_SEARCH_DIST;
}
}
Expand Down Expand Up @@ -1304,7 +1304,7 @@ void GoalInitTypeGoals(object *obj, int ai_type) {

GoalClearAll(obj);

// This goal has a proirity of 50. Mabye I should split up intermediate goals
// This goal has a priority of 50. Mabye I should split up intermediate goals
// and long term goals. -- Wander around within 2000 units of your starting
// position (goal has priority of 100) The AI type decides what to do with
// a goal when it is done.
Expand Down Expand Up @@ -1494,7 +1494,7 @@ bool GoalIsGoalEnabled(object *obj, int goal_index) {
f_enabled = e_info->float_value <= ai_info->cur_life_preservation;
} break;
case (AIE_ANGRY): {
f_enabled = e_info->float_value <= ai_info->cur_agression;
f_enabled = e_info->float_value <= ai_info->cur_aggression;
} break;
case (AIE_CURIOUS): {
f_enabled = e_info->float_value <= ai_info->cur_curiousity;
Expand Down
2 changes: 1 addition & 1 deletion Descent3/AIMain.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
* Improved the object linking system and AI and physics
*
* 25 10/13/98 1:08p Chris
* Greatly improved the AI's use of paths. Improved visability checking
* Greatly improved the AI's use of paths. Improved visibility checking
* algorithm. Probably needs a second pass for further cleanup.
*
* 24 10/06/98 6:19p Chris
Expand Down
Loading
Loading