diff options
| -rw-r--r-- | engines/cge/events.cpp | 6 | ||||
| -rw-r--r-- | engines/cge/events.h | 6 | ||||
| -rw-r--r-- | engines/cge/snail.cpp | 2 |
3 files changed, 6 insertions, 8 deletions
diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp index 82d0203e5e..116eb34b52 100644 --- a/engines/cge/events.cpp +++ b/engines/cge/events.cpp @@ -116,7 +116,7 @@ bool Keyboard::getKey(uint16 keycode, int &cgeCode) { return false; } -void Keyboard::NewKeyboard(Common::Event &event) { +void Keyboard::newKeyboard(Common::Event &event) { int keycode; if (!getKey(event.kbd.keycode, keycode)) return; @@ -246,7 +246,7 @@ void EventManager::poll() { case Common::EVENT_KEYDOWN: case Common::EVENT_KEYUP: // Handle keyboard events - _keyboard->NewKeyboard(_event); + _keyboard->newKeyboard(_event); handleEvents(); break; case Common::EVENT_MOUSEMOVE: @@ -311,7 +311,7 @@ void EventManager::handleEvents() { _mouse->_hold->gotoxy(_mouse->_x - _mouse->_hx, _mouse->_y - _mouse->_hy); } -void EventManager::ClrEvt(Sprite *spr) { +void EventManager::clrEvt(Sprite *spr) { if (spr) { uint16 e; for (e = EvtTail; e != EvtHead; e = (e + 1) % EVT_MAX) diff --git a/engines/cge/events.h b/engines/cge/events.h index 90b8ed1db0..75c504f030 100644 --- a/engines/cge/events.h +++ b/engines/cge/events.h @@ -56,7 +56,7 @@ public: Sprite *_client; bool _key[0x60]; - void NewKeyboard(Common::Event &event); + void newKeyboard(Common::Event &event); uint16 last() { uint16 cur = _current; _current = 0; @@ -89,8 +89,6 @@ struct CGEEvent { Sprite *_ptr; }; -extern CGEEvent Evt[EVT_MAX]; -extern uint16 EvtHead, EvtTail; extern Bitmap *MC[]; @@ -124,7 +122,7 @@ public: EventManager(); void poll(); - static void ClrEvt(Sprite *spr = NULL); + static void clrEvt(Sprite *spr = NULL); }; } // End of namespace CGE diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp index 15ba714369..242fb067e7 100644 --- a/engines/cge/snail.cpp +++ b/engines/cge/snail.cpp @@ -710,7 +710,7 @@ void CGEEngine::snKill(Sprite *spr) { Sprite *nx = spr->_next; hide1(spr); _vga->_showQ->remove(spr); - EventManager::ClrEvt(spr); + EventManager::clrEvt(spr); if (spr->_flags._kill) delete spr; else { |