[Scummvm-git-logs] scummvm master -> 242ea26d089d03fc45199aa8aafa0847ef0e3557

[scemino]

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:
242ea26d08 TWP: Fix regression when using cell phone (bug #15072)


Commit: 242ea26d089d03fc45199aa8aafa0847ef0e3557
    https://github.com/scummvm/scummvm/commit/242ea26d089d03fc45199aa8aafa0847ef0e3557
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-16T18:19:25+02:00

Commit Message:
TWP: Fix regression when using cell phone (bug #15072)

Changed paths:
    engines/twp/actorlib.cpp
    engines/twp/savegame.cpp


diff --git a/engines/twp/actorlib.cpp b/engines/twp/actorlib.cpp
index 75d03f80553..61b632b70e7 100644
--- a/engines/twp/actorlib.cpp
+++ b/engines/twp/actorlib.cpp
@@ -810,8 +810,9 @@ static SQInteger createActor(HSQUIRRELVM v) {
 	g_twp->_resManager->_allObjects[id] = actor;
 
 	Common::String key;
-	if (SQ_FAILED(sqgetf(actor->_table, "_key", key)))
+	if(sqrawexists(actor->_table, "_key") && SQ_FAILED(sqgetf(actor->_table, "_key", key))) {
 		return sq_throwerror(v, "failed to get actor key");
+	}
 	actor->_key = key;
 
 	debugC(kDebugActScript, "Create actor %s %d", key.c_str(), actor->getId());
diff --git a/engines/twp/savegame.cpp b/engines/twp/savegame.cpp
index 85e3f56af3e..034fd7e0a78 100644
--- a/engines/twp/savegame.cpp
+++ b/engines/twp/savegame.cpp
@@ -698,7 +698,7 @@ static SQRESULT toObject(Common::JSONObject &jObj, const HSQOBJECT &obj, bool ch
 	HSQUIRRELVM v = g_twp->getVm();
 	if (checkId) {
 		SQInteger id = 0;
-		if(SQ_FAILED(sqgetf(obj, "_id", id)))
+		if(sqrawexists(obj, "_id") && SQ_FAILED(sqgetf(obj, "_id", id)))
 			return sq_throwerror(v, "Failed to get id");
 		if (g_twp->_resManager->isActor(id)) {
 			Common::SharedPtr<Object> a(actor(id));