aboutsummaryrefslogtreecommitdiff
path: root/engines/teenagent
diff options
context:
space:
mode:
authorVladimir Menshakov2009-11-15 17:49:26 +0000
committerVladimir Menshakov2009-11-15 17:49:26 +0000
commit58cd917bba1102be7f0be1708185619bb1978647 (patch)
tree81d16a40bbb9e64a799e0c0787b25e027868dd59 /engines/teenagent
parent274b1306e301d638a65c92ae156e52c52012de29 (diff)
downloadscummvm-rg350-58cd917bba1102be7f0be1708185619bb1978647.tar.gz
scummvm-rg350-58cd917bba1102be7f0be1708185619bb1978647.tar.bz2
scummvm-rg350-58cd917bba1102be7f0be1708185619bb1978647.zip
hide mouse while displaying messages, hide item name while displaying item's description.
svn-id: r45925
Diffstat (limited to 'engines/teenagent')
-rw-r--r--engines/teenagent/inventory.cpp2
-rw-r--r--engines/teenagent/scene.h1
-rw-r--r--engines/teenagent/teenagent.cpp2
3 files changed, 3 insertions, 2 deletions
diff --git a/engines/teenagent/inventory.cpp b/engines/teenagent/inventory.cpp
index d822f9c7b4..c41ade9b2a 100644
--- a/engines/teenagent/inventory.cpp
+++ b/engines/teenagent/inventory.cpp
@@ -280,7 +280,7 @@ void Inventory::Item::render(Inventory *inventory, InventoryObject *obj, Graphic
}
name += obj->name;
- if (hovered) {
+ if (hovered && inventory->_engine->scene->getMessage().empty()) {
int w = res->font7.render(NULL, 0, 0, name, 0xd1, true);
res->font7.render(dst, (320 - w) / 2, 180, name, 0xd1, true);
}
diff --git a/engines/teenagent/scene.h b/engines/teenagent/scene.h
index ebc8a67587..117e896d34 100644
--- a/engines/teenagent/scene.h
+++ b/engines/teenagent/scene.h
@@ -150,6 +150,7 @@ public:
void loadObjectData();
Animation * getAnimation(byte slot);
inline Animation * getActorAnimation() { return &actor_animation; }
+ inline const Common::String& getMessage() const { return message; }
private:
void loadOns();
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp
index f6de12b554..69e84335fe 100644
--- a/engines/teenagent/teenagent.cpp
+++ b/engines/teenagent/teenagent.cpp
@@ -278,7 +278,6 @@ Common::Error TeenAgentEngine::run() {
Common::Point mouse;
do {
- _system->showMouse(true);
uint32 t0 = _system->getMillis();
Object *current_object = scene->findObject(mouse);
@@ -323,6 +322,7 @@ Common::Error TeenAgentEngine::run() {
}
}
+ _system->showMouse(scene->getMessage().empty());
uint32 f0 = frame * 10 / 25, f1 = (frame + 1) * 10 / 25;
if (f0 != f1) {
bool b = scene->render(_system);