Mercurial > fife-parpg
comparison engine/core/eventchannel/eventmanager.cpp @ 695:47d58c7a95d7
Fixed a bug in VFSDirectory that prevented absolute paths from being resolved.
* Modified the VFSDirectory constructor so that it now adds the drive root as the VFS root by default, instead of the current working directory.
* Added the current working directory to the VFS in Engine::preInit in addition to the default drive root.
* Reverted a change to EventManager::processMouseEvent which prevents GUIChan from grabbing mouse input. The fact that GUIChan grabs all mouse input will need to be addressed once the GUI code is modularized.
author | M. George Hansen <technopolitica@gmail.com> |
---|---|
date | Fri, 10 Jun 2011 23:36:14 -1000 |
parents | ca1fcb96907d |
children |
comparison
equal
deleted
inserted
replaced
694:ca1fcb96907d | 695:47d58c7a95d7 |
---|---|
433 dispatchKeyEvent(keyevt); | 433 dispatchKeyEvent(keyevt); |
434 } | 434 } |
435 | 435 |
436 void EventManager::processMouseEvent(SDL_Event event) { | 436 void EventManager::processMouseEvent(SDL_Event event) { |
437 // FIXME Technomage 2011-02-02: Guichan just consumes all mouse events. | 437 // FIXME Technomage 2011-02-02: Guichan just consumes all mouse events. |
438 // if(dispatchSdlEvent(event)) | 438 if(dispatchSdlEvent(event)) |
439 // return; | 439 return; |
440 | 440 |
441 MouseEvent mouseevt; | 441 MouseEvent mouseevt; |
442 mouseevt.setSource(this); | 442 mouseevt.setSource(this); |
443 fillMouseEvent(event, mouseevt); | 443 fillMouseEvent(event, mouseevt); |
444 fillModifiers(mouseevt); | 444 fillModifiers(mouseevt); |