[Scummvm-git-logs] scummvm master -> 8f246218d4781edf0c25b0470fe8706c1933c2a7

bluegr noreply at scummvm.org
Wed Dec 25 15:58:10 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:
8f246218d4 JANITORIAL: SAGA2: Fix typos


Commit: 8f246218d4781edf0c25b0470fe8706c1933c2a7
    https://github.com/scummvm/scummvm/commit/8f246218d4781edf0c25b0470fe8706c1933c2a7
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-12-25T17:58:07+02:00

Commit Message:
JANITORIAL: SAGA2: Fix typos

Changed paths:
    engines/saga2/band.cpp
    engines/saga2/interp.cpp
    engines/saga2/objects.cpp
    engines/saga2/objproto.h
    engines/saga2/sagafunc.cpp
    engines/saga2/sensor.cpp
    engines/saga2/task.cpp


diff --git a/engines/saga2/band.cpp b/engines/saga2/band.cpp
index 752cf7db46f..4b9c4cd3d85 100644
--- a/engines/saga2/band.cpp
+++ b/engines/saga2/band.cpp
@@ -55,7 +55,7 @@ void BandList::read(Common::InSaveFile *in) {
 	for (int i = 0; i < bandCount; i++) {
 		BandID      id;
 
-		//  Retreive the Band's id number
+		//  Retrieve the Band's id number
 		id = in->readSint16LE();
 		debugC(3, kDebugSaveload, "Loading Band %d", id);
 
diff --git a/engines/saga2/interp.cpp b/engines/saga2/interp.cpp
index a81923ac141..1349522ddce 100644
--- a/engines/saga2/interp.cpp
+++ b/engines/saga2/interp.cpp
@@ -1232,7 +1232,7 @@ void ThreadList::read(Common::InSaveFile *in) {
 		debugC(3, kDebugSaveload, "Saving Thread %d", i);
 		ThreadID id;
 
-		//  Retreive the Thread's id number
+		//  Retrieve the Thread's id number
 		id = in->readSint16LE();
 		debugC(4, kDebugSaveload, "...... id = %d", id);
 
diff --git a/engines/saga2/objects.cpp b/engines/saga2/objects.cpp
index fcd185223de..218a65ea4fb 100644
--- a/engines/saga2/objects.cpp
+++ b/engines/saga2/objects.cpp
@@ -495,7 +495,7 @@ void GameObject::remove() {             // removes from old list
 		GameObject  *obj;
 
 		if (*headPtr == Nothing)
-			error("Inconsistant Object Chain! ('%s#%d' not on parent %s#%d chain)",
+			error("Inconsistent Object Chain! ('%s#%d' not on parent %s#%d chain)",
 			             objName(), id, objectAddress(_data.parentID)->objName(), _data.parentID);
 
 		obj = objectAddress(*headPtr);
@@ -1146,7 +1146,7 @@ GameObject *GameObject::extractMerged(int16 num) {
 void GameObject::moveRandom(const TilePoint &minLoc, const TilePoint &maxLoc) {
 	//We Should Also Send Flags For Conditional Movements
 	//One Consideration Is Whether We Should Get One Random Location
-	//And Poke Around That Location If We Cant Go There Or Try Another
+	//And Poke Around That Location If We Can't Go There Or Try Another
 	//Random Location ???
 
 	TilePoint newLoc;
diff --git a/engines/saga2/objproto.h b/engines/saga2/objproto.h
index f02dc785ff0..b131aca665e 100644
--- a/engines/saga2/objproto.h
+++ b/engines/saga2/objproto.h
@@ -415,7 +415,7 @@ public:
 		kObjAsMousePtr
 	};
 
-	//  Memeber functions
+	//  Member functions
 
 	//  A constructor which takes the data loaded from the file
 	//  and loads it into the various fields...
diff --git a/engines/saga2/sagafunc.cpp b/engines/saga2/sagafunc.cpp
index 4326cb280b8..2dde490238b 100644
--- a/engines/saga2/sagafunc.cpp
+++ b/engines/saga2/sagafunc.cpp
@@ -2184,7 +2184,7 @@ int16 scriptActorAcceptDamage(int16 *args) {
 }
 
 //-----------------------------------------------------------------------
-//	Ressurect
+//	Resurrect
 //		void "c" imNotQuiteDead( void );
 
 int16 scriptActorImNotQuiteDead(int16 *args) {
diff --git a/engines/saga2/sensor.cpp b/engines/saga2/sensor.cpp
index 433e7c78c02..fa84152452c 100644
--- a/engines/saga2/sensor.cpp
+++ b/engines/saga2/sensor.cpp
@@ -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 protagonist even if the protaganist
+		//  will be able to sense a protagonist even if the protagonist
 		//  is invisible.
 		if (!objIsActor || getObject() != getCenterActor()) {
 			if (!(senseFlags & kActorSeeInvis)
diff --git a/engines/saga2/task.cpp b/engines/saga2/task.cpp
index 25b251c5770..70d7e5f0be6 100644
--- a/engines/saga2/task.cpp
+++ b/engines/saga2/task.cpp
@@ -176,7 +176,7 @@ void TaskStackList::read(Common::InSaveFile *in) {
 		TaskStackID id;
 		TaskStack *ts;
 
-		//  Retreive the TaskStack's id number
+		//  Retrieve the TaskStack's id number
 		id = in->readSint16LE();
 		debugC(3, kDebugSaveload, "Loading Task Stack %d", id);
 
@@ -483,7 +483,7 @@ void TaskList::read(Common::InSaveFile *in) {
 	for (int i = 0; i < taskCount; i++) {
 		TaskID id;
 
-		//  Retreive the Task's id number
+		//  Retrieve the Task's id number
 		id = in->readSint16LE();
 		debugC(3, kDebugSaveload, "Loading Task %d (%d)", i, id);
 




More information about the Scummvm-git-logs mailing list