[Scummvm-git-logs] scummvm master -> 7fd0c0f68f64e263dd478dcbc08e3f41b6c06fb8
bluegr
noreply at scummvm.org
Sun Sep 15 23:05:50 UTC 2024
This automated email contains information about 16 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
1257553b7d JANITORIAL: DOCS: Fix typos
54f6a7f3f5 JANITORIAL: ENGINES: Fix typo
1dc2e8fc19 JANITORIAL: LASTEXPRESS: Fix typos
a4b633938c JANITORIAL: LURE: Fix typos
8e585fd0da JANITORIAL: M4: Fix typos
32d70aea69 JANITORIAL: MACVENTURE: Fix typos
78590e4c86 JANITORIAL: MADE: Fix typos
e9ff4d9c36 JANITORIAL: MADS: Fix typos
e9303cfb09 JANITORIAL: MM: Fix typos
2c9fb3a50c JANITORIAL: MUTATIONOFJB: Fix typos
9927b318f4 JANITORIAL: MYST3: Fix typos
830ed3c53b JANITORIAL: NANCY: Fix typos
fba97454c8 JANITORIAL: SAGA2: Fix typos
370064f93f JANITORIAL: SCUMM: Fix typos
92c3ec0156 JANITORIAL: ULTIMA: Fix typos
7fd0c0f68f JANITORIAL: SCI: Fix typos
Commit: 1257553b7d9267ee1e498ae51331a44dba1f3891
https://github.com/scummvm/scummvm/commit/1257553b7d9267ee1e498ae51331a44dba1f3891
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T01:39:30+03:00
Commit Message:
JANITORIAL: DOCS: Fix typos
Changed paths:
doc/docportal/advanced_topics/understand_graphics.rst
doc/docportal/settings/graphics.rst
doc/doxygen/scummvm.doxyfile
diff --git a/doc/docportal/advanced_topics/understand_graphics.rst b/doc/docportal/advanced_topics/understand_graphics.rst
index 4989ed7006a..55f7ea4158b 100644
--- a/doc/docportal/advanced_topics/understand_graphics.rst
+++ b/doc/docportal/advanced_topics/understand_graphics.rst
@@ -208,7 +208,7 @@ Below are some of the common render modes, to illustrate how the render mode set
Shaders
------------
-Shaders change the way a game is rendered, and can be used to make a game look exactly how you remember it from years past - right down to the border of your Gameboy console and its old LCD screen, or your CRT monitor. Alternatively, use shaders simply to improve the overall look and feel of a game.
+Shaders change the way a game is rendered, and can be used to make a game look exactly how you remember it from years past - right down to the border of your Game Boy console and its old LCD screen, or your CRT monitor. Alternatively, use shaders simply to improve the overall look and feel of a game.
The shaders included in the ScummVM pack are curated from the Libretro repository, and are grouped according to effect. For an overview of specific shaders, see the `Libretro documentation <https://docs.libretro.com/shader/introduction/>`_
diff --git a/doc/docportal/settings/graphics.rst b/doc/docportal/settings/graphics.rst
index 23d641a6741..9006797cb44 100644
--- a/doc/docportal/settings/graphics.rst
+++ b/doc/docportal/settings/graphics.rst
@@ -78,7 +78,7 @@ Aspect ratio correction
.. _fullscreen:
Fullscreen mode
- If ticked, games are played using the entire screen, instead of a window. The actual apperance is defined by the other graphics settings.
+ If ticked, games are played using the entire screen, instead of a window. The actual appearance is defined by the other graphics settings.
*fullscreen*
diff --git a/doc/doxygen/scummvm.doxyfile b/doc/doxygen/scummvm.doxyfile
index fced7a0e64b..dd6d4c13132 100644
--- a/doc/doxygen/scummvm.doxyfile
+++ b/doc/doxygen/scummvm.doxyfile
@@ -1062,7 +1062,7 @@ CLANG_OPTIONS =
# path to the compilation database (see:
# http://clang.llvm.org/docs/HowToSetupToolingForLLVM.html) used when the files
# were built. This is equivalent to specifying the "-p" option to a clang tool,
-# such as clang-check. These options will then be pased to the parser.
+# such as clang-check. These options will then be passed to the parser.
# Note: The availability of this option depends on whether or not doxygen was
# generated with the -Duse-libclang=ON option for CMake.
# The default value is: 0.
Commit: 54f6a7f3f5fd26eb426e95f3d2b2bc5bd434d173
https://github.com/scummvm/scummvm/commit/54f6a7f3f5fd26eb426e95f3d2b2bc5bd434d173
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T01:40:50+03:00
Commit Message:
JANITORIAL: ENGINES: Fix typo
Changed paths:
engines/achievements.h
diff --git a/engines/achievements.h b/engines/achievements.h
index 627a49dbce9..33764b58019 100644
--- a/engines/achievements.h
+++ b/engines/achievements.h
@@ -232,13 +232,13 @@ public:
*/
/**
- * Get number of achivement descriptions available.
+ * Get number of achievement descriptions available.
*
*/
uint16 getAchievementCount() const;
/**
- * Get achivement description by index.
+ * Get achievement description by index.
*
* @param[in] index Internal index of the achievement, counted from 0 to (getAchievementCount() - 1)
*
Commit: 1dc2e8fc1927997530141fb8b92029558a5c5442
https://github.com/scummvm/scummvm/commit/1dc2e8fc1927997530141fb8b92029558a5c5442
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T01:43:00+03:00
Commit Message:
JANITORIAL: LASTEXPRESS: Fix typos
Changed paths:
engines/lastexpress/fight/fighter.h
diff --git a/engines/lastexpress/fight/fighter.h b/engines/lastexpress/fight/fighter.h
index b7618f45fad..ad4a3cca2b7 100644
--- a/engines/lastexpress/fight/fighter.h
+++ b/engines/lastexpress/fight/fighter.h
@@ -91,7 +91,7 @@ protected:
uint32 _field_24;
FightAction _action;
uint32 _sequenceIndex2;
- int32 _countdown; // countdown before loosing ?
+ int32 _countdown; // countdown before losing ?
uint32 _field_34;
// Drawing and processing
Commit: a4b633938c0e474104ad4b84bba6487a959a5758
https://github.com/scummvm/scummvm/commit/a4b633938c0e474104ad4b84bba6487a959a5758
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T01:44:04+03:00
Commit Message:
JANITORIAL: LURE: Fix typos
Changed paths:
engines/lure/res_struct.cpp
diff --git a/engines/lure/res_struct.cpp b/engines/lure/res_struct.cpp
index 4b954c227a9..ba76ce14e92 100644
--- a/engines/lure/res_struct.cpp
+++ b/engines/lure/res_struct.cpp
@@ -210,7 +210,7 @@ void RoomPathsData::clearOccupied(int x, int y, int width) {
// decompresses the bit-packed data for which parts of a room are occupied
// into a byte array. It also adds a column and row of padding around the
// edges of the screen, and extends occupied areas to adjust for the width
-// of the chracter
+// of the character
void RoomPathsData::decompress(RoomPathsDecompressedData &dataOut, int characterWidth) {
byte *pIn = &_data[ROOM_PATHS_SIZE - 1];
Commit: 8e585fd0da62704fc46ac8049b98ee7a984da6a6
https://github.com/scummvm/scummvm/commit/8e585fd0da62704fc46ac8049b98ee7a984da6a6
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T01:45:01+03:00
Commit Message:
JANITORIAL: M4: Fix typos
Changed paths:
engines/m4/adv_r/adv_rails.cpp
engines/m4/burger/rooms/section3/mine.h
engines/m4/fileio/sys_file.cpp
engines/m4/riddle/rooms/section4/room406.cpp
engines/m4/wscript/ws_cruncher.cpp
diff --git a/engines/m4/adv_r/adv_rails.cpp b/engines/m4/adv_r/adv_rails.cpp
index 91aad4520ee..a6d86ed5b4d 100644
--- a/engines/m4/adv_r/adv_rails.cpp
+++ b/engines/m4/adv_r/adv_rails.cpp
@@ -913,7 +913,7 @@ bool GetShortestPath(int32 origID, int32 destID, railNode **shortPath) {
}
}
- // Set the stackTop to point at the node preceeding currNode, which preceeds destID
+ // Set the stackTop to point at the node preceding currNode, which precedes destID
// we want to check the contents of the stack from the top, and stackTop always point to
// the next available location, not directly at the top element.
_G(rails).stackTop--;
@@ -1013,7 +1013,7 @@ bool GetShortestPath(int32 origID, int32 destID, railNode **shortPath) {
// Take currNode off the stack top
_G(rails).stackTop--;
- // Set the _G(rails).stackTop to point at the node preceeding currNode
+ // Set the _G(rails).stackTop to point at the node preceding currNode
// we want to check the contents of the stack from the top, and _G(rails).stackTop always point to
// the next available location, not directly at the top element.
_G(rails).stackTop--;
diff --git a/engines/m4/burger/rooms/section3/mine.h b/engines/m4/burger/rooms/section3/mine.h
index 2832f4bc745..0a9df9fdd8f 100644
--- a/engines/m4/burger/rooms/section3/mine.h
+++ b/engines/m4/burger/rooms/section3/mine.h
@@ -98,7 +98,7 @@ private:
int16 _presentSceneID = 0;
static int16 _entranceDoor; // Shared between cellar and mine room classes
MineRoom _mineRoomInfo;
- bool _fade_down_rect_active = false; // True if a fade down should occurr when walker in the fade_down_rect
+ bool _fade_down_rect_active = false; // True if a fade down should occur when walker in the fade_down_rect
Rectangle _fade_down_rect; // If the walker is in his rectum and its active, turn off the lights
int _volume = 0;
int _random1 = 0;
diff --git a/engines/m4/fileio/sys_file.cpp b/engines/m4/fileio/sys_file.cpp
index 44b71d875ee..3b86df021f7 100644
--- a/engines/m4/fileio/sys_file.cpp
+++ b/engines/m4/fileio/sys_file.cpp
@@ -380,7 +380,7 @@ bool SysFile::open_hash_file() {
Common::SeekableReadStream *rs = dynamic_cast<Common::SeekableReadStream *>(temp_ptr->hag_fp);
assert(rs);
- // set hag file pointer to current file postion //
+ // set hag file pointer to current file position //
if (!rs->seek(curr_hash_record.offset))
term_message("fail to fseek");
last_head_pos = rs->pos();
diff --git a/engines/m4/riddle/rooms/section4/room406.cpp b/engines/m4/riddle/rooms/section4/room406.cpp
index 8b85f614bac..91884595c0d 100644
--- a/engines/m4/riddle/rooms/section4/room406.cpp
+++ b/engines/m4/riddle/rooms/section4/room406.cpp
@@ -585,7 +585,7 @@ void Room406::parser() {
useSwitchPaintingClosed();
} else if (useFlag && player_said_any("ACE OF SPADES", "ACE OF SPADES ")) {
// Note: The original had two separate blocks for use ace of spades.
- // Since the second version could never be called, I've ommitted it
+ // Since the second version could never be called, I've omitted it
if (_G(flags)[V310])
useAceOfSpades1();
else
diff --git a/engines/m4/wscript/ws_cruncher.cpp b/engines/m4/wscript/ws_cruncher.cpp
index 05d65669bb4..cfd836e1e2d 100644
--- a/engines/m4/wscript/ws_cruncher.cpp
+++ b/engines/m4/wscript/ws_cruncher.cpp
@@ -1405,7 +1405,7 @@ bool CrunchAnim8(Anim8 *myAnim8) {
timeElapsed = (_GWS(ws_globals)[GLB_TIME] - myAnim8->startTime) << 16;
// This must be checked before TAG_TARGS because a bez path can use a target scale and rotate
- // And we don't want to accidently setup a target x or y.
+ // And we don't want to accidentally set up a target x or y.
// NOTE: for both bez paths, and targets, the time for the anim8 to reach the target or traverse
// the path is stored in IDX_TRANS_TIME, however, in order to determine how far aint32 the
// path we should be, we normally compute the elapsed time divided by the trans time.
Commit: 32d70aea69c38ead4f317dde2996d9b7ed89ecc1
https://github.com/scummvm/scummvm/commit/32d70aea69c38ead4f317dde2996d9b7ed89ecc1
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T01:46:04+03:00
Commit Message:
JANITORIAL: MACVENTURE: Fix typos
Changed paths:
engines/macventure/container.h
engines/macventure/saveload.cpp
diff --git a/engines/macventure/container.h b/engines/macventure/container.h
index 8c56098de1a..503496b02f5 100644
--- a/engines/macventure/container.h
+++ b/engines/macventure/container.h
@@ -66,7 +66,7 @@ protected:
bool _simplified;
- uint _lenObjs; // In the case of simple container, lenght of an object
+ uint _lenObjs; // In the case of simple container, length of an object
uint _numObjs;
ContainerHeader _header;
diff --git a/engines/macventure/saveload.cpp b/engines/macventure/saveload.cpp
index 84071005474..d1e9aff34a5 100644
--- a/engines/macventure/saveload.cpp
+++ b/engines/macventure/saveload.cpp
@@ -182,7 +182,7 @@ bool MacVentureEngine::scummVMSaveLoadDialog(bool isSave) {
Common::String desc = dialog.getResultString();
if (desc.empty()) {
- // create our own description for the saved game, the user didnt enter it
+ // create our own description for the saved game, the user didn't enter it
desc = dialog.createDefaultSaveDescription(slot);
}
Commit: 78590e4c86ad7c6232a0d375b76aa1398d5b314f
https://github.com/scummvm/scummvm/commit/78590e4c86ad7c6232a0d375b76aa1398d5b314f
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T01:47:01+03:00
Commit Message:
JANITORIAL: MADE: Fix typos
Changed paths:
engines/made/made.cpp
diff --git a/engines/made/made.cpp b/engines/made/made.cpp
index a41bcf48544..8cefda048f4 100644
--- a/engines/made/made.cpp
+++ b/engines/made/made.cpp
@@ -89,7 +89,7 @@ MadeEngine::MadeEngine(OSystem *syst, const MadeGameDescription *gameDesc) : Eng
_soundRate = 8000;
break;
case GID_RTZ:
- // Return to Zork sets it itself via a script funtion
+ // Return to Zork sets it itself via a script function
break;
default:
break;
Commit: e9ff4d9c36dbd58ddc6b79ec3d25b4d3b2416252
https://github.com/scummvm/scummvm/commit/e9ff4d9c36dbd58ddc6b79ec3d25b4d3b2416252
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T01:47:53+03:00
Commit Message:
JANITORIAL: MADS: Fix typos
Changed paths:
engines/mads/nebular/game_nebular.cpp
engines/mads/player.h
engines/mads/screen.cpp
diff --git a/engines/mads/nebular/game_nebular.cpp b/engines/mads/nebular/game_nebular.cpp
index f05385561b1..c0dfe4d8191 100644
--- a/engines/mads/nebular/game_nebular.cpp
+++ b/engines/mads/nebular/game_nebular.cpp
@@ -77,7 +77,7 @@ void GameNebular::startGame() {
AnimationView::execute(_vm, "rexend1");
break;
case 2:
- // Shields, but no targetting failure ending
+ // Shields, but no targeting failure ending
AnimationView::execute(_vm, "rexend2");
break;
case 3:
diff --git a/engines/mads/player.h b/engines/mads/player.h
index 5527c37ac82..7a5175ac0e1 100644
--- a/engines/mads/player.h
+++ b/engines/mads/player.h
@@ -181,7 +181,7 @@ public:
void cancelWalk();
/**
- * Cancels any oustanding player action
+ * Cancels any outstanding player action
*/
void cancelCommand();
diff --git a/engines/mads/screen.cpp b/engines/mads/screen.cpp
index 309eca48734..862e84637fb 100644
--- a/engines/mads/screen.cpp
+++ b/engines/mads/screen.cpp
@@ -653,7 +653,7 @@ void Screen::transition(ScreenTransition transitionType, bool surfaceFlag) {
case kNullPaletteCopy:
// Original temporarily set the palette to black, copied the scene to the
- // screen, and then restored the palette. We can give a similiar effect
+ // screen, and then restored the palette. We can give a similar effect
// by doing a standard quick palette fade in
transition(kTransitionFadeIn, surfaceFlag);
break;
Commit: e9303cfb09d333c59dee56a808b8e10568731318
https://github.com/scummvm/scummvm/commit/e9303cfb09d333c59dee56a808b8e10568731318
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T01:48:47+03:00
Commit Message:
JANITORIAL: MM: Fix typos
Changed paths:
engines/mm/mm1/data/spells_state.h
engines/mm/mm1/game/encounter.h
engines/mm/mm1/game/equip_remove.cpp
engines/mm/xeen/character.cpp
engines/mm/xeen/combat.h
engines/mm/xeen/interface.cpp
engines/mm/xeen/patcher.cpp
engines/mm/xeen/scripts.cpp
diff --git a/engines/mm/mm1/data/spells_state.h b/engines/mm/mm1/data/spells_state.h
index 579d107ecf8..983c71d29ef 100644
--- a/engines/mm/mm1/data/spells_state.h
+++ b/engines/mm/mm1/data/spells_state.h
@@ -34,7 +34,7 @@ struct SpellsState {
byte _mmVal5 = 0;
byte _mmVal7 = 0;
- // This can hold both a resistence type, or count of monsters to affect
+ // This can hold both a resistance type, or count of monsters to affect
byte _resistanceTypeOrTargetCount = RESISTANCE_MAGIC;
// TODO: Is this variable different in different contexts?
diff --git a/engines/mm/mm1/game/encounter.h b/engines/mm/mm1/game/encounter.h
index 7d61d290268..e1a9928f850 100644
--- a/engines/mm/mm1/game/encounter.h
+++ b/engines/mm/mm1/game/encounter.h
@@ -72,7 +72,7 @@ public:
void execute();
/**
- * Chooses whether an encounter can be fleed
+ * Chooses whether an encounter can be fled
*/
bool checkSurroundParty() const;
diff --git a/engines/mm/mm1/game/equip_remove.cpp b/engines/mm/mm1/game/equip_remove.cpp
index 016bec30385..a6c121a010e 100644
--- a/engines/mm/mm1/game/equip_remove.cpp
+++ b/engines/mm/mm1/game/equip_remove.cpp
@@ -202,7 +202,7 @@ bool EquipRemove::removeItem(int index, Common::Point &textPos, Common::String &
// the character updates are being done to
//error("TODO: item flag in remove item");
- //substract const equip bonus from character parameters
+ //subtract const equip bonus from character parameters
applyEquipBonus(item._constBonus_id, -item._constBonus_value);
}
diff --git a/engines/mm/xeen/character.cpp b/engines/mm/xeen/character.cpp
index 66d8688b25d..880c765218e 100644
--- a/engines/mm/xeen/character.cpp
+++ b/engines/mm/xeen/character.cpp
@@ -712,7 +712,7 @@ void Character::setValue(int id, uint value) {
_experience = value;
break;
case 17:
- // Set party poison resistence
+ // Set party poison resistance
party._poisonResistence = value;
break;
case 18:
diff --git a/engines/mm/xeen/combat.h b/engines/mm/xeen/combat.h
index f4db0b5a492..96a0333d87b 100644
--- a/engines/mm/xeen/combat.h
+++ b/engines/mm/xeen/combat.h
@@ -325,7 +325,7 @@ public:
void shootRangedWeapon();
/**
- * Returns true if there are any monsters in the vacinity
+ * Returns true if there are any monsters in the vicinity
*/
bool areMonstersPresent() const;
};
diff --git a/engines/mm/xeen/interface.cpp b/engines/mm/xeen/interface.cpp
index 7ea8bc2e3c9..d1d8fbae25e 100644
--- a/engines/mm/xeen/interface.cpp
+++ b/engines/mm/xeen/interface.cpp
@@ -1513,7 +1513,7 @@ void Interface::assembleBorder() {
windows[10]._enabled || windows[2]._enabled ? 52 : _face2UIFrame,
Common::Point(215, 32));
- // Draw resistence indicators
+ // Draw resistance indicators
if (!windows[10]._enabled && !windows[2]._enabled
&& !windows[38]._enabled) {
_fecpSprites.draw(0, _vm->_party->_fireResistence ? 1 : 0,
diff --git a/engines/mm/xeen/patcher.cpp b/engines/mm/xeen/patcher.cpp
index d956291dc58..9faac67ddcf 100644
--- a/engines/mm/xeen/patcher.cpp
+++ b/engines/mm/xeen/patcher.cpp
@@ -59,8 +59,8 @@ static const ScriptEntry SCRIPT_PATCHES[] = {
};
// List of objects that need to be removed. Most of these are for copies of objects that appear in
-// the distance on the edge of other maps, so they don't simply pop into existance when the map changes.
-// When the main object is removed, the original didn't properly also removie the object copies
+// the distance on the edge of other maps, so they don't simply pop into existence when the map changes.
+// When the main object is removed, the original didn't properly also remove the object copies
#define REMOVE_OBJECTS_COUNT 6
static const ObjectEntry REMOVE_OBJECTS[] = {
// Floating statue in the distance off SE corner of map
diff --git a/engines/mm/xeen/scripts.cpp b/engines/mm/xeen/scripts.cpp
index a1054bd94a7..91ade854741 100644
--- a/engines/mm/xeen/scripts.cpp
+++ b/engines/mm/xeen/scripts.cpp
@@ -1612,7 +1612,7 @@ bool Scripts::ifProc(int action, uint32 val, int mode, int charIndex) {
v = ps->_experience;
break;
case 17:
- // Party poison resistence
+ // Party poison resistance
v = party._poisonResistence;
break;
case 18:
@@ -1752,19 +1752,19 @@ bool Scripts::ifProc(int action, uint32 val, int mode, int charIndex) {
v = ps->_luck._permanent;
break;
case 52:
- // Fire resistence (before bonus)
+ // Fire resistance (before bonus)
v = ps->_fireResistence._permanent;
break;
case 53:
- // Elecricity resistence (before bonus)
+ // Elecricity resistance (before bonus)
v = ps->_electricityResistence._permanent;
break;
case 54:
- // Cold resistence (before bonus)
+ // Cold resistance (before bonus)
v = ps->_coldResistence._permanent;
break;
case 55:
- // Poison resistence (before bonus)
+ // Poison resistance (before bonus)
v = ps->_poisonResistence._permanent;
break;
case 56:
@@ -1772,31 +1772,31 @@ bool Scripts::ifProc(int action, uint32 val, int mode, int charIndex) {
v = ps->_energyResistence._permanent;
break;
case 57:
- // Energy resistence (before bonus)
+ // Energy resistance (before bonus)
v = ps->_magicResistence._permanent;
break;
case 58:
- // Fire resistence (extra beyond base)
+ // Fire resistance (extra beyond base)
v = ps->_fireResistence._temporary;
break;
case 59:
- // Electricity resistence (extra beyond base)
+ // Electricity resistance (extra beyond base)
v = ps->_electricityResistence._temporary;
break;
case 60:
- // Cold resistence (extra beyond base)
+ // Cold resistance (extra beyond base)
v = ps->_coldResistence._temporary;
break;
case 61:
- // Poison resistence (extra beyod base)
+ // Poison resistance (extra beyond base)
v = ps->_poisonResistence._temporary;
break;
case 62:
- // Energy resistence (extra beyond base)
+ // Energy resistance (extra beyond base)
v = ps->_energyResistence._temporary;
break;
case 63:
- // Magic resistence (extra beyond base)
+ // Magic resistance (extra beyond base)
v = ps->_magicResistence._temporary;
break;
case 64:
@@ -1815,15 +1815,15 @@ bool Scripts::ifProc(int action, uint32 val, int mode, int charIndex) {
v = party._lightCount;
break;
case 71:
- // Party magical fire resistence
+ // Party magical fire resistance
v = party._fireResistence;
break;
case 72:
- // Party magical electricity resistence
+ // Party magical electricity resistance
v = party._electricityResistence;
break;
case 73:
- // Party magical cold resistence
+ // Party magical cold resistance
v = party._coldResistence;
break;
case 76:
Commit: 2c9fb3a50ca1a6fab6e0a552b892ebffc102dd92
https://github.com/scummvm/scummvm/commit/2c9fb3a50ca1a6fab6e0a552b892ebffc102dd92
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T01:50:13+03:00
Commit Message:
JANITORIAL: MUTATIONOFJB: Fix typos
Changed paths:
engines/mutationofjb/assets.h
engines/mutationofjb/gamedata.h
diff --git a/engines/mutationofjb/assets.h b/engines/mutationofjb/assets.h
index 3fe6659d67b..e9af3c768a3 100644
--- a/engines/mutationofjb/assets.h
+++ b/engines/mutationofjb/assets.h
@@ -55,7 +55,7 @@ public:
/**
* Access to inventory definitions.
*
- * @return Inventory item definiton list.
+ * @return Inventory item definition list.
*/
InventoryItemDefinitionList &getInventoryItemDefList();
diff --git a/engines/mutationofjb/gamedata.h b/engines/mutationofjb/gamedata.h
index bd33ab85c37..568c6ca7c88 100644
--- a/engines/mutationofjb/gamedata.h
+++ b/engines/mutationofjb/gamedata.h
@@ -120,7 +120,7 @@ struct Door : public Common::Serializable {
*
* Object frames consist of surfaces carved out of room frames (starting from _roomFrame
* up until _roomFrame + _numFrames - 1) based on the object's rectangle. They are stored
- * in the shared object frame space that each object occupies a continous part of from
+ * in the shared object frame space that each object occupies a continuous part of from
* the beginning.
*
* By using the term "frame" alone we will be referring to an object frame, not a room
Commit: 9927b318f4ce0bbd28d22959e67889d135e70b4d
https://github.com/scummvm/scummvm/commit/9927b318f4ce0bbd28d22959e67889d135e70b4d
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T01:51:07+03:00
Commit Message:
JANITORIAL: MYST3: Fix typos
Changed paths:
engines/myst3/script.cpp
diff --git a/engines/myst3/script.cpp b/engines/myst3/script.cpp
index 98366844fe8..883113bec05 100644
--- a/engines/myst3/script.cpp
+++ b/engines/myst3/script.cpp
@@ -1340,7 +1340,7 @@ void Script::varClipChangeBound(Context &c, const Opcode &cmd) {
}
void Script::varAbsoluteSubValue(Context &c, const Opcode &cmd) {
- debugC(kDebugScript, "Opcode %d: Take absolute value of var %d and substract %d", cmd.op, cmd.args[0], cmd.args[1]);
+ debugC(kDebugScript, "Opcode %d: Take absolute value of var %d and subtract %d", cmd.op, cmd.args[0], cmd.args[1]);
int32 value = _vm->_state->getVar(cmd.args[0]);
@@ -1350,7 +1350,7 @@ void Script::varAbsoluteSubValue(Context &c, const Opcode &cmd) {
}
void Script::varAbsoluteSubVar(Context &c, const Opcode &cmd) {
- debugC(kDebugScript, "Opcode %d: Take absolute value of var %d and substract var %d", cmd.op, cmd.args[0], cmd.args[1]);
+ debugC(kDebugScript, "Opcode %d: Take absolute value of var %d and subtract var %d", cmd.op, cmd.args[0], cmd.args[1]);
int32 value = _vm->_state->getVar(cmd.args[0]);
Commit: 830ed3c53b055bfe0a29cdc38ac689bc255adf24
https://github.com/scummvm/scummvm/commit/830ed3c53b055bfe0a29cdc38ac689bc255adf24
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T01:51:50+03:00
Commit Message:
JANITORIAL: NANCY: Fix typos
Changed paths:
engines/nancy/action/inventoryrecords.h
engines/nancy/action/puzzle/soundequalizerpuzzle.cpp
diff --git a/engines/nancy/action/inventoryrecords.h b/engines/nancy/action/inventoryrecords.h
index 4f0639d8bd0..43588c37345 100644
--- a/engines/nancy/action/inventoryrecords.h
+++ b/engines/nancy/action/inventoryrecords.h
@@ -54,7 +54,7 @@ protected:
};
// Displays a static image inside the viewport. The static image corresponds to an
-// inventory item, and is only displayed if the item is not in the player's possesion.
+// inventory item, and is only displayed if the item is not in the player's possession.
// On click, it hides the image and adds the item to the inventory.
class ShowInventoryItem : public RenderActionRecord {
public:
diff --git a/engines/nancy/action/puzzle/soundequalizerpuzzle.cpp b/engines/nancy/action/puzzle/soundequalizerpuzzle.cpp
index 1deebe8b26d..2b2f0691702 100644
--- a/engines/nancy/action/puzzle/soundequalizerpuzzle.cpp
+++ b/engines/nancy/action/puzzle/soundequalizerpuzzle.cpp
@@ -280,7 +280,7 @@ void SoundEqualizerPuzzle::updateSlider(uint sliderID) {
if (sliderVal * 100 >= _solveMinVolume && sliderVal * 100 <= _solveMaxVolume) {
g_nancy->_sound->setVolume(_sounds[sliderID - 3], _maxVolume[sliderID - 3]);
- // Since the rate for the "solve" sound never actualy changes,
+ // Since the rate for the "solve" sound never actually changes,
// we only need the volume to be correct.
NancySceneState.setEventFlag(_solveFlag);
} else {
Commit: fba97454c8f2605afeb50c330e772bdf1d27d6cd
https://github.com/scummvm/scummvm/commit/fba97454c8f2605afeb50c330e772bdf1d27d6cd
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T01:53:47+03:00
Commit Message:
JANITORIAL: SAGA2: Fix typos
Changed paths:
engines/saga2/actor.cpp
engines/saga2/actor.h
engines/saga2/annoy.h
engines/saga2/automap.cpp
engines/saga2/button.cpp
engines/saga2/contain.cpp
engines/saga2/effects.h
engines/saga2/grabinfo.h
engines/saga2/imagcach.cpp
engines/saga2/intrface.cpp
engines/saga2/intrface.h
engines/saga2/main.cpp
engines/saga2/mapfeatr.cpp
engines/saga2/motion.cpp
engines/saga2/objects.cpp
engines/saga2/objects.h
engines/saga2/objproto.cpp
engines/saga2/panel.cpp
engines/saga2/playmode.cpp
engines/saga2/property.cpp
engines/saga2/sagafunc.cpp
engines/saga2/sensor.cpp
engines/saga2/speech.cpp
engines/saga2/spells.h
engines/saga2/sprite.cpp
engines/saga2/stimtype.h
engines/saga2/task.cpp
engines/saga2/tile.cpp
engines/saga2/tile.h
engines/saga2/transit.cpp
diff --git a/engines/saga2/actor.cpp b/engines/saga2/actor.cpp
index e27552cab52..29e5053c101 100644
--- a/engines/saga2/actor.cpp
+++ b/engines/saga2/actor.cpp
@@ -3222,7 +3222,7 @@ void Actor::useKnowledge(scriptCallFrame &scf) {
//-----------------------------------------------------------------------
// Polling function to determine if any of this actor's followers can
-// sense a protaganist within a specified range
+// sense a protagonist within a specified range
bool Actor::canSenseProtaganistIndirectly(SenseInfo &info, int16 range) {
if (_followers != nullptr) {
diff --git a/engines/saga2/actor.h b/engines/saga2/actor.h
index c0b2366b26f..337068748ac 100644
--- a/engines/saga2/actor.h
+++ b/engines/saga2/actor.h
@@ -850,7 +850,7 @@ public:
int16 offenseScore();
// Return a numeric value which roughly estimates this actor's
- // defensive strenght
+ // defensive strength
int16 defenseScore();
// Handle the effect of a successful hit on an opponent in combat
diff --git a/engines/saga2/annoy.h b/engines/saga2/annoy.h
index c2e15d1dd25..4b40f4f4170 100644
--- a/engines/saga2/annoy.h
+++ b/engines/saga2/annoy.h
@@ -74,7 +74,7 @@ void PlayMusic(char IDstr[]);
void PlayLongSound(char IDstr[]);
//-----------------------------------------------------------------------
-// general maintainence
+// general maintenance
bool initAudio();
void startAudio();
diff --git a/engines/saga2/automap.cpp b/engines/saga2/automap.cpp
index 621d924dc2a..070c5803a50 100644
--- a/engines/saga2/automap.cpp
+++ b/engines/saga2/automap.cpp
@@ -165,7 +165,7 @@ AutoMap::AutoMap(const Rect16 box,
: ModalWindow(box, ident, cmd) {
_autoMapCheat = false; // FIXME: Allow setting from debug console
- // setup boundry definitions
+ // setup boundary definitions
_sumMapArea = Rect16(0, 0, kSumMapAreaWidth, kSumMapAreaHeight);
_summaryData = summary;
diff --git a/engines/saga2/button.cpp b/engines/saga2/button.cpp
index 72d5e4fb2d0..7faaac9c973 100644
--- a/engines/saga2/button.cpp
+++ b/engines/saga2/button.cpp
@@ -222,7 +222,7 @@ void *GfxCompImage::getCurrentCompImage() {
}
}
-// waring! : the number of images has has to be == to the inital number
+// warning! : the number of images has has to be == to the initial number
void GfxCompImage::setImages(void **images) {
if (images) {
_compImages = images;
diff --git a/engines/saga2/contain.cpp b/engines/saga2/contain.cpp
index 2ad3697eb0c..313bfd3c401 100644
--- a/engines/saga2/contain.cpp
+++ b/engines/saga2/contain.cpp
@@ -1093,7 +1093,7 @@ ScrollableContainerWindow::ScrollableContainerWindow(
: ContainerWindow(nd, app, saveas) {
_view = new ContainerView(*this, app.viewRect, nd, app);
- // make the button conected to this window
+ // make the button connected to this window
_scrollCompButton = new GfxCompButton(
*this,
app.scrollRect, // rect for button
@@ -1212,7 +1212,7 @@ void TangibleContainerWindow::drawClipped(
IntangibleContainerWindow::IntangibleContainerWindow(
ContainerNode &nd, const ContainerAppearanceDef &app)
: ScrollableContainerWindow(nd, app, "MentalWindow") {
- // make the button conected to this window
+ // make the button connected to this window
_mindSelectorCompButton = new GfxMultCompButton(
*this,
Rect16(49, 15 - 13, 52, 67),
@@ -1242,7 +1242,7 @@ EnchantmentContainerWindow::EnchantmentContainerWindow(
: ContainerWindow(nd, app, "EnchantmentWindow") {
_view = new EnchantmentContainerView(*this, nd, app);
- // make the button conected to this window
+ // make the button connected to this window
_scrollCompButton = new GfxCompButton(
*this,
app.scrollRect, // rect for button
diff --git a/engines/saga2/effects.h b/engines/saga2/effects.h
index 5232085c6d4..ad1657fd09c 100644
--- a/engines/saga2/effects.h
+++ b/engines/saga2/effects.h
@@ -54,7 +54,7 @@ class GameObject;
// Drains : mana drains, money drains, food drains
// Special : must be handled manually
// C TAG effects : There aren't many of these
-// D Global Effects : Effects that have signifigant effect on the game engine
+// D Global Effects : Effects that have significant effect on the game engine
//
enum effectTypes {
diff --git a/engines/saga2/grabinfo.h b/engines/saga2/grabinfo.h
index b2b8ee9dbf6..6c4c4144d78 100644
--- a/engines/saga2/grabinfo.h
+++ b/engines/saga2/grabinfo.h
@@ -29,7 +29,7 @@
namespace Saga2 {
/* ===================================================================== *
class GrabInfo
- this will need to be transfered to grabinfo.h
+ this will need to be transferred to grabinfo.h
* ===================================================================== */
class GrabInfo {
diff --git a/engines/saga2/imagcach.cpp b/engines/saga2/imagcach.cpp
index e2b01f7ff63..b0d6a8de8c9 100644
--- a/engines/saga2/imagcach.cpp
+++ b/engines/saga2/imagcach.cpp
@@ -106,8 +106,8 @@ CImageCache::~CImageCache() {
// for some reason, doing a nodes.last() ( or nodes.first() )
- // here causes an access viloation. This might be caused
- // by list corruption occuring during runtime,
+ // here causes an access violation. This might be caused
+ // by list corruption occurring during runtime,
// I'm going to disable destructor for now to run some tests
// to determine cause. This should not adversely affect normal runtime
// execution as all nodes should be released DURING runtime.
diff --git a/engines/saga2/intrface.cpp b/engines/saga2/intrface.cpp
index 1964170e482..da4a1910941 100644
--- a/engines/saga2/intrface.cpp
+++ b/engines/saga2/intrface.cpp
@@ -649,7 +649,7 @@ void CStatusLine::experationCheck() {
_waitAlarm.set(_lineQueue[_queueTail].frameTime);
_minWaitAlarm.set(_lineQueue[_queueTail].frameTime / 5);
- // copy upto the buffer's size in chars
+ // copy up to the buffer's size in chars
Common::strlcpy(_lineBuf, _lineQueue[_queueTail].text,kBufSize);
_lineBuf[kBufSize - 1] = '\0';
diff --git a/engines/saga2/intrface.h b/engines/saga2/intrface.h
index 2c5daadb639..00f8787c375 100644
--- a/engines/saga2/intrface.h
+++ b/engines/saga2/intrface.h
@@ -38,7 +38,7 @@ namespace Saga2 {
// notes: the load/unload resource functions are to be fazed out in lieu of
// the newer image cache object which will handle duplicate images without
-// all the unwieldly calls
+// all the unwieldy calls
// the appfunc helper functions will eventually be merged into an object
// that will handle all of the trasitive portion of the UI.
diff --git a/engines/saga2/main.cpp b/engines/saga2/main.cpp
index 1e184e79c2a..5bc606443c3 100644
--- a/engines/saga2/main.cpp
+++ b/engines/saga2/main.cpp
@@ -84,7 +84,7 @@ int gameKiller = 0; // will contain the exception th
// Resource files
hResource *resFile, // main resource file
*objResFile, // object resource file
- *auxResFile, // auxillary data resource file
+ *auxResFile, // auxiliary data resource file
*scriptResFile, // script resources
*soundResFile,
*voiceResFile; // sound resources
@@ -182,7 +182,7 @@ void main_saga2() {
}
// ------------------------------------------------------------------------
-// Inner chunk of main - this bizzare nesting is required because VC++
+// Inner chunk of main - this bizarre nesting is required because VC++
// doesn't like try{} catch(){ } blocks in the same routine as its
// __try{} __except(){} blocks
@@ -843,7 +843,7 @@ int32 gamePerformance() {
/********************************************************************/
//-----------------------------------------------------------------------
-// Function to handle miscellanous events to the window.
+// Function to handle miscellaneous events to the window.
// Any panel events which are not handled by individual panels
// are sent to this function.
diff --git a/engines/saga2/mapfeatr.cpp b/engines/saga2/mapfeatr.cpp
index 73e5d68fe3c..c4794932d07 100644
--- a/engines/saga2/mapfeatr.cpp
+++ b/engines/saga2/mapfeatr.cpp
@@ -50,7 +50,7 @@ namespace Saga2 {
new CStaticMapFeature(TilePoint(u,v,0),0,n,STARGATE_COLOR))
/* ===================================================================== *
- Map feature list maintainence
+ Map feature list maintenance
* ===================================================================== */
// ------------------------------------------------------------------------
diff --git a/engines/saga2/motion.cpp b/engines/saga2/motion.cpp
index 51b52bdd285..68a009b9ac0 100644
--- a/engines/saga2/motion.cpp
+++ b/engines/saga2/motion.cpp
@@ -4142,7 +4142,7 @@ void MotionTask::updatePositions() {
} else if (mt->freeFall(obj->_data.location, sti) == false)
moveTaskDone = true;
} else {
- // If actor was running, go through an abreviated
+ // If actor was running, go through an abbreviated
// landing sequence by aborting the landing animation
// after the first frame.
if (mt->_prevMotionType == kMotionTypeWalk
diff --git a/engines/saga2/objects.cpp b/engines/saga2/objects.cpp
index 3852cd8836b..fcd185223de 100644
--- a/engines/saga2/objects.cpp
+++ b/engines/saga2/objects.cpp
@@ -1966,7 +1966,7 @@ bool GameObject::addSensor(Sensor *newSensor) {
}
//-----------------------------------------------------------------------
-// Add a protaganist sensor to this object's sensor list
+// Add a protagonist sensor to this object's sensor list
bool GameObject::addProtaganistSensor(SensorID id, int16 range) {
ProtaganistSensor *newSensor;
@@ -2117,7 +2117,7 @@ void GameObject::removeAllSensors() {
}
//-----------------------------------------------------------------------
-// Polling function to determine if this object can sense a protaganist
+// Polling function to determine if this object can sense a protagonist
// within a specified range
bool GameObject::canSenseProtaganist(SenseInfo &info, int16 range) {
diff --git a/engines/saga2/objects.h b/engines/saga2/objects.h
index 14727cc5a6f..3b1ff2ea781 100644
--- a/engines/saga2/objects.h
+++ b/engines/saga2/objects.h
@@ -445,7 +445,7 @@ public:
}
// query functions:
- ObjectID possessor(); // return actor posessing this object
+ ObjectID possessor(); // return actor possessing this object
// Access functions
ProtoObj *proto() {
diff --git a/engines/saga2/objproto.cpp b/engines/saga2/objproto.cpp
index 50529b9cf86..fb617595137 100644
--- a/engines/saga2/objproto.cpp
+++ b/engines/saga2/objproto.cpp
@@ -2178,7 +2178,7 @@ uint8 ArmorProto::adjustDamage(uint8 damage) {
// Apply damage divider
if (damageDivider != 0) damage /= damageDivider;
- // Apply damage absorbtion
+ // Apply damage absorption
if (damageAbsorbtion < damage)
damage -= damageAbsorbtion;
else
diff --git a/engines/saga2/panel.cpp b/engines/saga2/panel.cpp
index b615c0d3b8c..bcb93cafe60 100644
--- a/engines/saga2/panel.cpp
+++ b/engines/saga2/panel.cpp
@@ -820,7 +820,7 @@ void gToolBase::handleMouse(Common::Event &event, uint32 time) {
|| (_curMouseState.right && !_rightDrag)) // or right button hit
&& _activePanel != nullptr) { // and a panel is active
// Then we have a button hit event. If the button hit
- // is occuring outside the panel, then it should be
+ // is occurring outside the panel, then it should be
// de_selected.
if (_activePanel->_extent.ptInside(_pickPos) == false)
diff --git a/engines/saga2/playmode.cpp b/engines/saga2/playmode.cpp
index 5ba3eb62420..5772379b0a0 100644
--- a/engines/saga2/playmode.cpp
+++ b/engines/saga2/playmode.cpp
@@ -228,7 +228,7 @@ void PlayModeSetup() {
g_vm->_mouseInfo = new GrabInfo;
g_vm->_mouseInfo->setIntent(GrabInfo::kIntWalkTo);
- // Start by displaying first frame stright off, no delay
+ // Start by displaying first frame straight off, no delay
frameAlarm.set(0);
// Test to draw borders.
diff --git a/engines/saga2/property.cpp b/engines/saga2/property.cpp
index 89c8107b629..970b31c48b9 100644
--- a/engines/saga2/property.cpp
+++ b/engines/saga2/property.cpp
@@ -67,7 +67,7 @@ bool objIsPlayerActor(GameObject *obj) {
&& isPlayerActor((Actor *)obj);
}
-// Determine if this object is an enemy of the protaganists
+// Determine if this object is an enemy of the protagonists
bool objIsEnemy(GameObject *obj) {
return isActor(obj)
&& isEnemy((Actor *)obj);
@@ -92,7 +92,7 @@ bool actorIsPlayerActor(Actor *a) {
return isPlayerActor(a);
}
-// Determine if this actor is an enemy of the protaganists
+// Determine if this actor is an enemy of the protagonists
bool actorIsEnemy(Actor *a) {
return isEnemy(a);
}
diff --git a/engines/saga2/sagafunc.cpp b/engines/saga2/sagafunc.cpp
index 5a927de0340..4326cb280b8 100644
--- a/engines/saga2/sagafunc.cpp
+++ b/engines/saga2/sagafunc.cpp
@@ -698,7 +698,7 @@ int16 scriptGameObjectRemoveAllTimers(int16 *args) {
//-----------------------------------------------------------------------
// Create a sensor for this object to detect the proximity of a
-// protaganist
+// protagonist
// int "c" addProtaganistSensor( int sensorID, int range );
int16 scriptGameObjectAddProtaganistSensor(int16 *args) {
@@ -817,7 +817,7 @@ int16 scriptGameObjectRemoveAllSensors(int16 *args) {
}
//-----------------------------------------------------------------------
-// Determine if this object can sense the proximity of a protaganist
+// Determine if this object can sense the proximity of a protagonist
// int "c" canSenseProtaganist( int range );
int16 scriptGameObjectCanSenseProtaganist(int16 *args) {
diff --git a/engines/saga2/sensor.cpp b/engines/saga2/sensor.cpp
index e30d548b407..433e7c78c02 100644
--- a/engines/saga2/sensor.cpp
+++ b/engines/saga2/sensor.cpp
@@ -426,7 +426,7 @@ bool ProtaganistSensor::check(SenseInfo &info, uint32 senseFlags) {
assert(isActor(protag));
- // Skip this protaganist if they're dead
+ // Skip this protagonist if they're dead
if (protag->isDead())
continue;
@@ -434,7 +434,7 @@ bool ProtaganistSensor::check(SenseInfo &info, uint32 senseFlags) {
continue;
// This extra test is a HACK to ensure that the center actor
- // will be able to sense a protaganist even if the protaganist
+ // will be able to sense a protagonist even if the protaganist
// is invisible.
if (!objIsActor || getObject() != getCenterActor()) {
if (!(senseFlags & kActorSeeInvis)
@@ -447,7 +447,7 @@ bool ProtaganistSensor::check(SenseInfo &info, uint32 senseFlags) {
&& !getObject()->inRange(protag->getLocation(), getRange()))
continue;
- // Skip if we're checking for an actor and the protaganist is
+ // Skip if we're checking for an actor and the protagonist is
// not in sight or not under the same roof
if (objIsActor
&& (!underSameRoof(getObject(), protag)
@@ -492,7 +492,7 @@ bool ObjectSensor::check(SenseInfo &info, uint32 senseFlags) {
bool objToTestIsActor = isActor(objToTest);
// This extra test is a HACK to ensure that the center actor
- // will be able to sense a protaganist even if the protaganist
+ // will be able to sense a protagonist even if the protagonist
// is invisible.
if (objToTestIsActor
&& (!objIsActor
@@ -511,7 +511,7 @@ bool ObjectSensor::check(SenseInfo &info, uint32 senseFlags) {
if (!isObjectSought(objToTest))
continue;
- // Skip if we're checking for an actor and the protaganist is
+ // Skip if we're checking for an actor and the protagonist is
// not in sight or not under the same roof
if (objIsActor
&& (!underSameRoof(getObject(), objToTest)
@@ -575,7 +575,7 @@ bool SpecificObjectSensor::check(SenseInfo &info, uint32 senseFlags) {
return false;
// This extra test is a HACK to ensure that the center actor
- // will be able to sense a protaganist even if the protaganist
+ // will be able to sense a protagonist even if the protagonist
// is invisible.
if (isActor(soughtObject)
&& (!objIsActor
@@ -704,7 +704,7 @@ bool SpecificActorSensor::check(SenseInfo &info, uint32 senseFlags) {
return false;
// This extra test is a HACK to ensure that the center actor
- // will be able to sense a protaganist even if the protaganist
+ // will be able to sense a protagonist even if the protagonist
// is invisible.
if (!objIsActor
|| getObject() != getCenterActor()
diff --git a/engines/saga2/speech.cpp b/engines/saga2/speech.cpp
index 4d9d5e74a66..335281ec11d 100644
--- a/engines/saga2/speech.cpp
+++ b/engines/saga2/speech.cpp
@@ -90,7 +90,7 @@ static TextSpan speechLineList[64], // list of speech lines
int16 speechLineCount, // count of speech lines
speechButtonCount; // count of speech buttons
-static StaticPoint16 initialSpeechPosition = {0, 0}; // inital coords of speech
+static StaticPoint16 initialSpeechPosition = {0, 0}; // initial coords of speech
// Image data for the little "bullet"
static uint8 BulletData[] = {
diff --git a/engines/saga2/spells.h b/engines/saga2/spells.h
index fcf18097aed..1bd5bce18a7 100644
--- a/engines/saga2/spells.h
+++ b/engines/saga2/spells.h
@@ -126,7 +126,7 @@ enum SpellID {
kSkillBrawn,
kSkillVitality,
kSkillCartography,
- kSpellCold_Blast = 96, // had to skip because of disapeared skills
+ kSpellCold_Blast = 96, // had to skip because of disappeared skills
kSpellThorn,
kSpellLife_Shield,
kSpellFlame_Shield,
diff --git a/engines/saga2/sprite.cpp b/engines/saga2/sprite.cpp
index 88c289c9d87..006d005564d 100644
--- a/engines/saga2/sprite.cpp
+++ b/engines/saga2/sprite.cpp
@@ -851,7 +851,7 @@ void initSprites() {
delete stream;
}
- stream = loadResourceToStream(spriteRes, missileSpriteID, "missle sprites");
+ stream = loadResourceToStream(spriteRes, missileSpriteID, "missile sprites");
missileSprites = new SpriteSet(stream);
delete stream;
}
diff --git a/engines/saga2/stimtype.h b/engines/saga2/stimtype.h
index 5844c53f59b..3564b1ca17f 100644
--- a/engines/saga2/stimtype.h
+++ b/engines/saga2/stimtype.h
@@ -34,7 +34,7 @@ enum stimuliTypes {
kSenseNothing = 0, // no stimuli
// Situations
- kSenseTimePassed, // time passes with no occurance
+ kSenseTimePassed, // time passes with no occurrence
kSenseProximity, // sense proximity of protagonist
// Idea icons from protagonist
diff --git a/engines/saga2/task.cpp b/engines/saga2/task.cpp
index a83400d59fd..25b251c5770 100644
--- a/engines/saga2/task.cpp
+++ b/engines/saga2/task.cpp
@@ -1147,7 +1147,7 @@ TaskResult GotoTask::update() {
_wander = nullptr;
}
- // Determine if there is aready a motion task, and if so,
+ // Determine if there is already a motion task, and if so,
// whether or not it needs to be modified.
MotionTask *actorMotion = a->_moveTask;
TilePoint actorLoc = a->getLocation();
diff --git a/engines/saga2/tile.cpp b/engines/saga2/tile.cpp
index 8411ab39670..dcece1e2885 100644
--- a/engines/saga2/tile.cpp
+++ b/engines/saga2/tile.cpp
@@ -2702,7 +2702,7 @@ void buildRipTables() {
RipTable *mtRipTable = mt->ripTable(g_vm->_currentMapNum);
- // If meta tile aready has a valid object ripping table, simply
+ // If meta tile already has a valid object ripping table, simply
// recycle it
if (mtRipTable && mtRipTable->ripID == rippedRoofID) {
// Null out pointer
@@ -3438,7 +3438,7 @@ SurfaceType pointOnTile(TileInfo *ti,
subUVPointRel = relPos.y + (relPos.x >> 1) - h;
}
- // Compute the terrain hieght of the first point
+ // Compute the terrain height of the first point
pointH = ptHeight(subUVPoint, ti->attrs.cornerHeight);
while (subUVPoint.u < 16 &&
@@ -3597,7 +3597,7 @@ SurfaceType pointOnTile(TileInfo *ti,
subUVPointRel = subTileRel.y + (subTileRel.x >> 1);
}
- // Compute the terrain hieght of the first point
+ // Compute the terrain height of the first point
pointH = ptHeight((subTile << 2) + subUVPoint, ti->attrs.cornerHeight);
while (subUVPoint.u < 4 &&
@@ -4010,7 +4010,7 @@ StaticTilePoint pickTile(Point32 pos,
}
// If pick point is on vertical surface
- // not facing protaganist, reject tile
+ // not facing protagonist, reject tile
if (surface == surfaceVertU && pCoords.v < protagPos.v)
continue;
if (surface == surfaceVertV && pCoords.u < protagPos.u)
@@ -4051,7 +4051,7 @@ StaticTilePoint pickTile(Point32 pos,
relPos.y += kTileDY;
// Compute new altitude range based upon the tile position
- // relative to the protaganist's position.
+ // relative to the protagonist's position.
zMin = protagPos.z - kMaxPickHeight - (coords - protagPos).quickHDistance();
zMax = protagPos.z + kMaxPickHeight + (coords - protagPos).quickHDistance();
}
@@ -4394,7 +4394,7 @@ void updateMainDisplay() {
_mCoords.v = trackPos.v >> (kTileUVShift + kPlatShift);
_mCoords.z = 0;
- // If trackPos has crossed a metatile boundry, rebuild object
+ // If trackPos has crossed a metatile boundary, rebuild object
// ripping tables
if (_mCoords != ripTableCoords) buildRipTables();
diff --git a/engines/saga2/tile.h b/engines/saga2/tile.h
index 3e4630c4a96..f0de738aae3 100644
--- a/engines/saga2/tile.h
+++ b/engines/saga2/tile.h
@@ -37,7 +37,7 @@
namespace Saga2 {
/* ===================================================================== *
- Tile ID's and asociated functions
+ Tile ID's and associated functions
* ===================================================================== */
class TileBank;
@@ -298,7 +298,7 @@ typedef TileRef *TileRefPtr, **TileRefHandle;
void drawMainDisplay();
/* ===================================================================== *
- TileCycleData: This structure is used to define continously cycling
+ TileCycleData: This structure is used to define continuously cycling
tiles such as waves on the ocean or a flickering torch.
* ===================================================================== */
diff --git a/engines/saga2/transit.cpp b/engines/saga2/transit.cpp
index 590d6c692a0..af3c17f4244 100644
--- a/engines/saga2/transit.cpp
+++ b/engines/saga2/transit.cpp
@@ -64,7 +64,7 @@ void dayNightUpdate() {
uint32 lightLevel = g_vm->_calendar->lightLevel(MAX_LIGHT);
- // Code to avoid unneccessary fades.
+ // Code to avoid unnecessary fades.
if (lightLevel != g_vm->_pal->_prevLightLevel) {
g_vm->_pal->_prevLightLevel = lightLevel;
Commit: 370064f93f23e779a717147d7a8729f9871a5d56
https://github.com/scummvm/scummvm/commit/370064f93f23e779a717147d7a8729f9871a5d56
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T01:55:26+03:00
Commit Message:
JANITORIAL: SCUMM: Fix typos
Changed paths:
engines/scumm/actor.cpp
engines/scumm/akos.cpp
engines/scumm/boxes.cpp
engines/scumm/charset.cpp
engines/scumm/cursor.cpp
engines/scumm/detection_internal.h
engines/scumm/dialogs.cpp
engines/scumm/dialogs.h
engines/scumm/gfx.cpp
engines/scumm/he/gfx_comp/aux_comp.cpp
engines/scumm/he/moonbase/map_katton.h
engines/scumm/he/moonbase/map_main.cpp
engines/scumm/he/net/net_lobby.cpp
engines/scumm/he/net/net_main.cpp
engines/scumm/he/script_v72he.cpp
engines/scumm/imuse/imuse_player.cpp
engines/scumm/imuse_digi/dimuse_files.cpp
engines/scumm/insane/insane.cpp
engines/scumm/macgui/macgui_widgets.cpp
engines/scumm/players/player_ad.cpp
engines/scumm/players/player_towns.cpp
engines/scumm/resource.cpp
engines/scumm/saveload.cpp
engines/scumm/script_v2.cpp
engines/scumm/script_v5.cpp
engines/scumm/script_v6.cpp
engines/scumm/scumm.cpp
engines/scumm/sound.cpp
engines/scumm/string.cpp
diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index e420899c329..8784d906255 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -2436,7 +2436,7 @@ void ScummEngine::processActors() {
if (a->_costume) {
// Unfortunately in V0, the 'animateCostume' call happens right after the call to 'walkActor' (which is before drawing the actor)...
- // doing it the other way with V0, causes animation glitches (when beginnning to walk, as the costume hasnt been updated).
+ // doing it the other way with V0, causes animation glitches (when beginnning to walk, as the costume hasn't been updated).
// Updating the costume directly after 'walkActor' and again, after drawing... causes frame skipping
if (_game.version == 0) {
a->animateCostume();
@@ -2846,7 +2846,7 @@ void Actor::animateActor(int anim) {
stopActorMoving();
}
break;
- case 3: // change direction immediatly
+ case 3: // change direction immediately
if (isInCurrentRoom() ||
!(_vm->_game.version >= 3 && _vm->_game.version <= 6)) {
_moving &= ~MF_TURN;
@@ -2941,7 +2941,7 @@ void Actor_v0::speakCheck() {
#ifdef ENABLE_SCUMM_7_8
void Actor::animateLimb(int limb, int f) {
- // This methods is very similiar to animateCostume().
+ // This methods is very similar to animateCostume().
// However, instead of animating *all* the limbs, it only animates
// the specified limb to be at the frame specified by "f".
diff --git a/engines/scumm/akos.cpp b/engines/scumm/akos.cpp
index 7a57ba30e87..04a83cfed39 100644
--- a/engines/scumm/akos.cpp
+++ b/engines/scumm/akos.cpp
@@ -414,8 +414,8 @@ byte AkosRenderer::drawLimb(const Actor *a, int limb) {
xMoveCur = _xMove + (int16)READ_LE_UINT16(p + 0);
yMoveCur = _yMove + (int16)READ_LE_UINT16(p + 2);
- // WORKAROUND bug #13532: There is a frame (of Freddi's eye) in US release of Freddi 3 accidentaly being big
- // and an horizontal line at the bottom, causing this line to appear at the bottom of the screen.
+ // WORKAROUND bug #13532: There is a frame of Freddi's eye (US release of Freddi 3) accidentally being drawn
+ // big with a horizontal line at the bottom, causing this line to appear at the bottom of the screen.
// We draw the whole frame one pixel down so it does not appear on screen.
if (_vm->_game.id == GID_FREDDI3 && _vm->_language == Common::EN_USA && a->_costume == 258 && (code & AKC_CelMask) == 35 && _vm->enhancementEnabled(kEnhVisualChanges))
_clipOverride.bottom -= 2;
diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp
index 0d1466efe48..dec075eea7f 100644
--- a/engines/scumm/boxes.cpp
+++ b/engines/scumm/boxes.cpp
@@ -1013,7 +1013,7 @@ void ScummEngine::calcItineraryMatrix(byte *itineraryMatrix, int num) {
// Compute the shortest routes between boxes via Kleene's algorithm.
// The original code used some kind of mangled Dijkstra's algorithm;
// while that might in theory be slightly faster, it was
- // a) extremly obfuscated
+ // a) extremely obfuscated
// b) incorrect: it didn't always find the shortest paths
// c) not any faster in reality for our sparse & small adjacent matrices
for (k = 0; k < num; k++) {
@@ -1103,11 +1103,11 @@ bool ScummEngine::areBoxesNeighbors(int box1nr, int box2nr) {
box2 = getBoxCoordinates(box1nr);
box = getBoxCoordinates(box2nr);
- // Roughly, the idea of this algorithm is to search for sies of the given
+ // Roughly, the idea of this algorithm is to search for sides of the given
// boxes that touch each other.
- // In order to keep te code simple, we only match the upper sides;
+ // In order to keep the code simple, we only match the upper sides;
// then, we "rotate" the box coordinates four times each, for a total
- // of 16 comparisions.
+ // of 16 comparisons.
for (int j = 0; j < 4; j++) {
for (int k = 0; k < 4; k++) {
// Are the "upper" sides of the boxes on a single vertical line
diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index 66bf885b31a..21f4ef66f71 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -466,7 +466,7 @@ int CharsetRenderer::getStringWidth(int arg, const byte *text) {
int pos = 0;
bool isV3Towns = _vm->_game.version == 3 && _vm->_game.platform == Common::kPlatformFMTowns;
- // I have confirmed from disasm that neither LOOM EGA and FM-TOWNS (EN/JP) nor any other games withing the
+ // I have confirmed from disasm that neither LOOM EGA and FM-TOWNS (EN/JP) nor any other games within the
// v0-v3 version range add 1 to the width. There isn't even a getStringWidth method. And the v0-2 games don't
// even support text rendering over strip borders. However, LOOM VGA Talkie and MONKEY1 EGA do have the
// getStringWidth method and they do add 1 to the width. So that seems to have been introduced with version 4.
diff --git a/engines/scumm/cursor.cpp b/engines/scumm/cursor.cpp
index 59b46cd10ad..136d6bbb37c 100644
--- a/engines/scumm/cursor.cpp
+++ b/engines/scumm/cursor.cpp
@@ -877,7 +877,7 @@ void ScummEngine_v2::setBuiltinCursor(int idx) {
byte *hotspot = _grabbedCursor + _cursor.hotspotY * _cursor.width + _cursor.hotspotX;
- // Crosshair, slightly assymetric
+ // Crosshair, slightly asymmetric
// TODO: Instead of setting this up via code, we should simply extend
// default_cursor_images to contain this shape.
diff --git a/engines/scumm/detection_internal.h b/engines/scumm/detection_internal.h
index f311347ff55..f50b41979c9 100644
--- a/engines/scumm/detection_internal.h
+++ b/engines/scumm/detection_internal.h
@@ -35,7 +35,7 @@
#include "scumm/file_nes.h"
// Includes some shared functionalities, which is required by multiple TU's.
-// Mark it as static in the header, so visibility for function is limited by the TU, and we can use it whereever required.
+// Mark it as static in the header, so visibility for function is limited by the TU, and we can use it wherever required.
// This is being done, because it's necessary in detection, creating an instance, as well as in initiliasing the ScummEngine.
#include "scumm/detection_steam.h"
diff --git a/engines/scumm/dialogs.cpp b/engines/scumm/dialogs.cpp
index 6175c874a80..a034f30dc1b 100644
--- a/engines/scumm/dialogs.cpp
+++ b/engines/scumm/dialogs.cpp
@@ -1710,7 +1710,7 @@ HENetworkGameOptionsWidget::HENetworkGameOptionsWidget(GuiObject *boss, const Co
text->setLabel(_("Online Server:"));
_lobbyServerAddr = new GUI::EditTextWidget(widgetsBoss(), "HENetworkGameOptionsDialog.LobbyServerAddress", Common::U32String(""), _("Address of the server to connect to for online play. It must start with either \"https://\" or \"http://\" schemas."));
_serverResetButton = addClearButton(widgetsBoss(), "HENetworkGameOptionsDialog.ServerReset", kResetServersCmd);
- _enableCompetitiveMods = new GUI::CheckboxWidget(widgetsBoss(), "HENetworkGameOptionsDialog.EnableCompetitiveMods", _("Enable online competitive mods"), _("Enables custom-made modifications intented for online competitive play."));
+ _enableCompetitiveMods = new GUI::CheckboxWidget(widgetsBoss(), "HENetworkGameOptionsDialog.EnableCompetitiveMods", _("Enable online competitive mods"), _("Enables custom-made modifications intended for online competitive play."));
#endif
} else {
// Network configuration (Include LAN settings)
diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h
index aba64a02222..763fa65fcba 100644
--- a/engines/scumm/dialogs.h
+++ b/engines/scumm/dialogs.h
@@ -67,7 +67,7 @@ protected:
/**
* A dialog which displays an arbitrary message to the user and returns
- * ther users reply as its result value. More specifically, it returns
+ * the users reply as its result value. More specifically, it returns
* the ASCII code of the key used to close the dialog (0 if a mouse
* click closed the dialog).
*/
diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 0e9c496bdc7..5e4fdb84c5e 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -869,7 +869,7 @@ const byte *ScummEngine::postProcessDOSGraphics(VirtScreen *vs, int &pitch, int
}
} else if (renderHerc || _renderMode == Common::kRenderCGA_BW) {
- // The monochrome rendering is very similiar for Hercules and CGA b/w. For Hercules we have to do some corrections to fit into the 350 pixels height.
+ // The monochrome rendering is very similar for Hercules and CGA b/w. For Hercules we have to do some corrections to fit into the 350 pixels height.
// For Hercules V1/2, the text and verb vs are rendered in normal height, only the main vs gets scaled by leaving out every other line. Hercules V4
// instead scales everything in a 4-to-7 lines ratio. And for all versions, we center the image horizontally within the 720 pixels width.
// For CGA b/w the origial resolution is 640x200, so we just scale that to our 640x400 by repeating each line.
@@ -4679,7 +4679,7 @@ void ScummEngine::dissolveEffect(int width, int height) {
// The original construct the image piece by piece but blits it
// every time it finds an offset smaller than the height of the virtual
// screen. This is trivial to do in our code, so we just sleep for a
- // quarter frame everytime the condition above is met.
+ // quarter frame every time the condition above is met.
//
// If we ever get a blitsToFreeze == 0, we will use 18 in its place
// since it's the most typical value got out of the calculations.
diff --git a/engines/scumm/he/gfx_comp/aux_comp.cpp b/engines/scumm/he/gfx_comp/aux_comp.cpp
index 1052e7fb950..f109a9ddf12 100644
--- a/engines/scumm/he/gfx_comp/aux_comp.cpp
+++ b/engines/scumm/he/gfx_comp/aux_comp.cpp
@@ -852,7 +852,7 @@ int Wiz::auxHitTestTRLEXPos(const byte *dataStream, int skipAmount) {
}
int Wiz::auxHitTestTRLEImageRelPos(const byte *compData, int x, int y, int width, int height) {
- // Quickly reject points outside the image boundry.
+ // Quickly reject points outside the image boundary.
if ((x < 0) || (width <= x) || (y < 0) || (height <= y)) {
return 0;
}
@@ -920,7 +920,7 @@ int Wiz::auxPixelHitTestTRLEXPos(byte *dataStream, int skipAmount, int transpare
}
int Wiz::auxPixelHitTestTRLEImageRelPos(byte *compData, int x, int y, int width, int height, int transparentValue) {
- // Quickly reject points outside the image boundry.
+ // Quickly reject points outside the image boundary.
if ((x < 0) || (width <= x) || (y < 0) || (height <= y)) {
return transparentValue;
}
diff --git a/engines/scumm/he/moonbase/map_katton.h b/engines/scumm/he/moonbase/map_katton.h
index 213ab191144..2527647d1bf 100644
--- a/engines/scumm/he/moonbase/map_katton.h
+++ b/engines/scumm/he/moonbase/map_katton.h
@@ -63,7 +63,7 @@ private:
int findcoord(int value, int move);
int replacenum(int replacee, int replacer);
int fattenone(int x, int y, int howfat, int middle, int ignorer, int replacer);
- // howfat: postive 1-5 for distance, -100 to 0 for random 3 spread from 2 to 5.
+ // howfat: positive 1-5 for distance, -100 to 0 for random 3 spread from 2 to 5.
int fattenall(int howfat, int middle, int ignorer, int replacer);
int findstartloc();
int whatheightstartloc(int x, int y);
diff --git a/engines/scumm/he/moonbase/map_main.cpp b/engines/scumm/he/moonbase/map_main.cpp
index 19b91881b99..33d5c4320fb 100644
--- a/engines/scumm/he/moonbase/map_main.cpp
+++ b/engines/scumm/he/moonbase/map_main.cpp
@@ -68,7 +68,7 @@ bool Map::generateNewMap() {
return false;
// Create a new seed just for the below values. This is to
- // ensure these are truely random after generating a previous
+ // ensure these are truly random after generating a previous
// map (or to debug with a prefixed seed).
_rnd.generateNewSeed();
@@ -173,7 +173,7 @@ bool Map::generateMapWithInfo(Common::String encodedMap, uint8 generator, int se
_generatedMap = new MapFile();
bool success = Common::b64DecodeData(encodedMap, _generatedMap);
if (!success) {
- warning("Map: Error has occured when decoding map data from base64");
+ warning("Map: Error has occurred while decoding map data from base64");
return false;
}
_mapGenerated = true;
diff --git a/engines/scumm/he/net/net_lobby.cpp b/engines/scumm/he/net/net_lobby.cpp
index dd79a1a98af..e1c253ccdeb 100644
--- a/engines/scumm/he/net/net_lobby.cpp
+++ b/engines/scumm/he/net/net_lobby.cpp
@@ -241,7 +241,7 @@ int32 Lobby::dispatch(int op, int numArgs, int32 *args) {
break;
case OP_NET_PING_OPPONENT:
// NOTE: See getUserProfile, this op only gets
- // called after an oponent picks up the phone.
+ // called after an opponent picks up the phone.
break;
case OP_NET_RECEIVER_BUSY:
sendBusy(args[0]);
diff --git a/engines/scumm/he/net/net_main.cpp b/engines/scumm/he/net/net_main.cpp
index 23c68e388db..e009bccad95 100644
--- a/engines/scumm/he/net/net_main.cpp
+++ b/engines/scumm/he/net/net_main.cpp
@@ -1055,7 +1055,7 @@ void Net::handleSessionServerData(Common::String data) {
// destinated address, allowing someone with the same address to
// communicate with us. This does not work with every router though...
//
- // More infomation: https://en.wikipedia.org/wiki/UDP_hole_punching
+ // More information: https://en.wikipedia.org/wiki/UDP_hole_punching
debugC(DEBUG_NETWORK, "NETWORK: Hole punching %s:%d", address.host.c_str(), address.port);
_sessionHost->sendRawData(address.host, address.port, "");
}
diff --git a/engines/scumm/he/script_v72he.cpp b/engines/scumm/he/script_v72he.cpp
index 08548607870..c3d1293368b 100644
--- a/engines/scumm/he/script_v72he.cpp
+++ b/engines/scumm/he/script_v72he.cpp
@@ -2182,7 +2182,7 @@ void ScummEngine_v72he::o72_readINI() {
} else if (!strcmp((char *)option, "GameResourcePath") || !strcmp((char *)option, "SaveGamePath")) {
// We set SaveGamePath in order to detect where it used
// in convertFilePath and to avoid warning about invalid
- // path in Macintosh verisons.
+ // path in Macintosh versions.
data = defineArray(0, kStringArray, 0, 0, 0, 2);
if (_game.platform == Common::kPlatformMacintosh)
memcpy(data, (const char *)"*:", 2);
diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp
index 7312a2521aa..e04bd4acac8 100644
--- a/engines/scumm/imuse/imuse_player.cpp
+++ b/engines/scumm/imuse/imuse_player.cpp
@@ -913,7 +913,7 @@ int Player::query_part_param(int param, byte chan) {
void Player::onTimer() {
// First handle any parameter transitions
- // that are occuring.
+ // that are occurring.
transitionParameters();
// Since the volume parameter can cause
diff --git a/engines/scumm/imuse_digi/dimuse_files.cpp b/engines/scumm/imuse_digi/dimuse_files.cpp
index b98f5957c29..994e93cf17f 100644
--- a/engines/scumm/imuse_digi/dimuse_files.cpp
+++ b/engines/scumm/imuse_digi/dimuse_files.cpp
@@ -147,7 +147,7 @@ int IMuseDigiFilesHandler::getNextSound(int soundId) {
int IMuseDigiFilesHandler::seek(int soundId, int32 offset, int mode, int bufId) {
// This function and files_read() are used for sounds for which a stream is needed (speech
// and music), therefore they will always refer to sounds in a bundle file for DIG and COMI
- // The seeked position is in reference to the decompressed sound
+ // The seek'd position is in reference to the decompressed sound
if (_engine->isEngineDisabled())
return 0;
diff --git a/engines/scumm/insane/insane.cpp b/engines/scumm/insane/insane.cpp
index 19b1b20ed10..8d3deaa475c 100644
--- a/engines/scumm/insane/insane.cpp
+++ b/engines/scumm/insane/insane.cpp
@@ -715,12 +715,12 @@ void Insane::readState() { // PATCH
// FIXME
// This used to be here but.
- // - bootparam 551 gives googles without cavefish met
- // - when you get the ramp, googles disappear, but you already won the cavefish
+ // - bootparam 551 gives goggles without cavefish met
+ // - when you get the ramp, goggles disappear, but you already won the cavefish
// Incorrect situation would be
- // you won cavefish, don't have googles, don't have ramp
+ // you won cavefish, don't have goggles, don't have ramp
//
- // So if you find out what how to check ramp presense, feel free to add check here
+ // So if you find out how to check ramp presence, feel free to add check here
// (beware of FT ver a and ver b. In version b var311 is inserted and all vars >311
// are shifted),
//
diff --git a/engines/scumm/macgui/macgui_widgets.cpp b/engines/scumm/macgui/macgui_widgets.cpp
index 8e73ad62eea..5a76fdf6712 100644
--- a/engines/scumm/macgui/macgui_widgets.cpp
+++ b/engines/scumm/macgui/macgui_widgets.cpp
@@ -1152,7 +1152,7 @@ void MacGuiImpl::MacSlider::handleMouseMove(Common::Event &event) {
int y1 = _handlePos + 16;
// Drawing a solid rectangle would be easier, and probably look
- // better. But it seems the orginal Mac widget would draw the
+ // better. But it seems the original Mac widget would draw the
// frame as an inverted slider background, even when drawing it
// on top of the slider handle.
diff --git a/engines/scumm/players/player_ad.cpp b/engines/scumm/players/player_ad.cpp
index 84fffb62fc4..15c41f35378 100644
--- a/engines/scumm/players/player_ad.cpp
+++ b/engines/scumm/players/player_ad.cpp
@@ -231,7 +231,7 @@ void Player_AD::saveLoadWithSerializer(Common::Serializer &s) {
}
// Finally start up the SFX. This makes sure that they are not
- // accidently stopped while seeking to the old music position.
+ // accidentally stopped while seeking to the old music position.
if (s.isLoading()) {
for (int i = 1; i < ARRAYSIZE(res); ++i) {
if (res[i] != -1) {
diff --git a/engines/scumm/players/player_towns.cpp b/engines/scumm/players/player_towns.cpp
index 296e635c85b..b5c232add22 100644
--- a/engines/scumm/players/player_towns.cpp
+++ b/engines/scumm/players/player_towns.cpp
@@ -397,7 +397,7 @@ void Player_Towns_v1::restoreAfterLoad() {
ptr += 2;
// WORKAROUND for bug #1873 INDY3 FMTOWNS: Music in Venice is distorted
- // The resource for sound 40 accidently sets the sound type to 255 instead of 1.
+ // The resource for sound 40 accidentally sets the sound type to 255 instead of 1.
if (ptr[7] == 1 || (_vm->_game.id == GID_INDY3 && _eupCurrentSound == 40)) {
setSoundVolume(_eupCurrentSound, _eupVolLeft, _eupVolRight);
playEuphonyTrack(_eupCurrentSound, ptr);
diff --git a/engines/scumm/resource.cpp b/engines/scumm/resource.cpp
index 76f5fe81ffa..8bf3b535c74 100644
--- a/engines/scumm/resource.cpp
+++ b/engines/scumm/resource.cpp
@@ -566,7 +566,7 @@ void ScummEngine::loadCharset(int no) {
debugC(DEBUG_GENERAL, "loadCharset(%d)", no);
- /* FIXME - hack around crash in Indy4 (occurs if you try to load after dieing) */
+ /* FIXME - hack around crash in Indy4 (occurs if you try to load after dying) */
if (_game.id == GID_INDY4 && no == 0)
no = 1;
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index f92f8ea6942..19b93764c88 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -745,7 +745,7 @@ bool ScummEngine::loadState(int slot, bool compat, Common::String &filename) {
memset(_newNames, 0, sizeof(_newNames[0]) * _numNewNames);
// Because old savegames won't fill the entire gfxUsageBits[] array,
- // clear it here just to be sure it won't hold any unforseen garbage.
+ // clear it here just to be sure it won't hold any unforeseen garbage.
memset(gfxUsageBits, 0, sizeof(gfxUsageBits));
// Nuke all resources
diff --git a/engines/scumm/script_v2.cpp b/engines/scumm/script_v2.cpp
index a0ed8fd60f8..6d3f62ddf1e 100644
--- a/engines/scumm/script_v2.cpp
+++ b/engines/scumm/script_v2.cpp
@@ -1282,7 +1282,7 @@ void ScummEngine_v2::o2_putActorInRoom() {
// After first using the blue crystal, a cutscene of the two Caponians plays (script-96),
// locking object 344 (which prevents the cutscene playing again) and setting Var[245] to 0x18.
// script-5 uses this variable to set the Caponian costume
- // On first apperance after using the blue crystal, the Caponians now will have the disguise on
+ // On first appearance after using the blue crystal, the Caponians now will have the disguise on
//
// If you visit the spacecraft and ring the doorbell, Var[245] will be set to 0x1C (Disguise off)
// Using the blue crystal again, will result in the Caponian appearing without his disguise
@@ -1291,7 +1291,7 @@ void ScummEngine_v2::o2_putActorInRoom() {
//
// We don't touch the variable in the following situations
// If the Caponian is being put into the space ship room, or the current room is the
- // space ship and the Caponian is being put into the backroom of the telephone company (you didnt show your fan club card)
+ // space ship and the Caponian is being put into the backroom of the telephone company (you didn't show your fan club card)
//
// TODO: choose an Enhancement class for this
if (_game.id == GID_ZAK && _game.version <= 2 && act == 7) {
diff --git a/engines/scumm/script_v5.cpp b/engines/scumm/script_v5.cpp
index 36ef84964fc..ce445eb570d 100644
--- a/engines/scumm/script_v5.cpp
+++ b/engines/scumm/script_v5.cpp
@@ -3347,7 +3347,7 @@ void ScummEngine_v5::decodeParseString() {
}
// Slightly increase the delay (5 frames = 1/25 of a second).
- // This noticably improves the experience in Loom CD.
+ // This noticeably improves the experience in Loom CD.
delay = (int)(delay * 7.5 + 5);
_sound->playCDTrack(1, 1, offset, delay);
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 6cc2c449684..911cae9a84e 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -771,7 +771,7 @@ void ScummEngine_v6::o6_eq() {
// WORKAROUND: Online play is disabled in the Macintosh versions of Backyard Football and Backyard Baseball 2001
// because the original U32 makes use of DirectPlay, a Windows exclusive API; we now have our own implementation
- // which is cross-platform compatable. We get around that by tricking those checks that we are playing on
+ // which is cross-platform compatible. We get around that by tricking those checks that we are playing on
// the Windows version. These scripts check VAR_PLATFORM (b) against the value (2) of the Macintosh platform (a).
} else if (_game.id == GID_FOOTBALL && _currentRoom == 2 && (vm.slot[_currentScript].number == 2049 || vm.slot[_currentScript].number == 2050 ||
#else
@@ -2760,7 +2760,7 @@ void ScummEngine_v6::o6_delay() {
void ScummEngine_v6::o6_delaySeconds() {
uint32 delay = (uint32)pop();
- // WORKAROUND: On Baseball 2001, this script downloads the news, poll and banner infomation.
+ // WORKAROUND: On Baseball 2001, this script downloads the news, poll and banner information.
// It gives a one second break before validating that the download has completed, which is
// a tad bit too long. So let's turn that into a one frame break. This is safe because
// the script also checks if either var135 == 1, or the check has been done
@@ -3406,7 +3406,7 @@ int ScummEngine::getActionState(ScummAction action) {
void ScummEngine_v6::o6_delayFrames() {
// WORKAROUND: At startup, Moonbase Commander will pause for 20 frames before
// showing the Infogrames logo. The purpose of this break is to give time for the
- // GameSpy Arcade application to fill with the online game infomation.
+ // GameSpy Arcade application to fill with the online game information.
//
// [0000] (84) localvar2 = max(readConfigFile.number(":var263:","user","wait-for-gamespy"),10)
// [0029] (08) delayFrames((localvar2 * 2))
@@ -3414,7 +3414,7 @@ void ScummEngine_v6::o6_delayFrames() {
// But since we don't support GameSpy and have our own online support, this break
// has become redundant and only wastes time.
//
- // WORKAROUND: On Baseball 2001, there is a 10 frame pause before sending the login infomation
+ // WORKAROUND: On Baseball 2001, there is a 10 frame pause before sending the login information
// to the server. This is rather a pointless break, so let's skip that.
if ((_game.id == GID_MOONBASE && vm.slot[_currentScript].number == 69) ||
(_game.id == GID_BASEBALL2001 && _currentRoom == 37 && vm.slot[_currentScript].number == 2068)) {
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index ada525028ba..46e6920fb78 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -777,7 +777,7 @@ ScummEngine_v90he::ScummEngine_v90he(OSystem *syst, const DetectorResult &dr)
_videoParams.wizResNum = 0;
#ifdef USE_ENET
- /* Online stuff for compatable HE games */
+ /* Online stuff for compatible HE games */
_net = 0;
if (_game.id == GID_FOOTBALL || _game.id == GID_BASEBALL2001 || _game.id == GID_FOOTBALL2002 ||
_game.id == GID_MOONBASE) {
@@ -3392,7 +3392,7 @@ void ScummEngine_v3::scummLoop_handleSaveLoad() {
byte restoreScript = (_game.platform == Common::kPlatformFMTowns) ? 17 : 18;
args[0] = 2;
runScript(restoreScript, 0, 0, args);
- // Reset two variables, similiar to what the save script would do, to avoid minor glitches
+ // Reset two variables, similar to what the save script would do, to avoid minor glitches
// of the verb image on the right of the distaff (image remainung blank when moving the
// mouse cursor over an object, bug #13369).
VAR(saveLoadVar + 2) = VAR(saveLoadVar + 3) = 0;
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 0487851f060..a4e29098ab8 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -416,7 +416,7 @@ void Sound::triggerSound(int soundID) {
// There are at least two main variants: in one,
// there are two subchunks AUhd and AUdt, in the other
// the chunks are called WVhd and WVdt. Besides that,
- // the two variants seem pretty similiar.
+ // the two variants seem pretty similar.
// The first subchunk (AUhd resp. WVhd) seems to always
// contain three bytes (00 00 80) of unknown meaning.
diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index 65fc7c1c771..cffb5619da2 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -1614,7 +1614,7 @@ int ScummEngine::convertVerbMessage(byte *dst, int dstSize, int var) {
num = readVar(var);
if (num) {
for (k = 1; k < _numVerbs; k++) {
- // Fix ZAK FM-TOWNS bug #1734 by emulating exact (inconsistant?) behavior of the original code
+ // Fix ZAK FM-TOWNS bug #1734 by emulating exact (inconsistent?) behavior of the original code
if (num == _verbs[k].verbid && !_verbs[k].type && (!_verbs[k].saveid || (_game.version == 3 && _game.platform == Common::kPlatformFMTowns))) {
// Process variation of Korean postpositions
// Used by Korean fan translated games (monkey1, monkey2)
Commit: 92c3ec01566a43d56ec70b2804134f409a7ddb3c
https://github.com/scummvm/scummvm/commit/92c3ec01566a43d56ec70b2804134f409a7ddb3c
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T01:57:23+03:00
Commit Message:
JANITORIAL: ULTIMA: Fix typos
Changed paths:
engines/ultima/nuvie/actors/u6_actor.cpp
engines/ultima/nuvie/core/effect.cpp
engines/ultima/nuvie/core/events.cpp
engines/ultima/nuvie/core/timed_event.h
engines/ultima/nuvie/files/u6_lzw.cpp
engines/ultima/nuvie/gui/widgets/map_window.cpp
engines/ultima/nuvie/misc/iavl_tree.cpp
engines/ultima/nuvie/sound/adplug/fm_opl.cpp
engines/ultima/nuvie/sound/adplug/opl_class.cpp
engines/ultima/nuvie/sound/sound_manager.h
engines/ultima/nuvie/usecode/u6_usecode.cpp
engines/ultima/nuvie/views/container_widget.cpp
engines/ultima/nuvie/views/inventory_widget.cpp
engines/ultima/shared/core/map.h
engines/ultima/shared/core/widgets.h
engines/ultima/shared/maps/creature.h
engines/ultima/shared/maps/map_widget.h
engines/ultima/ultima1/maps/map_overworld.cpp
engines/ultima/ultima1/widgets/dungeon_monster.cpp
engines/ultima/ultima1/widgets/dungeon_monster.h
engines/ultima/ultima4/controllers/intro_controller.cpp
engines/ultima/ultima4/controllers/intro_controller.h
engines/ultima/ultima4/filesys/savegame.h
engines/ultima/ultima4/game/creature.h
engines/ultima/ultima4/gfx/image.h
engines/ultima/ultima8/audio/sound_flex.cpp
engines/ultima/ultima8/gfx/cycle_process.cpp
engines/ultima/ultima8/gumps/gump.cpp
engines/ultima/ultima8/gumps/u8_save_gump.cpp
engines/ultima/ultima8/ultima8.cpp
engines/ultima/ultima8/ultima8.h
engines/ultima/ultima8/usecode/regret_intrinsics.h
engines/ultima/ultima8/usecode/remorse_intrinsics.h
engines/ultima/ultima8/world/crosshair_process.cpp
engines/ultima/ultima8/world/item.cpp
engines/ultima/ultima8/world/item_selection_process.cpp
engines/ultima/ultima8/world/snap_process.cpp
engines/ultima/ultima8/world/sort_item.h
engines/ultima/ultima8/world/target_reticle_process.cpp
engines/ultima/ultima8/world/target_reticle_process.h
diff --git a/engines/ultima/nuvie/actors/u6_actor.cpp b/engines/ultima/nuvie/actors/u6_actor.cpp
index 72df96d6f1a..c4bce764f3b 100644
--- a/engines/ultima/nuvie/actors/u6_actor.cpp
+++ b/engines/ultima/nuvie/actors/u6_actor.cpp
@@ -291,7 +291,7 @@ bool U6Actor::init_silver_serpent() {
if (obj != nullptr) //old snake
gather_snake_objs_from_map(obj, x, y, z);
else { //new snake
- //FIXME we need to make long, randomly layed out snakes here!
+ //FIXME: we need to make long, randomly laid out snakes here!
init_new_silver_serpent();
}
@@ -598,7 +598,7 @@ bool U6Actor::check_move(uint16 new_x, uint16 new_y, uint8 new_z, ActorMoveFlags
case MOVETYPE_U6_AIR_LOW :
map_tile = map->get_tile(new_x, new_y, new_z, MAP_ORIGINAL_TILE);
- if (map_tile->flags1 & TILEFLAG_WALL) //low air boundry
+ if (map_tile->flags1 & TILEFLAG_WALL) //low air boundary
return false;
map_tile = obj_manager->get_obj_tile(new_x, new_y, new_z, false);
diff --git a/engines/ultima/nuvie/core/effect.cpp b/engines/ultima/nuvie/core/effect.cpp
index d12f3ad19ca..2c46e83349d 100644
--- a/engines/ultima/nuvie/core/effect.cpp
+++ b/engines/ultima/nuvie/core/effect.cpp
@@ -882,7 +882,7 @@ uint16 SleepEffect::callback(uint16 msg, CallBack *caller, void *data) {
if (msg == MESG_EFFECT_COMPLETE) {
if (timer == nullptr) { // starting
if (stop_time != "") { // advance to start time
- timer = new TimedAdvance(stop_time, 360); // 6 hours per second FIXME: it isnt going anywhere near that fast
+ timer = new TimedAdvance(stop_time, 360); // 6 hours per second FIXME: it isn't going anywhere near that fast
timer->set_target(this);
timer->get_time_from_string(stop_hour, stop_minute, stop_time);
// stop_hour & stop_minute are checked each hour
@@ -1090,7 +1090,7 @@ inline bool FadeEffect::find_free_pixel(uint32 &rnum, uint32 pixelCount) {
/* Returns the next pixel to check/colorize. */
#if 0
#warning this crashes if x,y is near boundary
-#warning make sure center_thresh doesnt go over boundary
+#warning make sure center_thresh doesn't go over boundary
inline uint32 FadeEffect::get_random_pixel(uint16 center_thresh) {
if (center_x == -1 || center_y == -1)
return (NUVIE_RAND() % pixel_count);
diff --git a/engines/ultima/nuvie/core/events.cpp b/engines/ultima/nuvie/core/events.cpp
index 21081c4c4e5..8cf2b7d58be 100644
--- a/engines/ultima/nuvie/core/events.cpp
+++ b/engines/ultima/nuvie/core/events.cpp
@@ -3474,7 +3474,7 @@ bool Events::newAction(EventMode new_mode) {
drop_start();
// fall through
case EQUIP_MODE: // if this was called from moveCursorToInventory, the
- // mode has now changed, so it wont be called again
+ // mode has now changed, so it won't be called again
moveCursorToInventory();
break;
// case DROPCOUNT_MODE:
@@ -3755,7 +3755,7 @@ bool Events::can_get_to_actor(const Actor *actor, uint16 x, uint16 y) { // need
Map *map = game->get_game_map();
MapCoord player_loc = player->get_actor()->get_location();
-// FIXME false obj matches can occur (should be extremly rare)
+// FIXME: false obj matches can occur (should be extremely rare)
if (map->lineTest(player_loc.x, player_loc.y, x, y, player_loc.z, LT_HitUnpassable, lt)
&& (!lt.hitObj || lt.hitObj->quality != actor->get_actor_num())) // actor part
return false;
diff --git a/engines/ultima/nuvie/core/timed_event.h b/engines/ultima/nuvie/core/timed_event.h
index 41edb5e40b0..f7869eeda56 100644
--- a/engines/ultima/nuvie/core/timed_event.h
+++ b/engines/ultima/nuvie/core/timed_event.h
@@ -187,7 +187,7 @@ public:
#endif
-//FIXME: It isnt container search. Its a msgscroll effect to print one line at a time.
+//FIXME: It isn't container search. Its a msgscroll effect to print one line at a time.
/* Dump one item at a time out of a container, and print it's name to MsgScroll.
*/
class TimedContainerSearch : public TimedEvent {
diff --git a/engines/ultima/nuvie/files/u6_lzw.cpp b/engines/ultima/nuvie/files/u6_lzw.cpp
index cfd0c49185e..e92b516af88 100644
--- a/engines/ultima/nuvie/files/u6_lzw.cpp
+++ b/engines/ultima/nuvie/files/u6_lzw.cpp
@@ -51,7 +51,7 @@ U6Lzw::~U6Lzw() {
*/
unsigned char *U6Lzw::compress_buffer(unsigned char *src, uint32 src_len,
uint32 &dest_len) {
- // FIXME - didnt bother fixing this since its output will be larger than
+ // FIXME - didn't bother fixing this since its output will be larger than
// the uncompressed data
uint32 blocks = 0; //, block = 0, b = 0, d = 0, rshift = 0;
//uint16 val = 0;
diff --git a/engines/ultima/nuvie/gui/widgets/map_window.cpp b/engines/ultima/nuvie/gui/widgets/map_window.cpp
index 8dd0acbcccd..52ccf424d91 100644
--- a/engines/ultima/nuvie/gui/widgets/map_window.cpp
+++ b/engines/ultima/nuvie/gui/widgets/map_window.cpp
@@ -961,7 +961,7 @@ inline void MapWindow::drawActor(const Actor *actor) {
}
void MapWindow::drawObjs() {
-//FIX we need to make this more efficent.
+//FIXME: we need to make this more efficient.
drawObjSuperBlock(true, false); //draw force lower objects
drawObjSuperBlock(false, false); //draw lower objects
diff --git a/engines/ultima/nuvie/misc/iavl_tree.cpp b/engines/ultima/nuvie/misc/iavl_tree.cpp
index 5a6bf3db743..a893154db5a 100644
--- a/engines/ultima/nuvie/misc/iavl_tree.cpp
+++ b/engines/ultima/nuvie/misc/iavl_tree.cpp
@@ -283,7 +283,7 @@ iAVLNode *iAVLCloseSearchNode(iAVLTree const *avltree, iAVLKey key) {
/*
* iAVLRebalanceNode:
* Rebalances the AVL tree if one side becomes too heavy. This function
- * assumes that both subtrees are AVL trees with consistant data. This
+ * assumes that both subtrees are AVL trees with consistent data. This
* function has the additional side effect of recalculating the depth of
* the tree at this node. It should be noted that at the return of this
* function, if a rebalance takes place, the top of this subtree is no
diff --git a/engines/ultima/nuvie/sound/adplug/fm_opl.cpp b/engines/ultima/nuvie/sound/adplug/fm_opl.cpp
index b8baf88e63f..d4f77f8c404 100644
--- a/engines/ultima/nuvie/sound/adplug/fm_opl.cpp
+++ b/engines/ultima/nuvie/sound/adplug/fm_opl.cpp
@@ -456,7 +456,7 @@ static unsigned int sin_tab[SIN_LEN * 4];
The whole table takes: 64 * 210 = 13440 samples.
When AM = 1 data is used directly
- When AM = 0 data is divided by 4 before being used (loosing precision is important)
+ When AM = 0 data is divided by 4 before being used (losing precision is important)
*/
#define LFO_AM_TAB_ELEMENTS 210
@@ -1457,7 +1457,7 @@ static void OPLWriteReg(FM_OPL *OPL, int r, int v)
logerror("OPL:write unmapped KEYBOARD port\n");
}
break;
- case 0x07: /* DELTA-T controll : START,REC,MEMDATA,REPT,SPOFF,x,x,RST */
+ case 0x07: /* DELTA-T control : START,REC,MEMDATA,REPT,SPOFF,x,x,RST */
if(OPL->type&OPL_TYPE_ADPCM)
YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v);
break;
@@ -1902,7 +1902,7 @@ static int OPLTimerOver(FM_OPL *OPL,int c)
else
{ /* Timer A */
OPL_STATUS_SET(OPL,0x40);
- /* CSM mode key,TL controll */
+ /* CSM mode key,TL control */
if( OPL->mode & 0x80 )
{ /* CSM mode total level latch and auto key on */
int ch;
diff --git a/engines/ultima/nuvie/sound/adplug/opl_class.cpp b/engines/ultima/nuvie/sound/adplug/opl_class.cpp
index e2551de9509..dae5a15b02c 100644
--- a/engines/ultima/nuvie/sound/adplug/opl_class.cpp
+++ b/engines/ultima/nuvie/sound/adplug/opl_class.cpp
@@ -289,7 +289,7 @@ static const uint8 mul_tab[16] = {
The whole table takes: 64 * 210 = 13440 samples.
When AM = 1 data is used directly
- When AM = 0 data is divided by 4 before being used (loosing precision is important)
+ When AM = 0 data is divided by 4 before being used (losing precision is important)
*/
#define LFO_AM_TAB_ELEMENTS 210
@@ -1486,7 +1486,7 @@ static int OPLTimerOver(FM_OPL *OPL, int c) {
} else {
/* Timer A */
OPL_STATUS_SET(OPL, 0x40);
- /* CSM mode key,TL controll */
+ /* CSM mode key,TL control */
if (OPL->mode & 0x80) {
/* CSM mode total level latch and auto key on */
int ch;
diff --git a/engines/ultima/nuvie/sound/sound_manager.h b/engines/ultima/nuvie/sound/sound_manager.h
index d9ec4470514..fe188449449 100644
--- a/engines/ultima/nuvie/sound/sound_manager.h
+++ b/engines/ultima/nuvie/sound/sound_manager.h
@@ -24,7 +24,7 @@
//priorities:
//todo:
-//-sample loading partialy implemented, will do later (now is 21/01/04)
+//-sample loading partially implemented, will do later (now is 21/01/04)
//-make songs fade in & out - add query/callback for end of song so that they can cycle
//-make samples sound from mapwindow
//-make samples fade in & out according to distance
diff --git a/engines/ultima/nuvie/usecode/u6_usecode.cpp b/engines/ultima/nuvie/usecode/u6_usecode.cpp
index 203a6d0d9b5..6e87b701fd9 100644
--- a/engines/ultima/nuvie/usecode/u6_usecode.cpp
+++ b/engines/ultima/nuvie/usecode/u6_usecode.cpp
@@ -1526,7 +1526,7 @@ bool U6UseCode::use_crystal_ball(Obj *obj, UseCodeEvent ev) {
/* USE: Enter instrument playing mode, with sound for used object. */
bool U6UseCode::play_instrument(Obj *obj, UseCodeEvent ev) {
-// FIXME: need intrument sounds AND a config option to simply change music
+// FIXME: need instrument sounds AND a config option to simply change music
// track when an instrument is played. Maybe NORTH_KEY and SOUTH_KEY can cycle through sounds/music and DO_ACTION_KEY can play it.
/// FIXME: also some floating music note icons like in U7
game->get_event()->close_gumps(); // gumps will steal input
@@ -2275,7 +2275,7 @@ bool U6UseCode::use_horse(Obj *obj, UseCodeEvent ev) {
// create a temporary horse on the map.
actor_manager->create_temp_actor(OBJ_U6_HORSE, NO_OBJ_STATUS, obj->x, obj->y, obj->z, ACTOR_ALIGNMENT_DEFAULT, WORKTYPE_U6_ANIMAL_WANDER);
- } else if (!actor_manager->is_temp_actor(actor)) { // Try to mount horse. Don't use permenant Actors eg Smith, push-me pull-you
+ } else if (!actor_manager->is_temp_actor(actor)) { // Try to mount horse. Don't use permanent Actors eg Smith, push-me pull-you
scroll->display_string("\nHorse not boardable!\n");
} else { // mount up.
if (UseCode::out_of_use_range(obj, true))
diff --git a/engines/ultima/nuvie/views/container_widget.cpp b/engines/ultima/nuvie/views/container_widget.cpp
index 8c84a5de5b8..e79b7a658ca 100644
--- a/engines/ultima/nuvie/views/container_widget.cpp
+++ b/engines/ultima/nuvie/views/container_widget.cpp
@@ -224,7 +224,7 @@ Obj *ContainerWidget::get_obj_at_location(int x, int y) {
uint16 i;
- location = get_list_position(x, y); //find the postion of the object we hit in the inventory
+ location = get_list_position(x, y); //find the position of the object we hit in the inventory
if (container_obj)
inventory = container_obj->container;
diff --git a/engines/ultima/nuvie/views/inventory_widget.cpp b/engines/ultima/nuvie/views/inventory_widget.cpp
index e43c6773be5..80e79dc2b93 100644
--- a/engines/ultima/nuvie/views/inventory_widget.cpp
+++ b/engines/ultima/nuvie/views/inventory_widget.cpp
@@ -324,7 +324,7 @@ Obj *InventoryWidget::get_obj_at_location(int x, int y) {
uint16 i;
if (x >= objlist_offset_x && y >= objlist_offset_y) {
- location = get_list_position(x, y); //find the postion of the object we hit in the inventory
+ location = get_list_position(x, y); //find the position of the object we hit in the inventory
if (container_obj)
inventory = container_obj->container;
diff --git a/engines/ultima/shared/core/map.h b/engines/ultima/shared/core/map.h
index f6fe2d01193..1f22b8a77c2 100644
--- a/engines/ultima/shared/core/map.h
+++ b/engines/ultima/shared/core/map.h
@@ -535,7 +535,7 @@ public:
/**
* Called to update the widget at the end of a turn
- * @param isPreUpdate Update is called twice in succesion during the end of turn update.
+ * @param isPreUpdate Update is called twice in succession during the end of turn update.
* Once with true for all widgets, then with it false
*/
virtual void update(bool isPreUpdate) {}
diff --git a/engines/ultima/shared/core/widgets.h b/engines/ultima/shared/core/widgets.h
index 35b22429cb3..7ab35a83520 100644
--- a/engines/ultima/shared/core/widgets.h
+++ b/engines/ultima/shared/core/widgets.h
@@ -87,7 +87,7 @@ public:
/**
* Called to update the widget at the end of a turn
- * @param isPreUpdate Update is called twice in succesion during the end of turn update.
+ * @param isPreUpdate Update is called twice in succession during the end of turn update.
* Once with true for all widgets, then with it false
*/
void update(bool isPreUpdate) override;
diff --git a/engines/ultima/shared/maps/creature.h b/engines/ultima/shared/maps/creature.h
index 7682f1a654f..70485c0dbe9 100644
--- a/engines/ultima/shared/maps/creature.h
+++ b/engines/ultima/shared/maps/creature.h
@@ -80,7 +80,7 @@ public:
/**
* Called to update the widget at the end of a turn
- * @param isPreUpdate Update is called twice in succesion during the end of turn update.
+ * @param isPreUpdate Update is called twice in succession during the end of turn update.
* Once with true for all widgets, then with it false
*/
virtual void update(bool isPreUpdate);
diff --git a/engines/ultima/shared/maps/map_widget.h b/engines/ultima/shared/maps/map_widget.h
index 314eca2669a..2fa2478f37f 100644
--- a/engines/ultima/shared/maps/map_widget.h
+++ b/engines/ultima/shared/maps/map_widget.h
@@ -107,7 +107,7 @@ public:
/**
* Called to update the widget at the end of a turn
- * @param isPreUpdate Update is called twice in succesion during the end of turn update.
+ * @param isPreUpdate Update is called twice in succession during the end of turn update.
* Once with true for all widgets, then with it false
*/
virtual void update(bool isPreUpdate) {}
diff --git a/engines/ultima/ultima1/maps/map_overworld.cpp b/engines/ultima/ultima1/maps/map_overworld.cpp
index 04634681bea..e7fbad1ce83 100644
--- a/engines/ultima/ultima1/maps/map_overworld.cpp
+++ b/engines/ultima/ultima1/maps/map_overworld.cpp
@@ -52,7 +52,7 @@ void MapOverworld::load(Shared::Maps::MapId mapId) {
}
void MapOverworld::loadWidgets() {
- // Note: the overworld player, transports, and monsters are persistant, so we only have to set up
+ // Note: the overworld player, transports, and monsters are persistent, so we only have to set up
// the initial "on foot" transport the first time
if (_widgets.empty()) {
// Set up widget for the player
diff --git a/engines/ultima/ultima1/widgets/dungeon_monster.cpp b/engines/ultima/ultima1/widgets/dungeon_monster.cpp
index dad3a5a7207..058bd42f5e1 100644
--- a/engines/ultima/ultima1/widgets/dungeon_monster.cpp
+++ b/engines/ultima/ultima1/widgets/dungeon_monster.cpp
@@ -114,7 +114,7 @@ Shared::Maps::MapWidget::CanMove DungeonMonster::canMoveTo(Shared::Maps::MapBase
if (destTile._isWall || destTile._isSecretDoor || destTile._isBeams)
return NO;
- // Can't move to directly adjoining doorway cells (they'd be in parralel to each other, not connected)
+ // Can't move to directly adjoining doorway cells (they'd be in parallel to each other, not connected)
if (destTile._isDoor && currTile._isDoor)
return NO;
diff --git a/engines/ultima/ultima1/widgets/dungeon_monster.h b/engines/ultima/ultima1/widgets/dungeon_monster.h
index 9009a05020f..f4f886149ea 100644
--- a/engines/ultima/ultima1/widgets/dungeon_monster.h
+++ b/engines/ultima/ultima1/widgets/dungeon_monster.h
@@ -95,7 +95,7 @@ public:
/**
* Called to update the widget at the end of a turn
- * @param isPreUpdate Update is called twice in succesion during the end of turn update.
+ * @param isPreUpdate Update is called twice in succession during the end of turn update.
* Once with true for all widgets, then with it false
*/
void update(bool isPreUpdate) override;
diff --git a/engines/ultima/ultima4/controllers/intro_controller.cpp b/engines/ultima/ultima4/controllers/intro_controller.cpp
index 5ebdf3dac1c..35147872425 100644
--- a/engines/ultima/ultima4/controllers/intro_controller.cpp
+++ b/engines/ultima/ultima4/controllers/intro_controller.cpp
@@ -763,7 +763,7 @@ void IntroController::finishInitiateGame(const Common::String &nameBuffer, SexTy
_justInitiatedNewGame = true;
- // show the text thats segues into the main game
+ // show the text that's segues into the main game
showText(_binData->_introGypsy[GYP_SEGUE1]);
#ifdef IOS_ULTIMA4
U4IOS::switchU4IntroControllerToContinueButton();
diff --git a/engines/ultima/ultima4/controllers/intro_controller.h b/engines/ultima/ultima4/controllers/intro_controller.h
index e0a2a741276..206a372db1c 100644
--- a/engines/ultima/ultima4/controllers/intro_controller.h
+++ b/engines/ultima/ultima4/controllers/intro_controller.h
@@ -42,7 +42,7 @@ class Tile;
*/
class IntroBinData {
private:
- // disallow assignments, copy contruction
+ // disallow assignments, copy construction
IntroBinData(const IntroBinData &);
const IntroBinData &operator=(const IntroBinData &);
void openFile(Shared::File &f, const Common::String &name);
diff --git a/engines/ultima/ultima4/filesys/savegame.h b/engines/ultima/ultima4/filesys/savegame.h
index 754ced467bb..316f7366130 100644
--- a/engines/ultima/ultima4/filesys/savegame.h
+++ b/engines/ultima/ultima4/filesys/savegame.h
@@ -107,7 +107,7 @@ enum ClassType {
/**
* The list of status values for the savegame character records. The
- * values match the letter thats appear in the ztats area.
+ * values match the letter that's appear in the ztats area.
*/
enum StatusType {
STAT_GOOD = 'G',
diff --git a/engines/ultima/ultima4/game/creature.h b/engines/ultima/ultima4/game/creature.h
index 0550374f0d5..08efa28ae74 100644
--- a/engines/ultima/ultima4/game/creature.h
+++ b/engines/ultima/ultima4/game/creature.h
@@ -309,7 +309,7 @@ public:
/**
* Performs a special action for the creature
* Returns true if the action takes up the creatures
- * whole turn (i.e. it cant move afterwords)
+ * whole turn (i.e. it can't move afterwards)
*/
bool specialAction();
@@ -430,7 +430,7 @@ public:
private:
CreatureMgr() {}
- // disallow assignments, copy contruction
+ // disallow assignments, copy construction
CreatureMgr(const CreatureMgr &);
const CreatureMgr &operator=(const CreatureMgr &);
diff --git a/engines/ultima/ultima4/gfx/image.h b/engines/ultima/ultima4/gfx/image.h
index 62b9f557249..5c483d5c6f6 100644
--- a/engines/ultima/ultima4/gfx/image.h
+++ b/engines/ultima/ultima4/gfx/image.h
@@ -70,7 +70,7 @@ private:
RGBA _backgroundColor;
Image(); /* use create method to construct images */
- // disallow assignments, copy contruction
+ // disallow assignments, copy construction
Image(const Image &);
const Image &operator=(const Image &);
diff --git a/engines/ultima/ultima8/audio/sound_flex.cpp b/engines/ultima/ultima8/audio/sound_flex.cpp
index b817faef391..18297df1b30 100644
--- a/engines/ultima/ultima8/audio/sound_flex.cpp
+++ b/engines/ultima/ultima8/audio/sound_flex.cpp
@@ -45,7 +45,7 @@ SoundFlex::SoundFlex(Common::SeekableReadStream *rs) : Archive(rs), _samples(nul
if (buf[0] == 0xFF) {
// Crusader flex has an index in the first object with the format:
// [00 or FF] [ 3 bytes, often 'oB0' or 'pB0' ] [ null-terminated name ]
- // read this data in and work out how to interpet it - probably tells
+ // read this data in and work out how to interpret it - probably tells
// some info about how to play back the raw sounds (eg, loop points?)
while (!st.eos() && _index.size() < _count) {
uint32 data = st.readUint32LE();
diff --git a/engines/ultima/ultima8/gfx/cycle_process.cpp b/engines/ultima/ultima8/gfx/cycle_process.cpp
index ee1b8adefa8..d1728ae787d 100644
--- a/engines/ultima/ultima8/gfx/cycle_process.cpp
+++ b/engines/ultima/ultima8/gfx/cycle_process.cpp
@@ -136,7 +136,7 @@ bool CycleProcess::loadData(Common::ReadStream *rs, uint32 version) {
_running = rs->readByte();
_instance = this; //static
- _type = 1; // should be persistant but older savegames may not know that.
+ _type = 1; // should be persistent but older savegames may not know that.
return true;
}
diff --git a/engines/ultima/ultima8/gumps/gump.cpp b/engines/ultima/ultima8/gumps/gump.cpp
index 7175fad2913..991fd7b3526 100644
--- a/engines/ultima/ultima8/gumps/gump.cpp
+++ b/engines/ultima/ultima8/gumps/gump.cpp
@@ -611,7 +611,7 @@ void Gump::AddChild(Gump *gump, bool take_focus) {
// Why don't we check for FLAG_CLOSING here?
// Because we want to make sure that the sort order is always valid
- // If we are same layer as focus and we wont take it, we will not be
+ // If we are same layer as focus and we won't take it, we will not be
// placed in front of it
if (!take_focus && other == _focusChild && other->_layer == gump->_layer)
break;
diff --git a/engines/ultima/ultima8/gumps/u8_save_gump.cpp b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
index f7a81321e38..28d1211c2c8 100644
--- a/engines/ultima/ultima8/gumps/u8_save_gump.cpp
+++ b/engines/ultima/ultima8/gumps/u8_save_gump.cpp
@@ -203,7 +203,7 @@ void U8SaveGump::onMouseClick(int button, int32 mx, int32 my) {
}
if (!_save) {
- // If our parent has a notifiy process, we'll put our result in it and wont actually load the game
+ // If our parent has a notifiy process, we'll put our result in it and won't actually load the game
GumpNotifyProcess *p = _parent ? _parent->GetNotifyProcess() : nullptr;
if (p) {
// Do nothing in this case
diff --git a/engines/ultima/ultima8/ultima8.cpp b/engines/ultima/ultima8/ultima8.cpp
index c7a3acd5209..8546b18910b 100644
--- a/engines/ultima/ultima8/ultima8.cpp
+++ b/engines/ultima/ultima8/ultima8.cpp
@@ -771,7 +771,7 @@ void Ultima8Engine::changeVideoMode(int width, int height) {
void Ultima8Engine::handleEvent(const Common::Event &event) {
// Handle the fact that we can get 2 modals stacking.
- // We want the focussed one preferrably.
+ // We want the focussed one preferably.
Gump *modal = dynamic_cast<ModalGump *>(_desktopGump->GetFocusChild());
if (!modal)
modal = _desktopGump->FindGump<ModalGump>();
diff --git a/engines/ultima/ultima8/ultima8.h b/engines/ultima/ultima8/ultima8.h
index 97566e1a7ea..608e54f972c 100644
--- a/engines/ultima/ultima8/ultima8.h
+++ b/engines/ultima/ultima8/ultima8.h
@@ -104,7 +104,7 @@ private:
InverterGump *_inverterGump;
AvatarMoverProcess *_avatarMoverProcess;
- // Various dependancy flags
+ // Various dependency flags
// Timing stuff
int32 _lerpFactor; //!< Interpolation factor for this frame (0-256)
bool _inBetweenFrame; //!< Set true if we are doing an inbetween frame
diff --git a/engines/ultima/ultima8/usecode/regret_intrinsics.h b/engines/ultima/ultima8/usecode/regret_intrinsics.h
index 2fc29aa682b..a52e50d408d 100644
--- a/engines/ultima/ultima8/usecode/regret_intrinsics.h
+++ b/engines/ultima/ultima8/usecode/regret_intrinsics.h
@@ -780,7 +780,7 @@ Intrinsic RegretDemoIntrinsics[] = {
// =========================================================
// Intrinsics for German version.
// This is annoyingly similar to the main version, but has an extra intrinsic inserted,
-// at 13F so they are all offset after taht
+// at 13F so they are all offset after that
//
Intrinsic RegretDeIntrinsics[] = {
diff --git a/engines/ultima/ultima8/usecode/remorse_intrinsics.h b/engines/ultima/ultima8/usecode/remorse_intrinsics.h
index eece6a1e1f5..69382fc52d9 100644
--- a/engines/ultima/ultima8/usecode/remorse_intrinsics.h
+++ b/engines/ultima/ultima8/usecode/remorse_intrinsics.h
@@ -146,7 +146,7 @@ Intrinsic RemorseIntrinsics[] = {
Item::I_setNpcNum, // void Item::I_setSomething068(Item *, int16 something) , see VALUEBOX:ordinal20
Item::I_andStatus, // void Intrinsic069(6 bytes)
Item::I_move, // void Intrinsic06A(10 bytes)
- UCMachine::I_true, // Note: This is actualy "is compiled with VIOLENCE=1" (was set to 0 in germany). For now just always say yes.
+ UCMachine::I_true, // Note: This is actually "is compiled with VIOLENCE=1" (was set to 0 in germany). For now just always say yes.
Kernel::I_resetRef, // void Intrinsic06C(4 bytes)
Item::I_getNpcNum, // based on same coff as 102 (-> variable name in TRIGGER::ordinal21)
Item::I_andStatus, // void Intrinsic06E(6 bytes)
diff --git a/engines/ultima/ultima8/world/crosshair_process.cpp b/engines/ultima/ultima8/world/crosshair_process.cpp
index 29632919062..0ec3ab1d63e 100644
--- a/engines/ultima/ultima8/world/crosshair_process.cpp
+++ b/engines/ultima/ultima8/world/crosshair_process.cpp
@@ -108,7 +108,7 @@ void CrosshairProcess::saveData(Common::WriteStream *ws) {
bool CrosshairProcess::loadData(Common::ReadStream *rs, uint32 version) {
if (!Process::loadData(rs, version)) return false;
- _type = 1; // should be persistant but older savegames may not know that.
+ _type = 1; // should be persistent but older savegames may not know that.
return true;
}
diff --git a/engines/ultima/ultima8/world/item.cpp b/engines/ultima/ultima8/world/item.cpp
index a795ecb368c..5fe2f733b33 100644
--- a/engines/ultima/ultima8/world/item.cpp
+++ b/engines/ultima/ultima8/world/item.cpp
@@ -180,7 +180,7 @@ void Item::move(int32 X, int32 Y, int32 Z) {
World::get_instance()->etherealRemove(_objId);
}
- // Remove from container (if contained or equiped)
+ // Remove from container (if contained or equipped)
if (_flags & (FLG_CONTAINED | FLG_EQUIPPED)) {
if (_parent) {
// If we are flagged as Ethereal, we are already removed
@@ -294,7 +294,7 @@ bool Item::moveToContainer(Container *container, bool checkwghtvol) {
World::get_instance()->etherealRemove(_objId);
}
- // Remove from container (if contained or equiped)
+ // Remove from container (if contained or equipped)
if (_flags & (FLG_CONTAINED | FLG_EQUIPPED)) {
if (_parent) {
// If we are flagged as Ethereal, we are already removed
@@ -1287,7 +1287,7 @@ uint16 Item::fireWeapon(int32 x, int32 y, int32 z, Direction dir, int firetype,
break;
}
- // HACK: this should be fixed to use inheritence so the behavior
+ // HACK: this should be fixed to use inheritance so the behavior
// is clean for both Item and Actor.
DirectionMode dirmode = dirmode_8dirs;
const Actor *thisactor = dynamic_cast<Actor *>(this);
diff --git a/engines/ultima/ultima8/world/item_selection_process.cpp b/engines/ultima/ultima8/world/item_selection_process.cpp
index ab52f03501e..7a9b030a4b6 100644
--- a/engines/ultima/ultima8/world/item_selection_process.cpp
+++ b/engines/ultima/ultima8/world/item_selection_process.cpp
@@ -219,7 +219,7 @@ bool ItemSelectionProcess::loadData(Common::ReadStream *rs, uint32 version) {
_ax = rs->readSint32LE();
_ay = rs->readSint32LE();
_az = rs->readSint32LE();
- _type = 1; // should be persistant but older savegames may not know that.
+ _type = 1; // should be persistent but older savegames may not know that.
return true;
}
diff --git a/engines/ultima/ultima8/world/snap_process.cpp b/engines/ultima/ultima8/world/snap_process.cpp
index 40145f80f69..f3de73dccf9 100644
--- a/engines/ultima/ultima8/world/snap_process.cpp
+++ b/engines/ultima/ultima8/world/snap_process.cpp
@@ -196,7 +196,7 @@ bool SnapProcess::loadData(Common::ReadStream *rs, uint32 version) {
_snapEggs.push_back(rs->readUint16LE());
}
- _type = 1; // should be persistant but older savegames may not know that.
+ _type = 1; // should be persistent but older savegames may not know that.
return true;
}
diff --git a/engines/ultima/ultima8/world/sort_item.h b/engines/ultima/ultima8/world/sort_item.h
index 5e84877e3f6..5edcec344bb 100644
--- a/engines/ultima/ultima8/world/sort_item.h
+++ b/engines/ultima/ultima8/world/sort_item.h
@@ -120,9 +120,9 @@ struct SortItem {
int32 _order; // Rendering _order. -1 is not yet drawn
- // Note that Std::priority_queue could be used here, BUT there is no guarentee that it's implementation
+ // Note that Std::priority_queue could be used here, BUT there is no guarantee that it's implementation
// will be friendly to insertions
- // Alternatively i could use Std::list, BUT there is no guarentee that it will keep wont delete
+ // Alternatively i could use Std::list, BUT there is no guarantee that it will keep won't delete
// the unused nodes after doing a clear
// So the only reasonable solution is to write my own list
struct DependsList {
diff --git a/engines/ultima/ultima8/world/target_reticle_process.cpp b/engines/ultima/ultima8/world/target_reticle_process.cpp
index 7dd3e23d779..5b4189d637f 100644
--- a/engines/ultima/ultima8/world/target_reticle_process.cpp
+++ b/engines/ultima/ultima8/world/target_reticle_process.cpp
@@ -234,7 +234,7 @@ bool TargetReticleProcess::loadData(Common::ReadStream *rs, uint32 version) {
if (GAME_IS_REGRET)
_reticleStyle = rs->readUint16LE();
- _type = 1; // should be persistant but older savegames may not know that.
+ _type = 1; // should be persistent but older savegames may not know that.
return true;
}
diff --git a/engines/ultima/ultima8/world/target_reticle_process.h b/engines/ultima/ultima8/world/target_reticle_process.h
index 1249d5ca0dc..86000bda9f4 100644
--- a/engines/ultima/ultima8/world/target_reticle_process.h
+++ b/engines/ultima/ultima8/world/target_reticle_process.h
@@ -43,7 +43,7 @@ public:
void run() override;
- //!< Notify this process that the item we're targetting has moved
+ //!< Notify this process that the item we're targeting has moved
void itemMoved(Item *item);
//!< Avatar direction changed - force update of finding a new item next frame.
Commit: 7fd0c0f68f64e263dd478dcbc08e3f41b6c06fb8
https://github.com/scummvm/scummvm/commit/7fd0c0f68f64e263dd478dcbc08e3f41b6c06fb8
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-09-16T01:58:56+03:00
Commit Message:
JANITORIAL: SCI: Fix typos
Changed paths:
engines/sci/console.cpp
engines/sci/engine/kgraphics.cpp
engines/sci/engine/kmenu.cpp
engines/sci/engine/script_patches.cpp
engines/sci/graphics/animate.cpp
engines/sci/graphics/compare.cpp
engines/sci/graphics/menu.cpp
engines/sci/graphics/palette.cpp
engines/sci/graphics/picture.cpp
engines/sci/graphics/ports.cpp
engines/sci/graphics/ports.h
engines/sci/graphics/screen.cpp
engines/sci/graphics/transitions.h
engines/sci/graphics/view.cpp
engines/sci/resource/resource.cpp
engines/sci/sound/drivers/gm_names.h
diff --git a/engines/sci/console.cpp b/engines/sci/console.cpp
index 99cf183dec6..9b14c572c2d 100644
--- a/engines/sci/console.cpp
+++ b/engines/sci/console.cpp
@@ -4032,7 +4032,7 @@ bool Console::cmdSend(int argc, const char **argv) {
_engine->_gamestate->_executionStackPosChanged = true;
debugPrintf("Message scheduled for execution\n");
- // We call run_engine explictly so we can restore the value of r_acc
+ // We call run_engine explicitly so we can restore the value of r_acc
// after execution.
run_vm(_engine->_gamestate);
_engine->_gamestate->xs = old_xstack;
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index a975e17a6d5..36d5a50453b 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -863,7 +863,7 @@ reg_t kPortrait(EngineState *s, int argc, reg_t *argv) {
}
// Original top-left must stay on kControl rects, we adjust accordingly because
-// sierra sci actually wont draw rects that are upside down (example: jones,
+// sierra sci actually won't draw rects that are upside down (example: jones,
// when challenging jones - one button is a duplicate and also has lower-right
// which is 0, 0)
Common::Rect kControlCreateRect(int16 x, int16 y, int16 x1, int16 y1) {
diff --git a/engines/sci/engine/kmenu.cpp b/engines/sci/engine/kmenu.cpp
index 1980b1a8070..609abd9375a 100644
--- a/engines/sci/engine/kmenu.cpp
+++ b/engines/sci/engine/kmenu.cpp
@@ -69,7 +69,7 @@ reg_t kDrawStatus(EngineState *s, int argc, reg_t *argv) {
int16 colorBack = (argc > 2) ? argv[2].toSint16() : g_sci->_gfxScreen->getColorWhite();
if (!textReference.isNull()) {
- // Sometimes this is called without giving text, if thats the case dont process it.
+ // Sometimes this is called without giving text, if that's the case don't process it.
text = s->_segMan->getString(textReference);
if (text == "Replaying sound") {
diff --git a/engines/sci/engine/script_patches.cpp b/engines/sci/engine/script_patches.cpp
index 2aa46a9dd3e..bfdbb9576b2 100644
--- a/engines/sci/engine/script_patches.cpp
+++ b/engines/sci/engine/script_patches.cpp
@@ -21071,7 +21071,7 @@ static const uint16 qfg4CharScreenKeyboardPatch[] = {
// selected and highlighted. This doesn't make sense for the static picture and
// text, and they don't have any of the properties necessary to make that work.
// When the common IconBar code attempts to select these, DeathIcon:highlight
-// proptly crashes upon trying to use and draw non-existant objects.
+// proptly crashes upon trying to use and draw non-existent objects.
//
// We fix this by patching out the broken control cycling on the death screen.
// Note that this code was unable to even highlight the real clickable icons.
diff --git a/engines/sci/graphics/animate.cpp b/engines/sci/graphics/animate.cpp
index b7af374f173..c8463f72603 100644
--- a/engines/sci/graphics/animate.cpp
+++ b/engines/sci/graphics/animate.cpp
@@ -316,7 +316,7 @@ void GfxAnimate::adjustInvalidCels(GfxView *view, AnimateList::iterator it) {
void GfxAnimate::processViewScaling(GfxView *view, AnimateList::iterator it) {
if (!view->isScaleable()) {
- // Laura Bow 2 (especially floppy) depends on this, some views are not supposed to be scaleable
+ // Laura Bow 2 (especially floppy) depends on this, some views are not supposed to be scalable
// this "feature" was removed in later versions of SCI1.1
it->scaleSignal = 0;
it->scaleY = it->scaleX = 128;
diff --git a/engines/sci/graphics/compare.cpp b/engines/sci/graphics/compare.cpp
index 5ac369ff972..2eba91a7f5a 100644
--- a/engines/sci/graphics/compare.cpp
+++ b/engines/sci/graphics/compare.cpp
@@ -137,7 +137,7 @@ reg_t GfxCompare::kernelCanBeHere(reg_t curObject, reg_t listReference) {
checkRect.bottom = readSelectorValue(_segMan, curObject, SELECTOR(brBottom));
uint16 signal = readSelectorValue(_segMan, curObject, SELECTOR(signal));
- if (!checkRect.isValidRect()) { // can occur in Iceman and Mother Goose - HACK? TODO: is this really occuring in sierra sci? check this
+ if (!checkRect.isValidRect()) { // can occur in Iceman and Mother Goose - HACK? TODO: is this really occurring in sierra sci? check this
warning("kCan(t)BeHere - invalid rect %d, %d -> %d, %d", checkRect.left, checkRect.top, checkRect.right, checkRect.bottom);
return NULL_REG; // this means "can be here"
}
diff --git a/engines/sci/graphics/menu.cpp b/engines/sci/graphics/menu.cpp
index b5e73d67268..5d0e442efc3 100644
--- a/engines/sci/graphics/menu.cpp
+++ b/engines/sci/graphics/menu.cpp
@@ -213,7 +213,7 @@ void GfxMenu::kernelAddEntry(const Common::String &title, Common::String content
itemEntry->separatorLine = true;
} else {
// We don't strSplit here, because multilingual SCI01 support
- // language switching on the fly, so we have to do this everytime
+ // language switching on the fly, so we have to do this every time
// the menu is called.
itemEntry->text = Common::String(content.c_str() + beginPos, tempPos - beginPos);
diff --git a/engines/sci/graphics/palette.cpp b/engines/sci/graphics/palette.cpp
index 96f8bc67ede..bac7bd79aed 100644
--- a/engines/sci/graphics/palette.cpp
+++ b/engines/sci/graphics/palette.cpp
@@ -218,7 +218,7 @@ bool GfxPalette::setAmiga() {
}
}
- // Directly set the palette, because setOnScreen() wont do a thing for amiga
+ // Directly set the palette, because setOnScreen() won't do a thing for amiga
copySysPaletteToScreen(true);
return true;
}
@@ -309,7 +309,7 @@ void GfxPalette::set(Palette *newPalette, bool force, bool forceRealMerge, bool
_sysPaletteChanged |= insert(newPalette, &_sysPalette, includeFirstColor);
}
- // Adjust timestamp on newPalette, so it wont get merged/inserted w/o need
+ // Adjust timestamp on newPalette, so it won't get merged/inserted w/o need
newPalette->timestamp = _sysPalette.timestamp;
bool updatePalette = _sysPaletteChanged && _screen->_picNotValid == 0;
@@ -681,7 +681,7 @@ void GfxPalette::kernelSyncScreenPalette() {
// do various things
// return 1
// deinit - unloads target palette, kills timer hook, disables palVaryOn
-// pause - counts up or down, if counter != 0 -> signal wont get counted up by timer
+// pause - counts up or down, if counter != 0 -> signal won't get counted up by timer
// will only count down to 0
//
// Restarting game
diff --git a/engines/sci/graphics/picture.cpp b/engines/sci/graphics/picture.cpp
index 2e87736e1c3..c69828f9876 100644
--- a/engines/sci/graphics/picture.cpp
+++ b/engines/sci/graphics/picture.cpp
@@ -215,7 +215,7 @@ void GfxPicture::drawCelData(const SciSpan<const byte> &inbuffer, int headerPos,
// Change clearcolor to white, if we dont add to an existing picture. That way we will paint everything on screen
// but white and that won't matter because the screen is supposed to be already white. It seems that most (if not all)
// SCI1.1 games use color 0 as transparency and SCI1 games use color 255 as transparency. Sierra SCI seems to paint
- // the whole data to screen and wont skip over transparent pixels. So this will actually make it work like Sierra.
+ // the whole data to screen and won't skip over transparent pixels. So this will actually make it work like Sierra.
if (!_addToFlag)
clearColor = _screen->getColorWhite();
diff --git a/engines/sci/graphics/ports.cpp b/engines/sci/graphics/ports.cpp
index 53370cf4263..67addc0487f 100644
--- a/engines/sci/graphics/ports.cpp
+++ b/engines/sci/graphics/ports.cpp
@@ -126,7 +126,7 @@ void GfxPorts::init(bool usesOldGfxFunctions, GfxPaint16 *paint16, GfxText16 *te
openPort(_wmgrPort);
setPort(_wmgrPort);
// SCI0 games till kq4 (.502 - not including) did not adjust against _wmgrPort in kNewWindow
- // We leave _wmgrPort top at 0, so the adjustment wont get done
+ // We leave _wmgrPort top at 0, so the adjustment won't get done
if (!_usesOldGfxFunctions) {
setOrigin(0, offTop);
_wmgrPort->rect.bottom = _screen->getHeight() - offTop;
@@ -338,7 +338,7 @@ Window *GfxPorts::addWindow(const Common::Rect &dims, const Common::Rect *restor
if (r.width() > _screen->getScriptWidth()) {
// We get invalid dimensions at least at the end of sq3 (script bug!).
- // Same happens very often in lsl5, sierra sci didnt fix it but it looked awful.
+ // Same happens very often in lsl5, sierra sci didn't fix it but it looked awful.
// Also happens frequently in the demo of GK1.
warning("Fixing too large window, left: %d, right: %d", dims.left, dims.right);
r.left = 0;
@@ -679,7 +679,7 @@ void GfxPorts::priorityBandsInit(int16 bandCount, int16 top, int16 bottom) {
while (_priorityBands[--y] == _priorityBandCount)
_priorityBands[y]--;
}
- // We fill space that is left over with the highest band (hardcoded 200 limit, because this algo isnt meant to be used on hires)
+ // We fill space that is left over with the highest band (hardcoded 200 limit, because this algo isn't meant to be used on hires)
for (y = _priorityBottom; y < 200; y++)
_priorityBands[y] = _priorityBandCount;
diff --git a/engines/sci/graphics/ports.h b/engines/sci/graphics/ports.h
index 0f65fe3df7a..58aa300b22c 100644
--- a/engines/sci/graphics/ports.h
+++ b/engines/sci/graphics/ports.h
@@ -46,7 +46,7 @@ typedef Common::List<Port *> PortList;
typedef Common::Array<Port *> PortArray;
/**
- * Ports class, includes all port managment for SCI0->SCI1.1 games. Ports are some sort of windows in SCI
+ * Ports class, includes all port management for SCI0->SCI1.1 games. Ports are some sort of windows in SCI
* this class also handles adjusting coordinates to a specific port
*/
class GfxPorts : public Common::Serializable {
diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index fb14c906a8c..f679247359a 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -576,9 +576,9 @@ void GfxScreen::putKanjiChar(Graphics::FontSJIS *commonFont, int16 x, int16 y, u
// be aligned on byte boundaries in vmem which equals 4 pixel boundaries in lowres. We make that bounds adjustment
// in the driver, since the layout relies on it. PQ2 on the other hand uses the PC-98 text mode for text print
// instead of rendering it in graphics mode (many PC-98 games do that). In an emulator you can easily recognize
- // it, since the mouse cursor will move underneath the text. The use of the text mode has a similiar effect to
+ // it, since the mouse cursor will move underneath the text. The use of the text mode has a similar effect to
// x-coordinates as what happens with QFG: In text mode, the coordinates can only be set as text columns and lines,
- // so the coordinates have to be divided and loose some precision ('& ~3' for x, and '& ~7' for y).
+ // so the coordinates have to be divided and lose some precision ('& ~3' for x, and '& ~7' for y).
// SCI1 PC-98 (KQ5/SQ4) has a gfx driver opcode to render the glyphs via the PC-98 GRCG. In the 16 colors drivers it
// uses a unique way to do that: The first 5 lines and the last 5 lines of the glyph get scaled 2x horizontally
diff --git a/engines/sci/graphics/transitions.h b/engines/sci/graphics/transitions.h
index 5db8c9b338c..82e7bef02ac 100644
--- a/engines/sci/graphics/transitions.h
+++ b/engines/sci/graphics/transitions.h
@@ -98,7 +98,7 @@ private:
int16 _number;
bool _blackoutFlag;
Common::Rect _picRect;
- byte *_oldScreen; // buffer for saving current active screen data to, has dimenions of _screen->_displayScreen
+ byte *_oldScreen; // buffer for saving current active screen data to, has dimensions of _screen->_displayScreen
uint32 _transitionStartTime; // when the current transition started in milliseconds
};
diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp
index d5281c25384..61a6b458613 100644
--- a/engines/sci/graphics/view.cpp
+++ b/engines/sci/graphics/view.cpp
@@ -245,9 +245,9 @@ void GfxView::initData() {
// flags is actually a bit-mask
// it seems it was only used for some early sci1.1 games (or even just laura bow 2)
// later interpreters dont support it at all anymore
- // we assume that if flags is 0h the view does not support flags and default to scaleable
+ // we assume that if flags is 0h the view does not support flags and default to scalable
// if it's 1h then we assume that the view is not to be scaled
- // if it's 40h then we assume that the view is scaleable
+ // if it's 40h then we assume that the view is scalable
switch (_resource->getUint8At(3)) {
case 1:
_isScaleable = false;
diff --git a/engines/sci/resource/resource.cpp b/engines/sci/resource/resource.cpp
index 6695890ee4f..991ee5a391f 100644
--- a/engines/sci/resource/resource.cpp
+++ b/engines/sci/resource/resource.cpp
@@ -228,7 +228,7 @@ void Resource::unalloc() {
void Resource::writeToStream(Common::WriteStream *stream) const {
if (_headerSize == 0) {
// create patch file header
- stream->writeByte(getType() | 0x80); // 0x80 is required by old Sierra SCI, otherwise it wont accept the patch file
+ stream->writeByte(getType() | 0x80); // 0x80 is required by old Sierra SCI, otherwise it won't accept the patch file
stream->writeByte(_headerSize);
} else {
// use existing patch file header
diff --git a/engines/sci/sound/drivers/gm_names.h b/engines/sci/sound/drivers/gm_names.h
index 06cafe32f6a..7abed0b818d 100644
--- a/engines/sci/sound/drivers/gm_names.h
+++ b/engines/sci/sound/drivers/gm_names.h
@@ -166,7 +166,7 @@ static const char *const GmPercussionNames[] = {
/*10*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/*20*/ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/*30*/ 0, 0, 0, 0, 0,
- // The preceeding percussions are not covered by the GM standard
+ // The preceding percussions are not covered by the GM standard
/*35*/ "Acoustic Bass Drum",
/*36*/ "Bass Drum 1",
/*37*/ "Side Stick",
More information about the Scummvm-git-logs
mailing list