[Scummvm-git-logs] scummvm master -> 09ec0083cb290f3c05a08d8a5235bbe9a0ba0228

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
09ec0083cb JANITORIAL: ICB: Fix allign and devide typos in code


Commit: 09ec0083cb290f3c05a08d8a5235bbe9a0ba0228
    https://github.com/scummvm/scummvm/commit/09ec0083cb290f3c05a08d8a5235bbe9a0ba0228
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-08-25T14:43:29+03:00

Commit Message:
JANITORIAL: ICB: Fix allign and devide typos in code

Changed paths:
    engines/icb/common/px_scriptengine.cpp
    engines/icb/common/px_scriptengine.h
    engines/icb/floors.cpp
    engines/icb/floors.h
    engines/icb/function.cpp
    engines/icb/player.cpp


diff --git a/engines/icb/common/px_scriptengine.cpp b/engines/icb/common/px_scriptengine.cpp
index 852d4ddde2f..f6bb1e18712 100644
--- a/engines/icb/common/px_scriptengine.cpp
+++ b/engines/icb/common/px_scriptengine.cpp
@@ -457,7 +457,7 @@ scriptInterpreterReturnCodes RunScript(const char *&scriptData, // A pointer to
 			TraceOperation("*", *)DoBinaryOperation((stack[stackPointer - 2] * stack[stackPointer - 1]));
 		} break;
 
-		case OP_DEVIDE: { //  34              // '/'
+		case OP_DIVIDE: { //  34              // '/'
 			ScriptTrace("/");
 			TraceOperation("/", / ) DoBinaryOperation((stack[stackPointer - 2] / stack[stackPointer - 1]));
 		} break;
diff --git a/engines/icb/common/px_scriptengine.h b/engines/icb/common/px_scriptengine.h
index 5e887894500..2956027df5d 100644
--- a/engines/icb/common/px_scriptengine.h
+++ b/engines/icb/common/px_scriptengine.h
@@ -101,7 +101,7 @@ extern CpxGlobalScriptVariables *g_globalScriptVariables;
 #define OP_PLUS 31     // '+'
 #define OP_TIMES 32    // '*'
 #define OP_MINUS 33    // '-'
-#define OP_DEVIDE 34   // '/'
+#define OP_DIVIDE 34   // '/'
 #define OP_LSTHAN 35   // <
 #define OP_NOTEQUAL 36 // '!='
 #define OP_ANDAND 37   // &&
diff --git a/engines/icb/floors.cpp b/engines/icb/floors.cpp
index c9dc86d6ac1..c04ff754474 100644
--- a/engines/icb/floors.cpp
+++ b/engines/icb/floors.cpp
@@ -158,7 +158,7 @@ bool8 _floor_world::On_a_floor(_mega *mega) {
 	return FALSE8;
 }
 
-void _floor_world::Allign_with_floor(_mega *mega) {
+void _floor_world::Align_with_floor(_mega *mega) {
 	uint32 j;
 
 	// check against actualy heights
diff --git a/engines/icb/floors.h b/engines/icb/floors.h
index e9b04a71841..9d160bc13ff 100644
--- a/engines/icb/floors.h
+++ b/engines/icb/floors.h
@@ -64,7 +64,7 @@ public:
 
 	PXreal Floor_safe_gravitise_y(PXreal fY);
 
-	void Allign_with_floor(_mega *mega);
+	void Align_with_floor(_mega *mega);
 	PXreal Return_true_y(PXreal y);
 	bool8 On_a_floor(_mega *mega);
 
diff --git a/engines/icb/function.cpp b/engines/icb/function.cpp
index bede86addf5..0063dc7adc0 100644
--- a/engines/icb/function.cpp
+++ b/engines/icb/function.cpp
@@ -3132,7 +3132,7 @@ uint32 _game_session::Register_stair_or_ladder(const char *target, bool8 top, ui
 mcodeFunctionReturnCodes _game_session::fn_align_with_floor(int32 &, int32 *) {
 	// mega climbing stairs and ladder calls this afterward to realign with artist misaligned floors
 
-	floor_def->Allign_with_floor(M);
+	floor_def->Align_with_floor(M);
 
 	return IR_CONT;
 }
diff --git a/engines/icb/player.cpp b/engines/icb/player.cpp
index 30de3ad695e..d74adb85d2b 100644
--- a/engines/icb/player.cpp
+++ b/engines/icb/player.cpp
@@ -921,7 +921,7 @@ mcodeFunctionReturnCodes _player::Gateway() {
 			break;
 		case LEAVE_LADDER_BOTTOM:
 			log->pan += HALF_TURN;
-			MS->floor_def->Allign_with_floor(log->mega);
+			MS->floor_def->Align_with_floor(log->mega);
 			Start_new_mode(STOOD);
 			ret = __MORE_THIS_CYCLE;
 			break;
@@ -1893,7 +1893,7 @@ void _player::Leave_stair() {
 	// align with floor
 	// set next mode according to momentum
 
-	MS->floor_def->Allign_with_floor(log->mega);
+	MS->floor_def->Align_with_floor(log->mega);
 
 	// coming off the stair
 	if (MS->stairs[stair_num].is_stair) {
@@ -2040,7 +2040,7 @@ __mode_return _player::Player_ladder() {
 __mode_return _player::Player_slide_on_ladder() {
 	if (stair_unit == (MS->stairs[stair_num].units + 1)) {
 
-		MS->floor_def->Allign_with_floor(log->mega);
+		MS->floor_def->Align_with_floor(log->mega);
 
 		log->mega->drawShadow = TRUE8; // shadows on
 		Easy_start_new_mode(STOOD, __SLIDE_DOWN_LADDER_TO_STAND); // get off
@@ -2354,7 +2354,7 @@ __mode_return _player::Player_stood() {
 	log->cur_anim_type = __STAND;
 	MS->Set_motion(__MOTION_WALK); // back to walk in-case were running
 	MS->Set_can_save(TRUE8); // can save
-	MS->floor_def->Allign_with_floor(log->mega);
+	MS->floor_def->Align_with_floor(log->mega);
 
 	MS->Process_guard_alert(__ASTOOD);