libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 07:11:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

moved scripted mark's animation after all sprites

Browse Source 
svn-id: r46911
This commit is contained in:
Vladimir Menshakov 2010-01-03 01:25:08 +00:00
parent 1131c48f26
commit c951b14a15
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engines/teenagent/scene.cpp
View File

@ -423,6 +423,7 @@ void Scene::playAnimation(byte idx, uint id, bool loop, bool paused, bool ignore
}
void Scene::playActorAnimation(uint id, bool loop, bool ignore) {
debug(0, "playActorAnimation(%u, loop:%s, ignore:%s)", id, loop?"true":"false", ignore?"true":"false");
Common::SeekableReadStream *s = Resources::instance()->loadLan(id + 1);
if (s == NULL)
error("playing animation %u failed", id);
@ -664,16 +665,9 @@ bool Scene::render() {
s->render(surface);
}
{
Surface *mark = actor_animation.currentFrame();
if (mark != NULL) {
actor_animation_position = mark->render(surface);
if (!actor_animation.ignore)
busy = true;
else
busy = false;
got_any_animation = true;
} else if (!hide_actor) {
Surface *mark = actor_animation.currentFrame();
if (mark == NULL) {
if (!hide_actor) {
actor_animation.free();
uint zoom = lookupZoom(position.y);
@ -730,6 +724,15 @@ bool Scene::render() {
Surface *s = *z_order_it;
s->render(surface);
}
if (mark != NULL) {
debug("pos.y = %d, anim.y = %d", position.y, mark->y + mark->h);
actor_animation_position = mark->render(surface);
if (!actor_animation.ignore)
busy = true;
else
busy = false;
got_any_animation = true;
}
if (!message.empty()) {
bool visible = true;