[Scummvm-git-logs] scummvm master -> 8d8452cfcfd6cb5e7879039339fe0a2f214df28f
scemino
noreply at scummvm.org
Sat Apr 6 16:24:44 UTC 2024
This automated email contains information about 35 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
cc3e338bbd TWP: Fix invalid type in argument to printf format specifier in squirrel.
052fe3e6ba TWP: Fix improper use of negative value in squirrel.
ef07070954 TWP: Fix argument cannot be negative in squirrel.
ed5da2b101 TWP: Fix argument cannot be negative in squirrel.
352e05559a TWP: Fix unnecessary object copies can affect performance..
3e55256692 TWP: Fix unnecessary object copies can affect performance.
19aa511090 TWP: Fix unnecessary object copies can affect performance.
f1e5445e5d TWP: Fix unnecessary object copies can affect performance.
c618fcac78 TWP: Fix unnecessary object copies can affect performance.
2683f24021 TWP: Fix unnecessary object copies can affect performance.
79d40d5ac4 TWP: Fix unnecessary object copies can affect performance.
2665b83b33 TWP: Fix unnecessary object copies can affect performance.
1eb8f95b9a TWP: Fix unnecessary object copies can affect performance.
e1fba6aa6d TWP: Fix unnecessary object copies can affect performance.
c097ce2e35 TWP: Fix unnecessary object copies can affect performance.
f1596d6860 TWP: Fix unnecessary object copies can affect performance.
3250074bd8 TWP: Fix unnecessary object copies can affect performance.
2ae42f34fa TWP: Fix unnecessary object copies can affect performance.
37c38f9712 TWP: Fix unnecessary object copies can affect performance.
24eeaa5c32 TWP: Fix unnecessary object copies can affect performance.
feb8787de6 TWP: Fix unnecessary object copies can affect performance.
7712a26268 TWP: Fix unnecessary object copies can affect performance.
912e3b8078 TWP: Fix unnecessary object copies can affect performance.
1d58adfd41 TWP: Fix unnecessary object copies can affect performance.
9f042b39c7 TWP: Fix unnecessary object copies can affect performance.
0151d0f696 TWP: Fix unnecessary object copies can affect performance.
fb66768fe9 TWP: Fix unnecessary object copies can affect performance.
402d545901 TWP: Fix unnecessary object copies can affect performance.
c619e036dd TWP: Fix unnecessary object copies can affect performance.
a5ddb53860 TWP: Fix unnecessary object copies can affect performance.
eb9b4e7192 TWP: Fix unnecessary object copies can affect performance.
655b3e517c TWP: Fix unnecessary object copies can affect performance.
9f99b74dd3 TWP: Fix unnecessary object copies can affect performance.
883be6289d TWP: Fix unnecessary object copies can affect performance.
8d8452cfcf TWP: Fix unnecessary object copies can affect performance.
Commit: cc3e338bbd7616dff2c3a91bdd94e84394b31c29
https://github.com/scummvm/scummvm/commit/cc3e338bbd7616dff2c3a91bdd94e84394b31c29
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix invalid type in argument to printf format specifier in squirrel.
Coverity CID 1540575
Changed paths:
engines/twp/squirrel/sqdebug.cpp
diff --git a/engines/twp/squirrel/sqdebug.cpp b/engines/twp/squirrel/sqdebug.cpp
index d55b1b2e4fc..b1048639a67 100755
--- a/engines/twp/squirrel/sqdebug.cpp
+++ b/engines/twp/squirrel/sqdebug.cpp
@@ -114,5 +114,5 @@ void SQVM::Raise_ParamTypeError(SQInteger nparam,SQInteger typemask,SQInteger ty
StringCat(exptypes,SQString::Create(_ss(this), IdType2Name((SQObjectType)mask), -1), exptypes);
}
}
- Raise_Error(_SC("parameter %d has an invalid type '%s' ; expected: '%s'"), nparam, IdType2Name((SQObjectType)type), _stringval(exptypes));
+ Raise_Error(_SC("parameter %lld has an invalid type '%s' ; expected: '%s'"), nparam, IdType2Name((SQObjectType)type), _stringval(exptypes));
}
Commit: 052fe3e6baf16dde1c605c74ccf09b75982439e7
https://github.com/scummvm/scummvm/commit/052fe3e6baf16dde1c605c74ccf09b75982439e7
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix improper use of negative value in squirrel.
Coverity CID 1540581
Changed paths:
engines/twp/squirrel/sqstdstring.cpp
diff --git a/engines/twp/squirrel/sqstdstring.cpp b/engines/twp/squirrel/sqstdstring.cpp
index 0cec000fd4d..52c012c9030 100755
--- a/engines/twp/squirrel/sqstdstring.cpp
+++ b/engines/twp/squirrel/sqstdstring.cpp
@@ -201,6 +201,8 @@ static SQInteger _string_strip(HSQUIRRELVM v)
const SQChar *str,*start,*end;
sq_getstring(v,2,&str);
SQInteger len = sq_getsize(v,2);
+ if(len < 0)
+ len = 0;
__strip_l(str,&start);
__strip_r(str,len,&end);
sq_pushstring(v,start,end - start);
Commit: ef07070954a6af6be5f62b66faefa9347e71f89b
https://github.com/scummvm/scummvm/commit/ef07070954a6af6be5f62b66faefa9347e71f89b
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix argument cannot be negative in squirrel.
Coverity CID 1540586
Changed paths:
engines/twp/squirrel/sqstdstring.cpp
diff --git a/engines/twp/squirrel/sqstdstring.cpp b/engines/twp/squirrel/sqstdstring.cpp
index 52c012c9030..78ef1c5a56b 100755
--- a/engines/twp/squirrel/sqstdstring.cpp
+++ b/engines/twp/squirrel/sqstdstring.cpp
@@ -349,7 +349,11 @@ static SQInteger _string_endswith(HSQUIRRELVM v)
sq_getstring(v,2,&str);
sq_getstring(v,3,&cmp);
SQInteger len = sq_getsize(v,2);
+ if(len < 0)
+ len = 0;
SQInteger cmplen = sq_getsize(v,3);
+ if(cmplen < 0)
+ cmplen = 0;
SQBool ret = SQFalse;
if(cmplen <= len) {
ret = memcmp(&str[len - cmplen],cmp,sq_rsl(cmplen)) == 0 ? SQTrue : SQFalse;
Commit: ed5da2b101c8bd497c8a8df45ec78bc613113ed3
https://github.com/scummvm/scummvm/commit/ed5da2b101c8bd497c8a8df45ec78bc613113ed3
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix argument cannot be negative in squirrel.
Coverity CID 1540600
Changed paths:
engines/twp/squirrel/sqstdstring.cpp
diff --git a/engines/twp/squirrel/sqstdstring.cpp b/engines/twp/squirrel/sqstdstring.cpp
index 78ef1c5a56b..c1728f105e0 100755
--- a/engines/twp/squirrel/sqstdstring.cpp
+++ b/engines/twp/squirrel/sqstdstring.cpp
@@ -334,7 +334,11 @@ static SQInteger _string_startswith(HSQUIRRELVM v)
sq_getstring(v,2,&str);
sq_getstring(v,3,&cmp);
SQInteger len = sq_getsize(v,2);
+ if(len < 0)
+ len = 0;
SQInteger cmplen = sq_getsize(v,3);
+ if(cmplen < 0)
+ len = 0;
SQBool ret = SQFalse;
if((len >=0) && (cmplen >=0) && (cmplen <= len)) {
ret = memcmp(str,cmp,sq_rsl(cmplen)) == 0 ? SQTrue : SQFalse;
Commit: 352e05559a14565f1dbfa7b58a79659358bbeb2f
https://github.com/scummvm/scummvm/commit/352e05559a14565f1dbfa7b58a79659358bbeb2f
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance..
Coverity CID 1540477
Changed paths:
engines/twp/motor.cpp
diff --git a/engines/twp/motor.cpp b/engines/twp/motor.cpp
index 74617d3ae2d..eb564a3a0ff 100644
--- a/engines/twp/motor.cpp
+++ b/engines/twp/motor.cpp
@@ -272,7 +272,7 @@ void WalkTo::onUpdate(float elapsed) {
return;
}
} else {
- Math::Vector2d delta = (Math::Vector2d)dest - _obj->_node->getAbsPos();
+ Math::Vector2d delta(dest - _obj->_node->getAbsPos());
float duration = d / _wsd;
float factor = CLIP(elapsed / duration, 0.f, 1.f);
Commit: 3e55256692c88a2b15289e16f337a51b3ab2c85d
https://github.com/scummvm/scummvm/commit/3e55256692c88a2b15289e16f337a51b3ab2c85d
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540481
Changed paths:
engines/twp/yack.cpp
diff --git a/engines/twp/yack.cpp b/engines/twp/yack.cpp
index 9c4206ed9f4..3e449c9c62b 100644
--- a/engines/twp/yack.cpp
+++ b/engines/twp/yack.cpp
@@ -462,7 +462,7 @@ Common::SharedPtr<YGoto> YackParser::parseGotoExpression() {
int line = _it->line;
auto name = _reader.readText(*_it++);
Common::SharedPtr<YGoto> pExp(new YGoto(line));
- pExp->_name = name;
+ pExp->_name = Common::move(name);
return pExp;
}
Commit: 19aa51109057ca227fcbbb0c0f3b6c578c5f664c
https://github.com/scummvm/scummvm/commit/19aa51109057ca227fcbbb0c0f3b6c578c5f664c
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540482
Changed paths:
engines/twp/squtil.h
diff --git a/engines/twp/squtil.h b/engines/twp/squtil.h
index 89c9d753f36..1d2e1bc7cd1 100644
--- a/engines/twp/squtil.h
+++ b/engines/twp/squtil.h
@@ -48,7 +48,7 @@ SQInteger sqpush(HSQUIRRELVM v, T value);
template<typename T, typename... Args>
void sqpush(HSQUIRRELVM v, T first, Args... args) {
sqpush(v, first);
- sqpush(v, args...);
+ sqpush(v, Common::move(args)...);
}
// set field
Commit: f1e5445e5d440b0abf55dbf2233b66370853dde8
https://github.com/scummvm/scummvm/commit/f1e5445e5d440b0abf55dbf2233b66370853dde8
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540484
Changed paths:
engines/twp/actorlib.cpp
diff --git a/engines/twp/actorlib.cpp b/engines/twp/actorlib.cpp
index 8aba70591bd..75d03f80553 100644
--- a/engines/twp/actorlib.cpp
+++ b/engines/twp/actorlib.cpp
@@ -646,7 +646,7 @@ static SQInteger actorUsePos(HSQUIRRELVM v) {
else
actor->_useDir = (Direction)dir;
}
- actor->_usePos = usePos;
+ actor->_usePos = Common::move(usePos);
return 0;
}
Commit: c618fcac789f0f23a5e87f1f7904bf362f6fbedb
https://github.com/scummvm/scummvm/commit/c618fcac789f0f23a5e87f1f7904bf362f6fbedb
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540491
Changed paths:
engines/twp/genlib.cpp
diff --git a/engines/twp/genlib.cpp b/engines/twp/genlib.cpp
index 7eda4049120..343291a696a 100644
--- a/engines/twp/genlib.cpp
+++ b/engines/twp/genlib.cpp
@@ -903,7 +903,7 @@ static SQInteger translate(HSQUIRRELVM v) {
return sq_throwerror(v, "Failed to get text");
Common::String newText = g_twp->getTextDb().getText(text);
debugC(kDebugGenScript, "translate(%s): %s", text, newText.c_str());
- sqpush(v, newText);
+ sqpush(v, Common::move(newText));
return 1;
}
Commit: 2683f2402165ded53396fa9e7b537bac6a004b3e
https://github.com/scummvm/scummvm/commit/2683f2402165ded53396fa9e7b537bac6a004b3e
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540495
Changed paths:
engines/twp/genlib.cpp
diff --git a/engines/twp/genlib.cpp b/engines/twp/genlib.cpp
index 343291a696a..0886fbb81a5 100644
--- a/engines/twp/genlib.cpp
+++ b/engines/twp/genlib.cpp
@@ -658,7 +658,7 @@ static SQInteger refreshUI(HSQUIRRELVM v) {
// }
static SQInteger screenSize(HSQUIRRELVM v) {
Math::Vector2d screen = g_twp->_room->getScreenSize();
- sqpush(v, screen);
+ sqpush(v, Common::move(screen));
return 1;
}
Commit: 79d40d5ac4aef7d62c319e1b1ee25f9974b293c3
https://github.com/scummvm/scummvm/commit/79d40d5ac4aef7d62c319e1b1ee25f9974b293c3
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+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 0886fbb81a5..bd7f0fa2618 100644
--- a/engines/twp/genlib.cpp
+++ b/engines/twp/genlib.cpp
@@ -317,7 +317,7 @@ static SQInteger findScreenPosition(HSQUIRRELVM v) {
const SpriteSheetFrame *verbFrame = &verbSheet->getFrame(Common::String::format("%s_en", vb.image.c_str()));
Math::Vector2d pos(verbFrame->spriteSourceSize.left + verbFrame->frame.width() / 2.f, verbFrame->sourceSize.getY() - verbFrame->spriteSourceSize.top - verbFrame->spriteSourceSize.height() + verbFrame->frame.height() / 2.f);
debugC(kDebugGenScript, "findScreenPosition(%lld) => %f,%f", verb, pos.getX(), pos.getY());
- sqpush(v, pos);
+ sqpush(v, Common::move(pos));
return 1;
}
}
Commit: 2665b83b3389ddf9c8d80f1ba4a0faaa2f23a5ca
https://github.com/scummvm/scummvm/commit/2665b83b3389ddf9c8d80f1ba4a0faaa2f23a5ca
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540508
Changed paths:
engines/twp/soundlib.cpp
diff --git a/engines/twp/soundlib.cpp b/engines/twp/soundlib.cpp
index 078b9d58e2f..c59a2f0cb06 100644
--- a/engines/twp/soundlib.cpp
+++ b/engines/twp/soundlib.cpp
@@ -70,7 +70,7 @@ static SQInteger actorSound(HSQUIRRELVM v) {
}
}
- Common::SharedPtr<Trigger> trigger(new SoundTrigger(sounds, obj->getId()));
+ Common::SharedPtr<Trigger> trigger(new SoundTrigger(Common::move(sounds), obj->getId()));
obj->_triggers[trigNum] = trigger;
}
}
Commit: 1eb8f95b9a0407a5139c7ae16c4e4d14f3012932
https://github.com/scummvm/scummvm/commit/1eb8f95b9a0407a5139c7ae16c4e4d14f3012932
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540511
Changed paths:
engines/twp/twp.cpp
diff --git a/engines/twp/twp.cpp b/engines/twp/twp.cpp
index 7ac02d19016..b464b41a98f 100644
--- a/engines/twp/twp.cpp
+++ b/engines/twp/twp.cpp
@@ -341,7 +341,7 @@ public:
Common::SharedPtr<Object> inventoryAt(Math::Vector2d pos) {
Common::SharedPtr<Object> result;
- objsAt(pos, InInventory(result));
+ objsAt(Common::move(pos), InInventory(result));
return result;
}
Commit: e1fba6aa6d91736f3b2e4f603f052cb2a88527e1
https://github.com/scummvm/scummvm/commit/e1fba6aa6d91736f3b2e4f603f052cb2a88527e1
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540522
Changed paths:
engines/twp/yack.cpp
diff --git a/engines/twp/yack.cpp b/engines/twp/yack.cpp
index 3e449c9c62b..9bbacb9320d 100644
--- a/engines/twp/yack.cpp
+++ b/engines/twp/yack.cpp
@@ -391,7 +391,7 @@ Common::SharedPtr<YExp> YackParser::parseWaitWhileExpression() {
auto waitwhile = _reader.readText(*_it++);
auto code = waitwhile.substr(10);
Common::SharedPtr<YWaitWhile> pExp(new YWaitWhile());
- pExp->_cond = code;
+ pExp->_cond = Common::move(code);
return pExp;
}
Commit: c097ce2e359579e71765440ce51ea88a3a991d54
https://github.com/scummvm/scummvm/commit/c097ce2e359579e71765440ce51ea88a3a991d54
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540526
Changed paths:
engines/twp/savegame.cpp
diff --git a/engines/twp/savegame.cpp b/engines/twp/savegame.cpp
index b542f11ddbc..7afd7e24757 100644
--- a/engines/twp/savegame.cpp
+++ b/engines/twp/savegame.cpp
@@ -95,7 +95,7 @@ static DialogConditionState parseState(Common::String &dialog) {
DialogConditionState result;
result.mode = parseMode(dialog[0]);
- result.dialog = dialogName;
+ result.dialog = Common::move(dialogName);
result.line = atol(num.c_str());
result.actorKey = dialog.substr(i);
return result;
Commit: f1596d686054ad581de183113a75c16d6f00a034
https://github.com/scummvm/scummvm/commit/f1596d686054ad581de183113a75c16d6f00a034
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540533
Changed paths:
engines/twp/syslib.cpp
diff --git a/engines/twp/syslib.cpp b/engines/twp/syslib.cpp
index 922a936bd7f..e2a753be09f 100644
--- a/engines/twp/syslib.cpp
+++ b/engines/twp/syslib.cpp
@@ -73,7 +73,7 @@ static SQInteger _startthread(HSQUIRRELVM v, bool global) {
sq_getstring(v, -1, &name);
Common::String threadName = Common::String::format("%s %s (%lld)", name == nullptr ? "<anonymous>" : name, _stringval(_closure(closureObj)->_function->_sourcename), _closure(closureObj)->_function->_lineinfos->_line);
- Common::SharedPtr<Thread> t(new Thread(threadName, global, threadObj, envObj, closureObj, args));
+ Common::SharedPtr<Thread> t(new Thread(threadName, global, threadObj, envObj, closureObj, Common::move(args)));
sq_pop(vm, 1);
if (name)
sq_pop(v, 1); // pop name
Commit: 3250074bd8bf938ee54762d3efffc382f95d4daa
https://github.com/scummvm/scummvm/commit/3250074bd8bf938ee54762d3efffc382f95d4daa
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540535
Changed paths:
engines/twp/twp.cpp
diff --git a/engines/twp/twp.cpp b/engines/twp/twp.cpp
index b464b41a98f..ab123a8392b 100644
--- a/engines/twp/twp.cpp
+++ b/engines/twp/twp.cpp
@@ -1708,7 +1708,7 @@ void TwpEngine::callTrigger(Common::SharedPtr<Object> obj, HSQOBJECT trigger) {
args.push_back(_actor->_table);
}
- Common::SharedPtr<Thread> thread(new Thread("Trigger", false, threadObj, obj->_table, trigger, args));
+ Common::SharedPtr<Thread> thread(new Thread("Trigger", false, threadObj, obj->_table, trigger, Common::move(args)));
debugC(kDebugGame, "create triggerthread id: %d}", thread->getId());
g_twp->_threads.push_back(thread);
Commit: 2ae42f34fa396d19b5f4b7da54da94d1fdaab0e5
https://github.com/scummvm/scummvm/commit/2ae42f34fa396d19b5f4b7da54da94d1fdaab0e5
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540538
Changed paths:
engines/twp/syslib.cpp
diff --git a/engines/twp/syslib.cpp b/engines/twp/syslib.cpp
index e2a753be09f..2507bfc1410 100644
--- a/engines/twp/syslib.cpp
+++ b/engines/twp/syslib.cpp
@@ -227,7 +227,7 @@ static SQInteger breakwhilecond(HSQUIRRELVM v, Predicate pred, const char *fmt,
return sq_throwerror(v, "Current thread should be created with startthread");
debugC(kDebugSysScript, "add breakwhilecond name=%s pid=%d, %s", name.c_str(), curThread->getId(), curThread->getName().c_str());
- g_twp->_tasks.push_back(Common::SharedPtr<Task>(new BreakWhileCond<Predicate>(curThread->getId(), name, pred)));
+ g_twp->_tasks.push_back(Common::SharedPtr<Task>(new BreakWhileCond<Predicate>(curThread->getId(), name, Common::move(pred))));
return -666;
}
Commit: 37c38f9712ad4b573f2865060e4812364deffa06
https://github.com/scummvm/scummvm/commit/37c38f9712ad4b573f2865060e4812364deffa06
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540539
Changed paths:
engines/twp/objlib.cpp
diff --git a/engines/twp/objlib.cpp b/engines/twp/objlib.cpp
index 7709b9243dc..b397632f9ee 100644
--- a/engines/twp/objlib.cpp
+++ b/engines/twp/objlib.cpp
@@ -346,7 +346,7 @@ static SQInteger objectCenter(HSQUIRRELVM v) {
if (!obj)
return sq_throwerror(v, "failed to get object");
Math::Vector2d pos = obj->_node->getPos() + obj->_usePos;
- sqpush(v, pos);
+ sqpush(v, Common::move(pos));
return 1;
}
Commit: 24eeaa5c32396ae433e9af4a309f286bf04a68e8
https://github.com/scummvm/scummvm/commit/24eeaa5c32396ae433e9af4a309f286bf04a68e8
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540551
Changed paths:
engines/twp/roomlib.cpp
diff --git a/engines/twp/roomlib.cpp b/engines/twp/roomlib.cpp
index 267f27ab6d4..93443988664 100644
--- a/engines/twp/roomlib.cpp
+++ b/engines/twp/roomlib.cpp
@@ -87,7 +87,7 @@ static SQInteger clampInWalkbox(HSQUIRRELVM v) {
}
}
Math::Vector2d pos = walkboxes[0].getClosestPointOnEdge(pos2);
- sqpush(v, pos);
+ sqpush(v, Common::move(pos));
return 1;
}
Commit: feb8787de61a23c7a575a17a0d4a837285229060
https://github.com/scummvm/scummvm/commit/feb8787de61a23c7a575a17a0d4a837285229060
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:26+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540557
Changed paths:
engines/twp/yack.cpp
diff --git a/engines/twp/yack.cpp b/engines/twp/yack.cpp
index 9bbacb9320d..5492a6d0c45 100644
--- a/engines/twp/yack.cpp
+++ b/engines/twp/yack.cpp
@@ -356,7 +356,7 @@ Common::SharedPtr<YCond> YackParser::parseCondition() {
return Common::SharedPtr<YTempOnce>(new YTempOnce(line));
}
Common::SharedPtr<YCodeCond> pCondition(new YCodeCond(line));
- pCondition->_code = conditionText;
+ pCondition->_code = Common::move(conditionText);
return pCondition;
}
Commit: 7712a2626844033fb7bd4691ec2b6ecd68d40a7d
https://github.com/scummvm/scummvm/commit/7712a2626844033fb7bd4691ec2b6ecd68d40a7d
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:27+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540566
Changed paths:
engines/twp/scenegraph.cpp
diff --git a/engines/twp/scenegraph.cpp b/engines/twp/scenegraph.cpp
index 150f85960d8..04b0ef6c6d8 100644
--- a/engines/twp/scenegraph.cpp
+++ b/engines/twp/scenegraph.cpp
@@ -371,7 +371,7 @@ void Anim::update(float elapsed) {
if (_obj->getFacing() == Facing::FACE_LEFT) {
off.setX(-off.getX());
}
- _offset = off;
+ _offset = Common::move(off);
}
} else if (_children.size() != 0) {
bool disabled = true;
Commit: 912e3b807843f91cfffdcc1ae0419991c7ba930a
https://github.com/scummvm/scummvm/commit/912e3b807843f91cfffdcc1ae0419991c7ba930a
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:27+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540579
Changed paths:
engines/twp/squtil.h
diff --git a/engines/twp/squtil.h b/engines/twp/squtil.h
index 1d2e1bc7cd1..d41b7c1bf07 100644
--- a/engines/twp/squtil.h
+++ b/engines/twp/squtil.h
@@ -58,7 +58,7 @@ void sqsetf(HSQOBJECT o, const Common::String &key, T obj) {
SQInteger top = sq_gettop(v);
sq_pushobject(v, o);
sq_pushstring(v, key.c_str(), -1);
- sqpush(v, obj);
+ sqpush(v, Common::move(obj));
sq_rawset(v, -3);
sq_settop(v, top);
}
Commit: 1d58adfd4187bbac30ba4c29ab4efb22f2f68194
https://github.com/scummvm/scummvm/commit/1d58adfd4187bbac30ba4c29ab4efb22f2f68194
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:27+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540584
Changed paths:
engines/twp/task.h
diff --git a/engines/twp/task.h b/engines/twp/task.h
index 72d41418bba..7b589efda85 100644
--- a/engines/twp/task.h
+++ b/engines/twp/task.h
@@ -43,7 +43,7 @@ public:
BreakWhileCond(int parentId, const Common::String &name, Predicate cond)
: _parentId(parentId),
_name(name),
- _cond(cond) {
+ _cond(Common::move(cond)) {
}
virtual ~BreakWhileCond() override final {}
Commit: 9f042b39c7f347ac0660cd485e05460134be41cb
https://github.com/scummvm/scummvm/commit/9f042b39c7f347ac0660cd485e05460134be41cb
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:27+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540589
Changed paths:
engines/twp/squirrel/sqobject.cpp
diff --git a/engines/twp/squirrel/sqobject.cpp b/engines/twp/squirrel/sqobject.cpp
index 736666251fa..6778ea37139 100755
--- a/engines/twp/squirrel/sqobject.cpp
+++ b/engines/twp/squirrel/sqobject.cpp
@@ -1,6 +1,7 @@
/*
see copyright notice in squirrel.h
*/
+#include "common/util.h"
#include "sqpcheader.h"
#include "sqvm.h"
#include "sqstring.h"
@@ -526,7 +527,7 @@ bool SQFunctionProto::Load(SQVM *v,SQUserPointer up,SQREADFUNC read,SQObjectPtr
_CHECK_IO(SafeRead(v,read,up, &lvi._pos, sizeof(SQUnsignedInteger)));
_CHECK_IO(SafeRead(v,read,up, &lvi._start_op, sizeof(SQUnsignedInteger)));
_CHECK_IO(SafeRead(v,read,up, &lvi._end_op, sizeof(SQUnsignedInteger)));
- f->_localvarinfos[i] = lvi;
+ f->_localvarinfos[i] = Common::move(lvi);
}
_CHECK_IO(CheckTag(v,read,up,SQ_CLOSURESTREAM_PART));
_CHECK_IO(SafeRead(v,read,up, f->_lineinfos, sizeof(SQLineInfo)*nlineinfos));
Commit: 0151d0f696721f0a1850c9986768fa509f1a4da6
https://github.com/scummvm/scummvm/commit/0151d0f696721f0a1850c9986768fa509f1a4da6
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:27+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540603
Changed paths:
engines/twp/clipper/clipper.cpp
diff --git a/engines/twp/clipper/clipper.cpp b/engines/twp/clipper/clipper.cpp
index 4ba0b0a2e29..d90f62d1af3 100644
--- a/engines/twp/clipper/clipper.cpp
+++ b/engines/twp/clipper/clipper.cpp
@@ -3550,7 +3550,7 @@ void ReversePath(Path &p) {
for (uint i = 0; i < p.size(); i++) {
reversed[p.size() - 1 - i] = p[i];
}
- p = reversed;
+ p = Common::move(reversed);
}
//------------------------------------------------------------------------------
Commit: fb66768fe961297e40da063ab7f6c77575c43a00
https://github.com/scummvm/scummvm/commit/fb66768fe961297e40da063ab7f6c77575c43a00
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:27+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540605
Changed paths:
engines/twp/genlib.cpp
diff --git a/engines/twp/genlib.cpp b/engines/twp/genlib.cpp
index bd7f0fa2618..f47ee4e92b5 100644
--- a/engines/twp/genlib.cpp
+++ b/engines/twp/genlib.cpp
@@ -481,7 +481,7 @@ static SQInteger loadArray(HSQUIRRELVM v) {
debugC(kDebugGenScript, "loadArray: %s", orgFilename);
Common::String filename = ResManager::getKey(orgFilename);
GGPackEntryReader entry;
- entry.open(*g_twp->_pack, g_twp->_pack->assetExists(filename.c_str()) ? filename : orgFilename);
+ entry.open(*g_twp->_pack, g_twp->_pack->assetExists(filename.c_str()) ? Common::move(filename) : orgFilename);
sq_newarray(v, 0);
while (!entry.eos()) {
Common::String line = entry.readLine();
Commit: 402d545901dfb981c6d543a459537902eb77b8a8
https://github.com/scummvm/scummvm/commit/402d545901dfb981c6d543a459537902eb77b8a8
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:27+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540611
Changed paths:
engines/twp/yack.cpp
diff --git a/engines/twp/yack.cpp b/engines/twp/yack.cpp
index 5492a6d0c45..eeaf1aeb966 100644
--- a/engines/twp/yack.cpp
+++ b/engines/twp/yack.cpp
@@ -487,7 +487,7 @@ Common::SharedPtr<YChoice> YackParser::parseChoiceExpression() {
_it++;
Common::SharedPtr<YChoice> pExp(new YChoice());
pExp->_number = number;
- pExp->_text = text;
+ pExp->_text = Common::move(text);
pExp->_goto = parseGotoExpression();
return pExp;
}
Commit: c619e036ddf56fd6dce938ccff0ff921b25d48a6
https://github.com/scummvm/scummvm/commit/c619e036ddf56fd6dce938ccff0ff921b25d48a6
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:27+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540614
Changed paths:
engines/twp/genlib.cpp
diff --git a/engines/twp/genlib.cpp b/engines/twp/genlib.cpp
index f47ee4e92b5..1a110ca8c57 100644
--- a/engines/twp/genlib.cpp
+++ b/engines/twp/genlib.cpp
@@ -262,7 +262,7 @@ static SQInteger sqChr(HSQUIRRELVM v) {
return sq_throwerror(v, "failed to get value");
Common::String s;
s += char(value);
- sqpush(v, s);
+ sqpush(v, Common::move(s));
return 1;
}
Commit: a5ddb538607e7e7c1c92468b575faeeed805e9fc
https://github.com/scummvm/scummvm/commit/a5ddb538607e7e7c1c92468b575faeeed805e9fc
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:27+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540616
Changed paths:
engines/twp/yack.cpp
diff --git a/engines/twp/yack.cpp b/engines/twp/yack.cpp
index eeaf1aeb966..82e0bd44570 100644
--- a/engines/twp/yack.cpp
+++ b/engines/twp/yack.cpp
@@ -382,7 +382,7 @@ Common::SharedPtr<YSay> YackParser::parseSayExpression() {
auto text = _reader.readText(*_it);
_it++;
Common::SharedPtr<YSay> pExp(new YSay());
- pExp->_actor = actor;
+ pExp->_actor = Common::move(actor);
pExp->_text = text.substr(1, text.size() - 2);
return pExp;
}
Commit: eb9b4e719286e4a6e07055ff8c6afc9203ebd51f
https://github.com/scummvm/scummvm/commit/eb9b4e719286e4a6e07055ff8c6afc9203ebd51f
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:27+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540617
Changed paths:
engines/twp/yack.cpp
diff --git a/engines/twp/yack.cpp b/engines/twp/yack.cpp
index 82e0bd44570..0819c2b40bd 100644
--- a/engines/twp/yack.cpp
+++ b/engines/twp/yack.cpp
@@ -434,7 +434,7 @@ Common::SharedPtr<YExp> YackParser::parseInstructionExpression() {
Common::SharedPtr<YOverride> pExp(new YOverride());
if (_it->id == YackTokenId::Identifier) {
auto node = _reader.readText(*_it++);
- pExp->_node = node;
+ pExp->_node = Common::move(node);
}
return pExp;
} else if (identifier == "allowobjects") {
Commit: 655b3e517c22a5560872899d0965eecb275106a2
https://github.com/scummvm/scummvm/commit/655b3e517c22a5560872899d0965eecb275106a2
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:27+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540619
Changed paths:
engines/twp/ggpack.cpp
diff --git a/engines/twp/ggpack.cpp b/engines/twp/ggpack.cpp
index 75f31dd5c1c..ddde29c06d5 100644
--- a/engines/twp/ggpack.cpp
+++ b/engines/twp/ggpack.cpp
@@ -753,7 +753,7 @@ void GGPackSet::init(const XorKey& key) {
Common::SeekableReadStream *stream = m.createReadStream();
GGPackDecoder pack;
if (stream && pack.open(stream, key)) {
- _packs[index] = pack;
+ _packs[index] = Common::move(pack);
}
}
Commit: 9f99b74dd31b5289283a5774648d64d47158eee3
https://github.com/scummvm/scummvm/commit/9f99b74dd31b5289283a5774648d64d47158eee3
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:27+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540623
Changed paths:
engines/twp/tsv.cpp
diff --git a/engines/twp/tsv.cpp b/engines/twp/tsv.cpp
index 0bc4dbf9ac2..dc11529a674 100644
--- a/engines/twp/tsv.cpp
+++ b/engines/twp/tsv.cpp
@@ -34,7 +34,7 @@ void TextDb::parseTsv(Common::SeekableReadStream &stream) {
int pos = line.find('\t', 0);
int id = atoi(line.c_str());
Common::String s = line.substr(pos + 1);
- _texts[id] = s;
+ _texts[id] = Common::move(s);
debugC(kDebugText, "%d: %s", id, _texts[id].c_str());
}
}
Commit: 883be6289de60e0def0e8197ccec37c93dbc10c2
https://github.com/scummvm/scummvm/commit/883be6289de60e0def0e8197ccec37c93dbc10c2
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42: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 0819c2b40bd..1dfebd873bc 100644
--- a/engines/twp/yack.cpp
+++ b/engines/twp/yack.cpp
@@ -426,7 +426,7 @@ Common::SharedPtr<YExp> YackParser::parseInstructionExpression() {
Common::SharedPtr<YDialog> pExp(new YDialog());
if (_it->id == YackTokenId::Identifier) {
auto actor = _reader.readText(*_it++);
- pExp->_actor = actor;
+ pExp->_actor = Common::move(actor);
}
return pExp;
} else if (identifier == "override") {
Commit: 8d8452cfcfd6cb5e7879039339fe0a2f214df28f
https://github.com/scummvm/scummvm/commit/8d8452cfcfd6cb5e7879039339fe0a2f214df28f
Author: scemino (scemino74 at gmail.com)
Date: 2024-04-06T14:42:27+02:00
Commit Message:
TWP: Fix unnecessary object copies can affect performance.
Coverity CID 1540872
Changed paths:
engines/twp/room.cpp
diff --git a/engines/twp/room.cpp b/engines/twp/room.cpp
index b5a2ea2061d..4c4c3983462 100644
--- a/engines/twp/room.cpp
+++ b/engines/twp/room.cpp
@@ -540,7 +540,7 @@ bool Walkbox::contains(const Math::Vector2d &position, bool toleranceOnOutside)
if ((left.getX() < point.getX()) && (point.getX() <= right.getX()) && ((point.getY() - left.getY()) * (right.getX() - left.getX())) < ((right.getY() - left.getY()) * (point.getX() - left.getX())))
result = !result;
- oldPoint = newPoint;
+ oldPoint = Common::move(newPoint);
oldSqDist = newSqDist;
}
return result;
More information about the Scummvm-git-logs
mailing list