thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

EMI: Made chore playing correctly push costumes intead of just setting the costume

Browse source
This commit is contained in:
Joel Teichroeb 2012-04-24 17:07:46 -07:00
parent 34f07d99a6
commit 62fe2e68ae
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engines/grim/emi/lua_v2_actor.cpp
View file

@ -546,10 +546,11 @@ void Lua_V2::PlayActorChore() {
const char *choreName = lua_getstring(choreObj);
const char *costumeName = lua_getstring(costumeObj);
Costume *costume = actor->getCurrentCostume();
if (!(costume && costume->getFilename() == costumeName)) {
actor->setCostume(costumeName);
costume = actor->getCurrentCostume();
Costume *costume = actor->findCostume(costumeName);
if (costume == NULL) {
actor->pushCostume(costumeName);
costume = actor->findCostume(costumeName);
}
Chore *chore = costume->getChore(choreName);