[Scummvm-git-logs] scummvm master -> 974d4dd81eb92c7db1c66928dd841241b6ae0264

[a-yyg]

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

Summary:
0e68133382 SAGA2: Fix builtinVTableAddress object script access
974d4dd81e SAGA2: Fix getMapNum for midair objects


Commit: 0e6813338292fd0494eb2cc4f6b7dc4d7333bb38
    https://github.com/scummvm/scummvm/commit/0e6813338292fd0494eb2cc4f6b7dc4d7333bb38
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-08-15T16:32:33+09:00

Commit Message:
SAGA2: Fix builtinVTableAddress object script access

Changed paths:
    engines/saga2/sagafunc.cpp


diff --git a/engines/saga2/sagafunc.cpp b/engines/saga2/sagafunc.cpp
index 591a5b2cc0..fb61804d77 100644
--- a/engines/saga2/sagafunc.cpp
+++ b/engines/saga2/sagafunc.cpp
@@ -2941,7 +2941,8 @@ int16 scriptPlayFX(int16 *args) {
 
 int16 scriptObject2Actor(int16 *args) {
 	MONOLOG(Object2Actor);
-	return isActor(args[0]) ? args[0] : Nothing;
+	//return isActor(args[0]) ? args[0] : Nothing;
+	return args[0];
 }
 
 //-----------------------------------------------------------------------


Commit: 974d4dd81eb92c7db1c66928dd841241b6ae0264
    https://github.com/scummvm/scummvm/commit/974d4dd81eb92c7db1c66928dd841241b6ae0264
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-08-15T17:23:44+09:00

Commit Message:
SAGA2: Fix getMapNum for midair objects

Changed paths:
    engines/saga2/objects.h


diff --git a/engines/saga2/objects.h b/engines/saga2/objects.h
index b8309887e3..169d293da2 100644
--- a/engines/saga2/objects.h
+++ b/engines/saga2/objects.h
@@ -831,7 +831,13 @@ extern GameWorld    *currentWorld;
 //	Return the number of the map of the world on which this object resides.
 
 inline int16 GameObject::getMapNum(void) {
-	return world()->mapNum;
+	if (world())
+		return world()->mapNum;
+	else if (_data.siblingID) {
+		GameObject *sibling = GameObject::objectAddress(_data.siblingID);
+		return sibling->getMapNum();
+	} else
+		return currentWorld->mapNum;
 }
 
 /* ======================================================================= *