libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-25 04:01:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CGE: Cleanup: rename a couple of forgotten class members

Browse Source
This commit is contained in:
Strangerke 2011-07-09 00:41:47 +02:00
parent 0b27de942b
commit 6ed9dd0d04
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/cge/events.cpp
View File

@ -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)

6
engines/cge/events.h
View File

@ -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

2
engines/cge/snail.cpp
View File

@ -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 {