Moved Event/EventType/keyboard enum from common/system.h (part of class OSystem) to common/events.h (part of namespace Common). Porters may have to make minor changes to their backends to get them to compile again
svn-id: r26180
This commit is contained in:
parent
f272d19570
commit
ed54ea9155
88 changed files with 762 additions and 748 deletions
|
@ -140,32 +140,32 @@ int16 Util::getRandom(int16 max) {
|
|||
}
|
||||
|
||||
void Util::processInput() {
|
||||
OSystem::Event event;
|
||||
Common::Event event;
|
||||
Common::EventManager *eventMan = g_system->getEventManager();
|
||||
while (eventMan->pollEvent(event)) {
|
||||
switch (event.type) {
|
||||
case OSystem::EVENT_MOUSEMOVE:
|
||||
case Common::EVENT_MOUSEMOVE:
|
||||
_mouseX = event.mouse.x;
|
||||
_mouseY = event.mouse.y;
|
||||
break;
|
||||
case OSystem::EVENT_LBUTTONDOWN:
|
||||
case Common::EVENT_LBUTTONDOWN:
|
||||
_mouseButtons |= 1;
|
||||
break;
|
||||
case OSystem::EVENT_RBUTTONDOWN:
|
||||
case Common::EVENT_RBUTTONDOWN:
|
||||
_mouseButtons |= 2;
|
||||
break;
|
||||
case OSystem::EVENT_LBUTTONUP:
|
||||
case Common::EVENT_LBUTTONUP:
|
||||
_mouseButtons &= ~1;
|
||||
break;
|
||||
case OSystem::EVENT_RBUTTONUP:
|
||||
case Common::EVENT_RBUTTONUP:
|
||||
_mouseButtons &= ~2;
|
||||
break;
|
||||
case OSystem::EVENT_KEYDOWN:
|
||||
case Common::EVENT_KEYDOWN:
|
||||
addKeyToBuffer(event.kbd.keycode);
|
||||
break;
|
||||
case OSystem::EVENT_KEYUP:
|
||||
case Common::EVENT_KEYUP:
|
||||
break;
|
||||
case OSystem::EVENT_QUIT:
|
||||
case Common::EVENT_QUIT:
|
||||
_vm->_quitRequested = true;
|
||||
break;
|
||||
default:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue