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
|
@ -900,7 +900,7 @@ void Intro::restoreScreen(void) {
|
|||
bool Intro::escDelay(uint32 msecs) {
|
||||
|
||||
Common::EventManager *eventMan = _system->getEventManager();
|
||||
OSystem::Event event;
|
||||
Common::Event event;
|
||||
if (_relDelay == 0) // first call, init with system time
|
||||
_relDelay = (int32)_system->getMillis();
|
||||
|
||||
|
@ -909,10 +909,10 @@ bool Intro::escDelay(uint32 msecs) {
|
|||
int32 nDelay = 0;
|
||||
do {
|
||||
while (eventMan->pollEvent(event)) {
|
||||
if (event.type == OSystem::EVENT_KEYDOWN) {
|
||||
if (event.type == Common::EVENT_KEYDOWN) {
|
||||
if (event.kbd.keycode == 27)
|
||||
return false;
|
||||
} else if (event.type == OSystem::EVENT_QUIT) {
|
||||
} else if (event.type == Common::EVENT_QUIT) {
|
||||
_quitProg = true;
|
||||
return false;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue