[Scummvm-git-logs] scummvm master -> 2ccbf6fa924c20299809af77910721fd31d51845
klusark
noreply at scummvm.org
Tue Nov 10 23:15:07 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
2ccbf6fa92 EMI: Do not restart a chore that has stopped in AdvanceChore
Commit: 2ccbf6fa924c20299809af77910721fd31d51845
https://github.com/scummvm/scummvm/commit/2ccbf6fa924c20299809af77910721fd31d51845
Author: Joel Teichroeb (joel at teichroeb.net)
Date: 2026-11-10T18:14:02-05:00
Commit Message:
EMI: Do not restart a chore that has stopped in AdvanceChore
Assisted-by: Claude:claude-sonnet-5.5
Changed paths:
engines/grim/emi/lua_v2_actor.cpp
diff --git a/engines/grim/emi/lua_v2_actor.cpp b/engines/grim/emi/lua_v2_actor.cpp
index 778b0e66d20..9f3cf1dea33 100644
--- a/engines/grim/emi/lua_v2_actor.cpp
+++ b/engines/grim/emi/lua_v2_actor.cpp
@@ -382,18 +382,8 @@ void Lua_V2::AdvanceChore() {
int chore = lua_getuserdata(choreObj);
float time = lua_getnumber(timeObj);
Chore *c = EMIChore::getPool().getObject(chore);
- if (c) {
- if (!c->isPlaying()) {
- warning("AdvanceChore() called on stopped chore %s (%s)",
- c->getName(), c->getOwner()->getFilename().c_str());
- if (c->isLooping()) {
- c->getOwner()->playChoreLooping(c->getName());
- } else {
- c->getOwner()->playChore(c->getName());
- }
- }
+ if (c && c->isPlaying())
c->advance(time * 1000);
- }
}
// TODO: Implement, verify, and rename parameters
More information about the Scummvm-git-logs
mailing list