aboutsummaryrefslogtreecommitdiff
path: root/engines/teenagent/dialog.h
diff options
context:
space:
mode:
authorD G Turner2012-07-07 13:46:28 +0100
committerD G Turner2012-07-07 13:46:28 +0100
commit313502e2eea976899202064353675a61aa8c56a6 (patch)
tree212dc1e1a853e8c5c4dabeae4080c8d819fa6eed /engines/teenagent/dialog.h
parent91d6db93f00eb4ccf4179c26ee47c0c02ed2ed5e (diff)
downloadscummvm-rg350-313502e2eea976899202064353675a61aa8c56a6.tar.gz
scummvm-rg350-313502e2eea976899202064353675a61aa8c56a6.tar.bz2
scummvm-rg350-313502e2eea976899202064353675a61aa8c56a6.zip
TEENAGENT: Remove static Resources class Instance.
This is replaced by an engine instance. This should prevent issues with Return To Launcher and may remove issues with file handles.
Diffstat (limited to 'engines/teenagent/dialog.h')
-rw-r--r--engines/teenagent/dialog.h22
1 files changed, 14 insertions, 8 deletions
diff --git a/engines/teenagent/dialog.h b/engines/teenagent/dialog.h
index 3bb7d818c1..a995565fa7 100644
--- a/engines/teenagent/dialog.h
+++ b/engines/teenagent/dialog.h
@@ -28,18 +28,24 @@
namespace TeenAgent {
class Scene;
+class TeenAgentEngine;
+
class Dialog {
public:
- static uint16 pop(Scene *scene, uint16 addr, uint16 animation1, uint16 animation2, byte color1, byte color2, byte slot1, byte slot2);
- static uint16 popMark(Scene *scene, uint16 addr) {
- return pop(scene, addr, 0, 0, 0xd1, 0xd1, 0, 0);
+ static uint16 pop(TeenAgentEngine *vm, Scene *scene, uint16 addr, uint16 animation1, uint16 animation2, byte color1, byte color2, byte slot1, byte slot2);
+
+ static uint16 popMark(TeenAgentEngine *vm, Scene *scene, uint16 addr) {
+ return pop(vm, scene, addr, 0, 0, 0xd1, 0xd1, 0, 0);
}
- static void show(Scene *scene, uint16 addr, uint16 animation1, uint16 animation2, byte color1, byte color2, byte slot1, byte slot2);
- static void showMono(Scene *scene, uint16 addr, uint16 animation, byte color, byte slot) {
- show(scene, addr, animation, animation, color, color, slot, slot);
+
+ static void show(TeenAgentEngine *vm, Scene *scene, uint16 addr, uint16 animation1, uint16 animation2, byte color1, byte color2, byte slot1, byte slot2);
+
+ static void showMono(TeenAgentEngine *vm, Scene *scene, uint16 addr, uint16 animation, byte color, byte slot) {
+ show(vm, scene, addr, animation, animation, color, color, slot, slot);
}
- static void showMark(Scene *scene, uint16 addr) {
- show(scene, addr, 0, 0, 0xd1, 0xd1, 0, 0);
+
+ static void showMark(TeenAgentEngine *vm, Scene *scene, uint16 addr) {
+ show(vm, scene, addr, 0, 0, 0xd1, 0xd1, 0, 0);
}
};