[Scummvm-git-logs] scummvm master -> 63b7129f12eeb16f2fa6821d627c0dea71c160e3
bluegr
noreply at scummvm.org
Sun Jul 28 08:23:14 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
63b7129f12 JANITORIAL: BLADERUNNER: Fix typos in comments
Commit: 63b7129f12eeb16f2fa6821d627c0dea71c160e3
https://github.com/scummvm/scummvm/commit/63b7129f12eeb16f2fa6821d627c0dea71c160e3
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-07-28T11:23:11+03:00
Commit Message:
JANITORIAL: BLADERUNNER: Fix typos in comments
Changed paths:
engines/bladerunner/actor.cpp
engines/bladerunner/fog.cpp
engines/bladerunner/script/scene/ct11.cpp
engines/bladerunner/script/scene/ma06.cpp
engines/bladerunner/script/scene/ps06.cpp
engines/bladerunner/subtitles.cpp
engines/bladerunner/ui/end_credits.cpp
engines/bladerunner/vqa_decoder.cpp
diff --git a/engines/bladerunner/actor.cpp b/engines/bladerunner/actor.cpp
index af0e7ccf839..48f84afbf5a 100644
--- a/engines/bladerunner/actor.cpp
+++ b/engines/bladerunner/actor.cpp
@@ -1528,7 +1528,7 @@ bool Actor::hasClue(int clueId) const {
// or retrieve from Mainframe (eg. Klein)
// see: ScriptBase::Actor_Clues_Transfer_New_From_Mainframe()
// ScriptBase::Actor_Clues_Transfer_New_To_Mainframe()
-// In Restored Content it will skip transfering clues that are Intangible (default clue type)
+// In Restored Content it will skip transferring clues that are Intangible (default clue type)
// since those clues do not actually show up in McCoy's KIA
bool Actor::copyClues(int actorId) {
bool newCluesAcquired = false;
@@ -1547,7 +1547,7 @@ bool Actor::copyClues(int actorId) {
if (_vm->_cutContent
&& ((_id == BladeRunnerEngine::kActorVoiceOver && actorId == kActorMcCoy)
|| (_id == kActorMcCoy && actorId == BladeRunnerEngine::kActorVoiceOver) )) {
- // when transfering a clue successfully between McCoy (playerActor) and Mainframe,
+ // when transferring a clue successfully between McCoy (playerActor) and Mainframe,
// we mark it as such, since if McCoy later marks it as hidden (with Bob's KIA hack)
// the player will have some indication that this clue is already on the mainframe.
// Hence manually hiding it would be pointless.
diff --git a/engines/bladerunner/fog.cpp b/engines/bladerunner/fog.cpp
index 177f912c87e..922cf4676bf 100644
--- a/engines/bladerunner/fog.cpp
+++ b/engines/bladerunner/fog.cpp
@@ -123,8 +123,8 @@ void FogSphere::read(Common::ReadStream *stream, int frameCount) {
void FogSphere::calculateCoeficient(Vector3 position, Vector3 viewPosition, float *coeficient) {
*coeficient = 0.0f;
- // Ray - sphere intersection, where sphere center is always at 0, 0, 0 as everything else tranformed by the fog matrix.
- // Quadratic formula can and was simplified becasue rayDirection is normalized and hence a = 1.
+ // Ray - sphere intersection, where sphere center is always at 0, 0, 0 as everything else transformed by the fog matrix.
+ // Quadratic formula can and was simplified because rayDirection is normalized and hence a = 1.
// Explained on wikipedia https://en.wikipedia.org/wiki/Line%E2%80%93sphere_intersection
// There is also alternative approach which will end-up with this formula where plane is created from ray origin, ray destination
diff --git a/engines/bladerunner/script/scene/ct11.cpp b/engines/bladerunner/script/scene/ct11.cpp
index 73c4e767544..48d990a6d63 100644
--- a/engines/bladerunner/script/scene/ct11.cpp
+++ b/engines/bladerunner/script/scene/ct11.cpp
@@ -86,7 +86,7 @@ void SceneScriptCT11::SceneLoaded() {
Scene_2D_Region_Add(1, 412, 258, 552, 358);
#else
// expand region 1 a bit and add two more
- // as auxilliary in order to better cover the car area
+ // as auxiliary in order to better cover the car area
Scene_2D_Region_Add(1, 365, 258, 552, 358);
Scene_2D_Region_Add(3, 267, 330, 365, 377);
Scene_2D_Region_Add(4, 365, 358, 454, 377);
diff --git a/engines/bladerunner/script/scene/ma06.cpp b/engines/bladerunner/script/scene/ma06.cpp
index 0afd9b55d4f..d931e912b87 100644
--- a/engines/bladerunner/script/scene/ma06.cpp
+++ b/engines/bladerunner/script/scene/ma06.cpp
@@ -149,8 +149,8 @@ void SceneScriptMA06::PlayerWalkedIn() {
Ambient_Sounds_Remove_Looping_Sound(kSfxAPRTFAN1, 1u); // stop other ambient
Ambient_Sounds_Remove_Looping_Sound(kSfxELEAMB3, 1u); // stop other ambient
Actor_Says_With_Pause(kActorRachael, 300, 1.0f, 14); // GoodbyeMcCoy
- Actor_Says(kActorRachael, 310, 14); // Isnt ThisYourFloor --
- Actor_Says(kActorMcCoy, 2860, 14); // YouTakeCareOfYoursel
+ Actor_Says(kActorRachael, 310, 14); // IsntThisYourFloor --
+ Actor_Says(kActorMcCoy, 2860, 14); // YouTakeCareOfYourself
Set_Enter(kSetMA02_MA04, kSceneMA02);
Scene_Loop_Start_Special(kSceneLoopModeChangeSet, kMA06LoopDoorClose, true);
diff --git a/engines/bladerunner/script/scene/ps06.cpp b/engines/bladerunner/script/scene/ps06.cpp
index c7e52f751d0..22da4f904c3 100644
--- a/engines/bladerunner/script/scene/ps06.cpp
+++ b/engines/bladerunner/script/scene/ps06.cpp
@@ -117,8 +117,8 @@ bool SceneScriptPS06::ClickedOn3DObject(const char *objectName, bool a2) {
if (downloadedClues) {
Actor_Says(kActorAnsweringMachine, 360, kAnimationModeTalk); // new clues added
} else if (!uploadedClues && !downloadedClues) {
- // Play the "No clues transfered" if overall no clues were exchanged
- Actor_Says(kActorAnsweringMachine, 370, kAnimationModeTalk); // no clues transfered
+ // Play the "No clues transferred" if overall no clues were exchanged
+ Actor_Says(kActorAnsweringMachine, 370, kAnimationModeTalk); // no clues transferred
}
}
return true;
diff --git a/engines/bladerunner/subtitles.cpp b/engines/bladerunner/subtitles.cpp
index 4730667a47f..8ee817eb8d1 100644
--- a/engines/bladerunner/subtitles.cpp
+++ b/engines/bladerunner/subtitles.cpp
@@ -404,7 +404,7 @@ void Subtitles::loadOuttakeSubsText(const Common::String &outtakesName, int fram
|| fileIdx == 2
|| (fileIdx == 3 && (uint32)frame < 1200))) {
// "WSTLGO" or "BRLOGO" or "INTRO" affected
- // NOTE fileIdx indexes the SUBTITLES_FILENAME_PREFIXES array
+ // NOTE fileIdx is indexing the SUBTITLES_FILENAME_PREFIXES array
return;
}
diff --git a/engines/bladerunner/ui/end_credits.cpp b/engines/bladerunner/ui/end_credits.cpp
index edee3695086..180a3460047 100644
--- a/engines/bladerunner/ui/end_credits.cpp
+++ b/engines/bladerunner/ui/end_credits.cpp
@@ -99,7 +99,7 @@ void EndCredits::creditsCheckAndFix(int &textResourceId, Common::String &textStr
if (_vm->_language == Common::ES_ESP && _vm->_spanishCreditsCorrection) {
// Corrections in credited names according to
// https://www.doblajevideojuegos.es/fichajuego/blade-runner
- // Move 280-283 two lines above to accomodate new addition (Early Q actor)
+ // Move 280-283 two lines above to accommodate new addition (Early Q actor)
switch (textResourceId) {
case 278:
textStr = "Voces"; // moved two lines above
diff --git a/engines/bladerunner/vqa_decoder.cpp b/engines/bladerunner/vqa_decoder.cpp
index eb5f12ec791..d126b323423 100644
--- a/engines/bladerunner/vqa_decoder.cpp
+++ b/engines/bladerunner/vqa_decoder.cpp
@@ -1003,7 +1003,7 @@ bool VQADecoder::VQAVideoTrack::readCPL0(Common::SeekableReadStream *s, uint32 s
}
// Add a new palette ONLY if the previous is not identical.
- // This accomodates the VQA reel for Lands of Lore 2.
+ // This accommodates the VQA reel for Lands of Lore 2.
if (_currentPaletteId == -1) {
_cpalPointerSize = size;
s->read(_cpalPointer, roundup(size));
More information about the Scummvm-git-logs
mailing list