[Scummvm-git-logs] scummvm master -> ba66121c7081373be0966aa7d88283158bef274c

[scemino]

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

Summary:
a8e1f0127a TWP: Fix structurally dead code.
ed232f8f68 TWP: Fix unnecessary object copies can affect performance.
84c476124b TWP: Fix unnecessary object copies can affect performance.
b277c61cf5 TWP: Fix calling risky function.
ba66121c70 TWP: Fix unchecked return value in sqpushfunc function.


Commit: a8e1f0127a48a0a88218b61385dde648cc1517d1
    https://github.com/scummvm/scummvm/commit/a8e1f0127a48a0a88218b61385dde648cc1517d1
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-08T13:13:27+02:00

Commit Message:
TWP: Fix structurally dead code.

Coverity CID 968243

Changed paths:
    engines/twp/squirrel/sqlexer.cpp


diff --git a/engines/twp/squirrel/sqlexer.cpp b/engines/twp/squirrel/sqlexer.cpp
index 90236ef037c..35dff8e66c3 100755
--- a/engines/twp/squirrel/sqlexer.cpp
+++ b/engines/twp/squirrel/sqlexer.cpp
@@ -154,7 +154,6 @@ SQInteger SQLexer::Lex()
             case _SC('='):
                 NEXT();
                 RETURN_TOKEN(TK_DIVEQ);
-                continue;
             case _SC('>'):
                 NEXT();
                 RETURN_TOKEN(TK_ATTR_CLOSE);


Commit: ed232f8f68c63f183b4b62acd0e97a73c2985475
    https://github.com/scummvm/scummvm/commit/ed232f8f68c63f183b4b62acd0e97a73c2985475
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-08T13:13:27+02:00

Commit Message:
TWP: Fix unnecessary object copies can affect performance.

Coverity CID 1540496

Changed paths:
    engines/twp/genlib.cpp


diff --git a/engines/twp/genlib.cpp b/engines/twp/genlib.cpp
index 1a110ca8c57..b4090cb7354 100644
--- a/engines/twp/genlib.cpp
+++ b/engines/twp/genlib.cpp
@@ -334,7 +334,7 @@ static SQInteger findScreenPosition(HSQUIRRELVM v) {
 	Math::Vector2d rPos = g_twp->roomToScreen(obj->_node->getAbsPos());
 	Math::Vector2d pos(rPos.getX() + obj->_node->getSize().getX() / 2.f, rPos.getY() + obj->_node->getSize().getY() / 2.f);
 	debugC(kDebugGenScript, "findScreenPosition(%s) => (%f,%f)", obj->_name.c_str(), pos.getX(), pos.getY());
-	sqpush(v, pos);
+	sqpush(v, Common::move(pos));
 	return 1;
 }
 


Commit: 84c476124b87aa4f4cfc2a5582c7b33afd4b6e53
    https://github.com/scummvm/scummvm/commit/84c476124b87aa4f4cfc2a5582c7b33afd4b6e53
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-08T13:13:27+02:00

Commit Message:
TWP: Fix unnecessary object copies can affect performance.

Coverity CID 1540632

Changed paths:
    engines/twp/yack.cpp


diff --git a/engines/twp/yack.cpp b/engines/twp/yack.cpp
index 1dfebd873bc..13020b5e78b 100644
--- a/engines/twp/yack.cpp
+++ b/engines/twp/yack.cpp
@@ -410,7 +410,7 @@ Common::SharedPtr<YExp> YackParser::parseInstructionExpression() {
 		Common::SharedPtr<YWaitFor> pExp(new YWaitFor());
 		if (_it->id == YackTokenId::Identifier) {
 			auto actor = _reader.readText(*_it++);
-			pExp->_actor = actor;
+			pExp->_actor = Common::move(actor);
 		}
 		return pExp;
 	} else if (identifier == "parrot") {


Commit: b277c61cf562fba32bf86eee9edf407da79caa63
    https://github.com/scummvm/scummvm/commit/b277c61cf562fba32bf86eee9edf407da79caa63
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-08T13:13:27+02:00

Commit Message:
TWP: Fix calling risky function.

Coverity CID 1540620

Changed paths:
    engines/twp/squirrel/sqstdmath.cpp


diff --git a/engines/twp/squirrel/sqstdmath.cpp b/engines/twp/squirrel/sqstdmath.cpp
index 7069d0b8a52..a2d3c06243a 100755
--- a/engines/twp/squirrel/sqstdmath.cpp
+++ b/engines/twp/squirrel/sqstdmath.cpp
@@ -19,21 +19,6 @@
     return 1; \
 }
 
-static SQInteger math_srand(HSQUIRRELVM v)
-{
-    SQInteger i;
-    if(SQ_FAILED(sq_getinteger(v,2,&i)))
-        return sq_throwerror(v,_SC("invalid param"));
-    srand((unsigned int)i);
-    return 0;
-}
-
-static SQInteger math_rand(HSQUIRRELVM v)
-{
-    sq_pushinteger(v,rand());
-    return 1;
-}
-
 static SQInteger math_abs(HSQUIRRELVM v)
 {
     SQInteger n;
@@ -74,8 +59,6 @@ static const SQRegFunction mathlib_funcs[] = {
     _DECL_FUNC(floor,2,_SC(".n")),
     _DECL_FUNC(ceil,2,_SC(".n")),
     _DECL_FUNC(exp,2,_SC(".n")),
-    _DECL_FUNC(srand,2,_SC(".n")),
-    _DECL_FUNC(rand,1,NULL),
     _DECL_FUNC(fabs,2,_SC(".n")),
     _DECL_FUNC(abs,2,_SC(".n")),
     {NULL,(SQFUNCTION)0,0,NULL}


Commit: ba66121c7081373be0966aa7d88283158bef274c
    https://github.com/scummvm/scummvm/commit/ba66121c7081373be0966aa7d88283158bef274c
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-08T13:13:27+02:00

Commit Message:
TWP: Fix unchecked return value in sqpushfunc function.

Coverity CID 1542928

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


diff --git a/engines/twp/savegame.cpp b/engines/twp/savegame.cpp
index 7afd7e24757..85e3f56af3e 100644
--- a/engines/twp/savegame.cpp
+++ b/engines/twp/savegame.cpp
@@ -1095,7 +1095,6 @@ static Common::JSONValue *createSaveGame() {
 }
 
 void SaveGameManager::saveGame(Common::WriteStream *ws) {
-	sqcall("preSave");
 	Common::JSONValue *data = createSaveGame();
 
 	if (DebugMan.isDebugChannelEnabled(kDebugGame)) {
diff --git a/engines/twp/squtil.cpp b/engines/twp/squtil.cpp
index bca220907c5..c99d4dbd202 100644
--- a/engines/twp/squtil.cpp
+++ b/engines/twp/squtil.cpp
@@ -342,7 +342,8 @@ int sqparamCount(HSQUIRRELVM v, HSQOBJECT obj, const Common::String &name) {
 void sqpushfunc(HSQUIRRELVM v, HSQOBJECT o, const char *name) {
 	sq_pushobject(v, o);
 	sq_pushstring(v, name, -1);
-	sq_get(v, -2);
+	if (SQ_FAILED(sq_get(v, -2)))
+		warning("Failed to push function %s", name);
 }
 
 void sqexec(HSQUIRRELVM v, const char *code, const char *filename) {