aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/cge/cge.cpp2
-rw-r--r--engines/cge/cge_main.cpp20
-rw-r--r--engines/cge/cge_main.h2
-rw-r--r--engines/cge/events.cpp69
-rw-r--r--engines/cge/events.h25
-rw-r--r--engines/cge/mixer.cpp2
-rw-r--r--engines/cge/snail.cpp4
-rw-r--r--engines/cge/vga13h.cpp8
8 files changed, 68 insertions, 64 deletions
diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp
index 4c21b21f87..2c173b8990 100644
--- a/engines/cge/cge.cpp
+++ b/engines/cge/cge.cpp
@@ -105,7 +105,7 @@ void CGEEngine::setup() {
_snail = new Snail(this, false);
_snail_ = new Snail(this, true);
- _mouse = new MOUSE(this);
+ _mouse = new Mouse(this);
_keyboard = new Keyboard();
_eventManager = new EventManager();
_offUseCount = atoi(_text->getText(OFF_USE_COUNT));
diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index d08fa67400..0135b0441a 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -64,7 +64,7 @@ System *_sys;
Sprite *_pocLight;
EventManager *_eventManager;
Keyboard *_keyboard;
-MOUSE *_mouse;
+Mouse *_mouse;
Sprite *_pocket[POCKET_NX];
Sprite *_sprite;
Sprite *_miniCave;
@@ -681,7 +681,7 @@ void CGEEngine::caveUp() {
_vga->sunrise(Vga::_sysPal);
_dark = false;
if (!_startupMode)
- _mouse->On();
+ _mouse->on();
_heart->_enable = true;
}
@@ -732,7 +732,7 @@ void CGEEngine::switchCave(int cav) {
warning("SwitchCave() - SNPOST");
} else {
_now = cav;
- _mouse->Off();
+ _mouse->off();
if (_hero) {
_hero->park();
_hero->step(0);
@@ -1625,9 +1625,9 @@ void CGEEngine::runGame() {
_horzLine->_z = 126;
_vga->_showQ->insert(_horzLine);
- _mouse->Busy = _vga->_spareQ->locate(BUSY_REF);
- if (_mouse->Busy)
- expandSprite(_mouse->Busy);
+ _mouse->_busy = _vga->_spareQ->locate(BUSY_REF);
+ if (_mouse->_busy)
+ expandSprite(_mouse->_busy);
_startupMode = 0;
@@ -1649,7 +1649,7 @@ void CGEEngine::runGame() {
_heart->_enable = false;
SNPOST(SNCLEAR, -1, 0, NULL);
SNPOST_(SNCLEAR, -1, 0, NULL);
- _mouse->Off();
+ _mouse->off();
_vga->_showQ->clear();
_vga->_spareQ->clear();
_hero = NULL;
@@ -1716,14 +1716,14 @@ bool CGEEngine::showTitle(const char *name) {
_vga->copyPage(0, 1);
_vga->_showQ->append(_mouse);
_heart->_enable = true;
- _mouse->On();
+ _mouse->on();
for (selectSound(); !_snail->idle() || Vmenu::_addr;) {
mainLoop();
if (_eventManager->_quitFlag)
return false;
}
- _mouse->Off();
+ _mouse->off();
_heart->_enable = false;
_vga->_showQ->clear();
_vga->copyPage(0, 2);
@@ -1812,7 +1812,7 @@ void CGEEngine::cge_main() {
//Debug( memset((void *) (-K(4)), 0, K(1)); )
memset(_barriers, 0xFF, sizeof(_barriers));
- if (!_mouse->Exist)
+ if (!_mouse->_exist)
error("%s", _text->getText(NO_MOUSE_TEXT));
if (!SVG0FILE::exist(SVG0NAME))
diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h
index 3ef3679e8e..17925f76f9 100644
--- a/engines/cge/cge_main.h
+++ b/engines/cge/cge_main.h
@@ -169,7 +169,7 @@ extern System *_sys;
extern int _offUseCount;
extern Sprite *_pocLight;
extern Keyboard *_keyboard;
-extern MOUSE *_mouse;
+extern Mouse *_mouse;
extern EventManager *_eventManager;
extern Sprite *_pocket[];
extern Sprite *_sprite;
diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp
index e904b710ba..82d0203e5e 100644
--- a/engines/cge/events.cpp
+++ b/engines/cge/events.cpp
@@ -141,17 +141,18 @@ void Keyboard::NewKeyboard(Common::Event &event) {
/*----------------- MOUSE interface -----------------*/
-MOUSE::MOUSE(CGEEngine *vm, Bitmap **shpl) : Sprite(vm, shpl), Busy(NULL), Hold(NULL), hx(0), _vm(vm) {
+Mouse::Mouse(CGEEngine *vm, Bitmap **shpl) : Sprite(vm, shpl), _busy(NULL), _hold(NULL), _hx(0), _vm(vm) {
static Seq ms[] = {
{ 0, 0, 0, 0, 1 },
{ 1, 1, 0, 0, 1 }
};
- Hold = NULL;
- hx = 0; hy = 0;
- Exist = true;
- Buttons = 0;
- Busy = NULL;
+ _hold = NULL;
+ _hx = 0;
+ _hy = 0;
+ _exist = true;
+ _buttons = 0;
+ _busy = NULL;
_active = false;
setSeq(ms);
@@ -162,37 +163,39 @@ MOUSE::MOUSE(CGEEngine *vm, Bitmap **shpl) : Sprite(vm, shpl), Busy(NULL), Hold(
}
-MOUSE::~MOUSE() {
- Off();
+Mouse::~Mouse() {
+ off();
}
-//void MOUSE::SetFun()
+//void Mouse::setFun()
//{
//}
-void MOUSE::On() {
- if (_seqPtr && Exist) {
+void Mouse::on() {
+ if (_seqPtr && _exist) {
_active = true;
step(0);
- if (Busy) Busy->step(0);
+ if (_busy)
+ _busy->step(0);
}
}
-void MOUSE::Off() {
+void Mouse::off() {
if (_seqPtr == 0) {
- if (Exist) {
+ if (_exist) {
_active = false;
}
step(1);
- if (Busy) Busy->step(1);
+ if (_busy)
+ _busy->step(1);
}
}
-void MOUSE::NewMouse(Common::Event &event) {
+void Mouse::newMouse(Common::Event &event) {
if (!_active)
return;
@@ -208,19 +211,19 @@ void MOUSE::NewMouse(Common::Event &event) {
break;
case Common::EVENT_LBUTTONDOWN:
evt._msk = L_DN;
- Buttons |= 1;
+ _buttons |= 1;
break;
case Common::EVENT_LBUTTONUP:
evt._msk = L_UP;
- Buttons &= ~1;
+ _buttons &= ~1;
break;
case Common::EVENT_RBUTTONDOWN:
evt._msk = R_DN;
- Buttons |= 2;
+ _buttons |= 2;
break;
case Common::EVENT_RBUTTONUP:
evt._msk = R_UP;
- Buttons &= ~2;
+ _buttons &= ~2;
break;
default:
break;
@@ -252,7 +255,7 @@ void EventManager::poll() {
case Common::EVENT_RBUTTONDOWN:
case Common::EVENT_RBUTTONUP:
// Handle mouse events
- _mouse->NewMouse(_event);
+ _mouse->newMouse(_event);
handleEvents();
break;
default:
@@ -265,8 +268,8 @@ void EventManager::handleEvents() {
while (EvtTail != EvtHead) {
CGEEvent e = Evt[EvtTail];
if (e._msk) {
- if (_mouse->Hold && e._ptr != _mouse->Hold)
- _mouse->Hold->touch(e._msk | ATTN, e._x - _mouse->Hold->_x, e._y - _mouse->Hold->_y);
+ if (_mouse->_hold && e._ptr != _mouse->_hold)
+ _mouse->_hold->touch(e._msk | ATTN, e._x - _mouse->_hold->_x, e._y - _mouse->_hold->_y);
// update mouse cursor position
if (e._msk & ROLL)
@@ -282,18 +285,18 @@ void EventManager::handleEvents() {
_sys->touch(e._msk, e._x, e._y);
if (e._msk & L_DN) {
- _mouse->Hold = e._ptr;
- if (_mouse->Hold) {
- _mouse->Hold->_flags._hold = true;
- _mouse->hx = e._x - _mouse->Hold->_x;
- _mouse->hy = e._y - _mouse->Hold->_y;
+ _mouse->_hold = e._ptr;
+ if (_mouse->_hold) {
+ _mouse->_hold->_flags._hold = true;
+ _mouse->_hx = e._x - _mouse->_hold->_x;
+ _mouse->_hy = e._y - _mouse->_hold->_y;
}
}
if (e._msk & L_UP) {
- if (_mouse->Hold) {
- _mouse->Hold->_flags._hold = false;
- _mouse->Hold = NULL;
+ if (_mouse->_hold) {
+ _mouse->_hold->_flags._hold = false;
+ _mouse->_hold = NULL;
}
}
///Touched = e.Ptr;
@@ -304,8 +307,8 @@ void EventManager::handleEvents() {
}
EvtTail = (EvtTail + 1) % EVT_MAX;
}
- if (_mouse->Hold)
- _mouse->Hold->gotoxy(_mouse->_x - _mouse->hx, _mouse->_y - _mouse->hy);
+ if (_mouse->_hold)
+ _mouse->_hold->gotoxy(_mouse->_x - _mouse->_hx, _mouse->_y - _mouse->_hy);
}
void EventManager::ClrEvt(Sprite *spr) {
diff --git a/engines/cge/events.h b/engines/cge/events.h
index 6df2c94d4a..374c28aebc 100644
--- a/engines/cge/events.h
+++ b/engines/cge/events.h
@@ -94,21 +94,22 @@ extern uint16 EvtHead, EvtTail;
extern Bitmap *MC[];
-class MOUSE : public Sprite {
+class Mouse : public Sprite {
public:
- Sprite *Hold;
+ Sprite *_hold;
bool _active;
- int hx, hy;
- bool Exist;
- int Buttons;
- Sprite *Busy;
+ int _hx;
+ int _hy;
+ bool _exist;
+ int _buttons;
+ Sprite *_busy;
//Sprite *Touched;
- MOUSE(CGEEngine *vm, Bitmap **shpl = MC);
- ~MOUSE();
- void On();
- void Off();
- void Tick();
- void NewMouse(Common::Event &event);
+ Mouse(CGEEngine *vm, Bitmap **shpl = MC);
+ ~Mouse();
+ void on();
+ void off();
+ void tick();
+ void newMouse(Common::Event &event);
private:
CGEEngine *_vm;
};
diff --git a/engines/cge/mixer.cpp b/engines/cge/mixer.cpp
index d4a5212552..aea033ebc9 100644
--- a/engines/cge/mixer.cpp
+++ b/engines/cge/mixer.cpp
@@ -34,7 +34,7 @@
namespace CGE {
-extern MOUSE *Mouse;
+extern Mouse *Mouse;
bool Mixer::_appear = false;
diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp
index a0b5c4bdd6..15ba714369 100644
--- a/engines/cge/snail.cpp
+++ b/engines/cge/snail.cpp
@@ -848,9 +848,9 @@ void CGEEngine::snReach(Sprite *spr, int mode) {
void CGEEngine::snMouse(bool on) {
if (on)
- _mouse->On();
+ _mouse->on();
else
- _mouse->Off();
+ _mouse->off();
}
diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp
index 36ac060111..e1309c96f0 100644
--- a/engines/cge/vga13h.cpp
+++ b/engines/cge/vga13h.cpp
@@ -234,14 +234,14 @@ extern "C" void TimerProc() {
if (Sys) {
if (Sys->Time) {
if (--Sys->Time == 0)
- Sys->Tick();
+ Sys->tick();
}
}
for (spr = VGA::ShowQ.First(); spr; spr = spr->Next) {
if (spr->Time) {
if (!spr->_flags.Hide) {
if (-- spr->Time == 0)
- spr->Tick();
+ spr->tick();
}
}
}
@@ -308,7 +308,7 @@ void Engine_::newTimer(...) {
if (Sys) {
if (Sys->Time) {
if (--Sys->Time == 0)
- Sys->Tick();
+ Sys->tick();
}
}
@@ -316,7 +316,7 @@ void Engine_::newTimer(...) {
if (spr->Time) {
if (!spr->_flags.Hide) {
if (--spr->Time == 0)
- spr->Tick();
+ spr->tick();
}
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-04 02:54:49 +0000