diff options
-rw-r--r-- | engines/dreamweb/dreamweb.cpp | 2 | ||||
-rw-r--r-- | engines/dreamweb/dreamweb.h | 31 | ||||
-rw-r--r-- | engines/dreamweb/keypad.cpp | 19 |
3 files changed, 20 insertions, 32 deletions
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp index e790baa3e3..67e72ebf7c 100644 --- a/engines/dreamweb/dreamweb.cpp +++ b/engines/dreamweb/dreamweb.cpp @@ -181,8 +181,6 @@ DreamWebEngine::DreamWebEngine(OSystem *syst, const DreamWebGameDescription *gam _symbolBotX = 0; _symbolBotNum = 0; _symbolBotDir = 0; - _dumpX = 0; - _dumpY = 0; _walkAndExam = 0; _walkExamType = 0; _walkExamNum = 0; diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h index a38c08f3d0..355c70715e 100644 --- a/engines/dreamweb/dreamweb.h +++ b/engines/dreamweb/dreamweb.h @@ -196,6 +196,20 @@ protected: // from keypad.cpp uint8 _pressList[6]; + uint8 _pressed; + uint16 _pressPointer; + uint8 _graphicPress; + uint8 _pressCount; + uint8 _lightCount; + uint8 _folderPage; + uint8 _diaryPage; + uint8 _menuCount; + uint8 _symbolTopX; + uint8 _symbolTopNum; + int8 _symbolTopDir; + uint8 _symbolBotX; + uint8 _symbolBotNum; + int8 _symbolBotDir; // from monitor.cpp char _inputLine[64]; @@ -393,22 +407,6 @@ public: uint8 _watchDump; uint8 _logoNum; uint8 _oldLogoNum; - uint8 _pressed; - uint16 _pressPointer; - uint8 _graphicPress; - uint8 _pressCount; - uint8 _lightCount; - uint8 _folderPage; - uint8 _diaryPage; - uint8 _menuCount; - uint8 _symbolTopX; - uint8 _symbolTopNum; - uint8 _symbolTopDir; - uint8 _symbolBotX; - uint8 _symbolBotNum; - uint8 _symbolBotDir; - uint16 _dumpX; - uint16 _dumpY; uint8 _walkAndExam; uint8 _walkExamType; uint8 _walkExamNum; @@ -489,7 +487,6 @@ public: void showOuterPad(); void dumpKeypad(); void dumpSymbol(); - void dumpSymBox(); void quitSymbol(); void enterCode(uint8 digit0, uint8 digit1, uint8 digit2, uint8 digit3); diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp index 30d44d3c73..eaffad822d 100644 --- a/engines/dreamweb/keypad.cpp +++ b/engines/dreamweb/keypad.cpp @@ -590,7 +590,7 @@ void DreamWebEngine::setTopLeft() { } if (_mouseButton != 0) - _symbolTopDir = 0xFF; + _symbolTopDir = -1; } void DreamWebEngine::setTopRight() { @@ -605,7 +605,7 @@ void DreamWebEngine::setTopRight() { } if (_mouseButton != 0) - _symbolTopDir = 1; + _symbolTopDir = +1; } void DreamWebEngine::setBotLeft() { @@ -620,7 +620,7 @@ void DreamWebEngine::setBotLeft() { } if (_mouseButton != 0) - _symbolBotDir = 0xFF; + _symbolBotDir = -1; } void DreamWebEngine::setBotRight() { @@ -635,7 +635,7 @@ void DreamWebEngine::setBotRight() { } if (_mouseButton != 0) - _symbolBotDir = 1; + _symbolBotDir = +1; } void DreamWebEngine::dumpSymbol() { @@ -672,7 +672,7 @@ void DreamWebEngine::updateSymbolTop() { if (!_symbolTopDir) return; // topfinished - if (_symbolTopDir == (byte)-1) { + if (_symbolTopDir == -1) { // Backward _symbolTopX--; if (_symbolTopX != (byte)-1) { @@ -709,7 +709,7 @@ void DreamWebEngine::updateSymbolBot() { if (!_symbolBotDir) return; // botfinished - if (_symbolBotDir == (byte)-1) { + if (_symbolBotDir == -1) { // Backward _symbolBotX--; if (_symbolBotX != (byte)-1) { @@ -742,13 +742,6 @@ void DreamWebEngine::updateSymbolBot() { } } -void DreamWebEngine::dumpSymBox() { - if (_dumpX != 0xFFFF) { - multiDump(_dumpX, _dumpY, 30, 77); - _dumpX = 0xFFFF; - } -} - void DreamWebEngine::useDiary() { getRidOfReels(); loadIntoTemp("DREAMWEB.G14"); |