libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-23 02:11:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

reverted inventory objects patch, added mark's animation z-order patch.

Browse Source 
svn-id: r48342
This commit is contained in:
Vladimir Menshakov 2010-03-20 23:04:18 +00:00
parent 933299f6b9
commit 109dbcbca6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/teenagent/inventory.cpp
View File

@ -62,7 +62,7 @@ void Inventory::init(TeenAgentEngine *engine) {
offset[92] = items_size;
Resources *res = Resources::instance();
for (byte i = 0; i < 92; ++i) {
for (byte i = 0; i <= 92; ++i) {
InventoryObject io;
uint16 obj_addr = res->dseg.get_word(0xc4a4 + i * 2);
if (obj_addr != 0)

6
engines/teenagent/scene.cpp
View File

@ -731,6 +731,10 @@ bool Scene::render(bool tick_game, bool tick_mark, uint32 delta) {
s->render(surface);
}
if (mark != NULL && debug_features.feature[DebugFeatures::kShowOn]) {
on.render(surface, actor_animation_position);
}
if (mark != NULL) {
actor_animation_position = mark->render(surface);
if (!actor_animation.ignore)
@ -809,7 +813,7 @@ bool Scene::render(bool tick_game, bool tick_mark, uint32 delta) {
}
//removed mark == null. In final scene of chapter 2 mark rendered above table.
//if it'd cause any bugs, add hack here. (_id != 23 && mark == NULL)
if (debug_features.feature[DebugFeatures::kShowOn]) {
if (mark == NULL && debug_features.feature[DebugFeatures::kShowOn]) {
on.render(surface, actor_animation_position);
}