diff options
| author | Alyssa Milburn | 2011-08-19 20:14:40 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-08-19 20:14:40 +0200 |
| commit | bda1afdbfb3e080441db5557667264e57c29e98e (patch) | |
| tree | 729ffe73da9fcd7671da5f6f06c8c5abe94cbb12 /engines/cge/events.cpp | |
| parent | 4e156b24635c3cb44d46dde7a01f97fb2fe4a552 (diff) | |
| parent | 8ff904c6b576eda37930b020e39855c1fd261b2f (diff) | |
| download | scummvm-rg350-bda1afdbfb3e080441db5557667264e57c29e98e.tar.gz scummvm-rg350-bda1afdbfb3e080441db5557667264e57c29e98e.tar.bz2 scummvm-rg350-bda1afdbfb3e080441db5557667264e57c29e98e.zip | |
Merge branch 'soltys_wip2' of https://github.com/Strangerke/scummvm into soltys_wip2
Conflicts:
engines/cge/bitmap.cpp
Diffstat (limited to 'engines/cge/events.cpp')
| -rw-r--r-- | engines/cge/events.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/cge/events.cpp b/engines/cge/events.cpp index 342a0a8cb1..6e23b4e613 100644 --- a/engines/cge/events.cpp +++ b/engines/cge/events.cpp @@ -169,8 +169,8 @@ Mouse::Mouse(CGEEngine *vm) : Sprite(vm, NULL), _busy(NULL), _hold(NULL), _hx(0) setSeq(seq); BitmapPtr *MC = new BitmapPtr[3]; - MC[0] = new Bitmap("MOUSE", true); - MC[1] = new Bitmap("DUMMY", true); + MC[0] = new Bitmap("MOUSE"); + MC[1] = new Bitmap("DUMMY"); MC[2] = NULL; setShapeList(MC); @@ -245,6 +245,7 @@ EventManager::EventManager() { _quitFlag = false; _eventQueueHead = 0; _eventQueueTail = 0; + memset(&_eventQueue, 0, kEventMax * sizeof(CGEEvent)); memset(&_event, 0, sizeof(Common::Event)); } |