From 50435d6bae2a89180676dbdbc83986d952ffb717 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 20 Oct 2009 11:13:00 +0000 Subject: AGI: Turn g_tickTimer & g_mouse into members of class AgiEngine resp. AgiBase svn-id: r45259 --- engines/agi/op_cmd.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'engines/agi/op_cmd.cpp') diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp index d6c8f14400..1baf40fe98 100644 --- a/engines/agi/op_cmd.cpp +++ b/engines/agi/op_cmd.cpp @@ -1519,9 +1519,9 @@ cmd(print_at_v) { cmd(push_script) { // We run AGIMOUSE always as a side effect if (g_agi->getFeatures() & GF_AGIMOUSE || 1) { - game.vars[27] = g_mouse.button; - game.vars[28] = g_mouse.x / 2; - game.vars[29] = g_mouse.y; + game.vars[27] = g_agi->_mouse.button; + game.vars[28] = g_agi->_mouse.x / 2; + game.vars[29] = g_agi->_mouse.y; } else { if (g_agi->getVersion() >= 0x2915) { report("push.script\n"); @@ -1546,8 +1546,8 @@ cmd(set_pri_base) { } cmd(mouse_posn) { - _v[p0] = WIN_TO_PIC_X(g_mouse.x); - _v[p1] = WIN_TO_PIC_Y(g_mouse.y); + _v[p0] = WIN_TO_PIC_X(g_agi->_mouse.x); + _v[p1] = WIN_TO_PIC_Y(g_agi->_mouse.y); } cmd(shake_screen) { -- cgit v1.2.3