diff options
author | Benjamin Haisch | 2008-08-14 07:57:07 +0000 |
---|---|---|
committer | Willem Jan Palenstijn | 2011-11-20 22:43:05 +0100 |
commit | 74c05f6aa889290e5dde753206c6ae6c84b4d679 (patch) | |
tree | 370d29ac9d5cbc6b9a753ea064de5d5f982d7bb1 /engines/toltecs/toltecs.cpp | |
parent | 5660ff514852fbc8e09e223355c1d46270c5db41 (diff) | |
download | scummvm-rg350-74c05f6aa889290e5dde753206c6ae6c84b4d679.tar.gz scummvm-rg350-74c05f6aa889290e5dde753206c6ae6c84b4d679.tar.bz2 scummvm-rg350-74c05f6aa889290e5dde753206c6ae6c84b4d679.zip |
TOLTECS: - Merged input.cpp with toltecs.cpp
- Kernel function 5 returns a random value; use ScummVM's RNG
Diffstat (limited to 'engines/toltecs/toltecs.cpp')
-rw-r--r-- | engines/toltecs/toltecs.cpp | 96 |
1 files changed, 93 insertions, 3 deletions
diff --git a/engines/toltecs/toltecs.cpp b/engines/toltecs/toltecs.cpp index d4b1a34cca..9aa5ad375c 100644 --- a/engines/toltecs/toltecs.cpp +++ b/engines/toltecs/toltecs.cpp @@ -39,7 +39,6 @@ #include "toltecs/toltecs.h" #include "toltecs/animation.h" -#include "toltecs/input.h" #include "toltecs/palette.h" #include "toltecs/resource.h" #include "toltecs/script.h" @@ -111,6 +110,15 @@ int ToltecsEngine::go() { _walkSpeedY = 5; _walkSpeedX = 1; + _mouseX = 0; + _mouseY = 0; + _mouseCounter = 0; + _mouseButtonPressedFlag = false; + _mouseButton = 0; + _mouseDisabled = 0; + _leftButtonDown = false; + _rightButtonDown = false; + _arc = new ArchiveReader(); _arc->openArchive("WESTERN"); @@ -122,7 +130,6 @@ int ToltecsEngine::go() { _anim = new AnimationPlayer(this); _palette = new Palette(this); _segmap = new SegmentMap(this); - _input = new Input(this); _system->showMouse(true); @@ -140,7 +147,6 @@ int ToltecsEngine::go() { delete _anim; delete _palette; delete _segmap; - delete _input; return 0; } @@ -203,6 +209,90 @@ void ToltecsEngine::updateScreen() { updateCamera(); } +void ToltecsEngine::updateInput() { + + Common::Event event; + Common::EventManager *eventMan = _system->getEventManager(); + while (eventMan->pollEvent(event)) { + switch (event.type) { + case Common::EVENT_KEYDOWN: + + // FIXME: This is just for debugging + switch (event.kbd.keycode) { + case Common::KEYCODE_F6: + savegame("toltecs.001"); + break; + case Common::KEYCODE_F9: + loadgame("toltecs.001"); + break; + default: + break; + } + + break; + case Common::EVENT_QUIT: + // FIXME: Find a nicer way to quit + _system->quit(); + break; + case Common::EVENT_MOUSEMOVE: + _mouseX = event.mouse.x; + _mouseY = event.mouse.y; + break; + case Common::EVENT_LBUTTONDOWN: + _mouseX = event.mouse.x; + _mouseY = event.mouse.y; + _leftButtonDown = true; + break; + case Common::EVENT_LBUTTONUP: + _mouseX = event.mouse.x; + _mouseY = event.mouse.y; + _leftButtonDown = false; + break; + case Common::EVENT_RBUTTONDOWN: + _mouseX = event.mouse.x; + _mouseY = event.mouse.y; + _rightButtonDown = true; + break; + case Common::EVENT_RBUTTONUP: + _mouseX = event.mouse.x; + _mouseY = event.mouse.y; + _rightButtonDown = false; + break; + default: + break; + } + } + + if (_mouseDisabled == 0) { + + if (_mouseCounter > 0) + _mouseCounter--; + + byte mouseButtons = 0; + if (_leftButtonDown) + mouseButtons |= 1; + if (_rightButtonDown) + mouseButtons |= 2; + + if (mouseButtons != 0) { + if (!_mouseButtonPressedFlag) { + _mouseButton = mouseButtons; + if (_mouseCounter != 0) + _mouseButton |= 0x80; + _mouseCounter = 30; // maybe TODO + _mouseButtonPressedFlag = true; + } else { + _mouseButton = 0; + } + } else { + _mouseButtonPressedFlag = false; + _mouseButton = 0; + } + + } + +} + void ToltecsEngine::setCamera(int16 x, int16 y) { // TODO font_sub_4B5BB() |