diff options
| author | Eugene Sandulenko | 2016-12-06 11:03:20 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-12-06 19:46:31 +0100 |
| commit | 216566f235d459b9e997d47211b1329b39959f44 (patch) | |
| tree | 6587888fabff66dbce97367c396e1e69b0bd2892 | |
| parent | 9d9c8564795fef5ed5bb1d0dc4b4ec1110114794 (diff) | |
| download | scummvm-rg350-216566f235d459b9e997d47211b1329b39959f44.tar.gz scummvm-rg350-216566f235d459b9e997d47211b1329b39959f44.tar.bz2 scummvm-rg350-216566f235d459b9e997d47211b1329b39959f44.zip | |
FULLPIPE: Renames in ModalMap
| -rw-r--r-- | engines/fullpipe/modal.cpp | 20 | ||||
| -rw-r--r-- | engines/fullpipe/modal.h | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/engines/fullpipe/modal.cpp b/engines/fullpipe/modal.cpp index 0cbc8d881e..d1bda9dd40 100644 --- a/engines/fullpipe/modal.cpp +++ b/engines/fullpipe/modal.cpp @@ -281,9 +281,9 @@ ModalMap::ModalMap() { _flag = 0; _mouseX = 0; _mouseY = 0; - _field_38 = 0; - _field_3C = 0; - _field_40 = 12; + _dragX = 0; + _dragY = 0; + _hotSpotDelay = 12; _rect2.top = 0; _rect2.left = 0; _rect2.bottom = 600; @@ -303,8 +303,8 @@ bool ModalMap::init(int counterdiff) { g_fp->setCursor(PIC_CSR_ITN); if (_flag) { - _rect2.left = _mouseX + _field_38 - g_fp->_mouseScreenPos.x; - _rect2.top = _mouseY + _field_3C - g_fp->_mouseScreenPos.y; + _rect2.left = _mouseX + _dragX - g_fp->_mouseScreenPos.x; + _rect2.top = _mouseY + _dragY - g_fp->_mouseScreenPos.y; _rect2.right = _rect2.left + 800; _rect2.bottom = _rect2.top + 600; @@ -315,10 +315,10 @@ bool ModalMap::init(int counterdiff) { _rect2 = g_fp->_sceneRect; } - _field_40--; + _hotSpotDelay--; - if (_field_40 <= 0) { - _field_40 = 12; + if (_hotSpotDelay <= 0) { + _hotSpotDelay = 12; if (_pic) _pic->_flags ^= 4; @@ -345,8 +345,8 @@ bool ModalMap::handleMessage(ExCommand *cmd) { _mouseX = g_fp->_mouseScreenPos.x; _mouseY = g_fp->_mouseScreenPos.y; - _field_38 = _rect2.left; - _field_3C = _rect2.top; + _dragX = _rect2.left; + _dragY = _rect2.top; return false; diff --git a/engines/fullpipe/modal.h b/engines/fullpipe/modal.h index 951d38d683..a8d8a811f5 100644 --- a/engines/fullpipe/modal.h +++ b/engines/fullpipe/modal.h @@ -101,9 +101,9 @@ class ModalMap : public BaseModalObject { int _flag; int _mouseX; int _mouseY; - int _field_38; - int _field_3C; - int _field_40; + int _dragX; + int _dragY; + int _hotSpotDelay; Common::Rect _rect2; public: |