libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-02 17:03:13 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

ACCESS: MM - Fix a bug related to the down arrow, some refactoring and renaming

Browse Source
This commit is contained in:
Strangerke 2015-01-17 14:26:56 +01:00
parent 27a9a04615
commit c4e8460ba2
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/access/access.cpp
View File

@ -105,8 +105,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
BOXSELECTY = 0;
BOXSELECTYOLD = -1;
NUMBLINES = 0;
_word234F3 = _word234F7 = _word234F5 = _word234F9 = 0;
_word234FB = _word234FF = _word234FD = _word23501 = 0;
TEMPLIST = nullptr;
_vidEnd = false;

2
engines/access/access.h
View File

@ -223,8 +223,6 @@ public:
int NUMBLINES;
byte _byte26CB5;
int BCNT;
int _word234F3, _word234F7, _word234F5, _word234F9;
int _word234FB, _word234FF, _word234FD, _word23501;
byte *TEMPLIST;
//

21
engines/access/bubble_box.cpp
View File

@ -44,6 +44,8 @@ BubbleBox::BubbleBox(AccessEngine *vm, Access::BoxType type, int x, int y, int w
_tempList[i] = "";
_tempListIdx[i] = 0;
}
_btnUpPos = Common::Rect(0, 0, 0, 0);
_btnDownPos = Common::Rect(0, 0, 0, 0);
}
void BubbleBox::load(Common::SeekableReadStream *stream) {
@ -490,8 +492,8 @@ int BubbleBox::doBox_v1(int item, int box, int &btnSelected) {
_vm->_screen->_orgY2 -= 8;
_vm->_screen->_orgY2 -= 8;
_vm->_word234F7 = _vm->_word234FF = _vm->_screen->_orgX2;
_vm->_word234F3 = _vm->_word234FB = _vm->_screen->_orgX1 = _vm->_screen->_orgX2 - 8;
_btnUpPos.right = _btnDownPos.right = _vm->_screen->_orgX2;
_btnUpPos.left = _btnDownPos.left = _vm->_screen->_orgX1 = _vm->_screen->_orgX2 - 8;
BOXENDX = _vm->_screen->_orgX1 - 1;
_vm->_screen->drawBox();
@ -499,10 +501,11 @@ int BubbleBox::doBox_v1(int item, int box, int &btnSelected) {
_vm->_screen->_orgY2 -= 6;
_vm->_screen->drawBox();
_vm->_word234F9 = _vm->_screen->_orgY1 + 1;
_vm->_word234F5 = _vm->_word234F9 - 5;
_vm->_word234FD = _vm->_screen->_orgY2 + 1;
_vm->_word23501 = _vm->_word234FD - 6;
_btnUpPos.bottom = _vm->_screen->_orgY1 + 1;
_btnUpPos.top = _btnUpPos.bottom - 5;
_btnDownPos.top = _vm->_screen->_orgY2 + 1;
_btnDownPos.bottom = _btnDownPos.top + 6;
_vm->_screen->_orgX1 += 4;
_vm->_screen->_orgX2 = _vm->_screen->_orgX1;
_vm->_screen->_orgY1 -= 4;
@ -619,8 +622,7 @@ int BubbleBox::doBox_v1(int item, int box, int &btnSelected) {
if ((_type != TYPE_1) && (_vm->_timers[2]._flag == 0)) {
++_vm->_timers[2]._flag;
if ((_vm->_events->_mousePos.x >= _vm->_word234F3) && (_vm->_events->_mousePos.x <= _vm->_word234F7)
&& (_vm->_events->_mousePos.y >= _vm->_word234F5) && (_vm->_events->_mousePos.y < _vm->_word234F9)) {
if (_btnUpPos.contains(_vm->_events->_mousePos)) {
if (_vm->BCNT) {
if (_vm->BOXSELECTY != 0) {
--_vm->BOXSELECTY;
@ -632,8 +634,7 @@ int BubbleBox::doBox_v1(int item, int box, int &btnSelected) {
}
}
continue;
} else if ((_vm->_events->_mousePos.x >= _vm->_word234FB) && (_vm->_events->_mousePos.x <= _vm->_word234FF)
&& (_vm->_events->_mousePos.y >= _vm->_word234FD) && (_vm->_events->_mousePos.y < _vm->_word23501)) {
} else if (_btnDownPos.contains(_vm->_events->_mousePos)) {
if (_vm->BCNT) {
if (_vm->BCNT == _vm->NUMBLINES) {
if (_vm->BCNT != _vm->BOXSELECTY + 1) {

2
engines/access/bubble_box.h
View File

@ -65,6 +65,8 @@ public:
int _btnX2;
int _btnId3;
int _btnX3;
Common::Rect _btnUpPos;
Common::Rect _btnDownPos;
Common::Array<Common::Rect> _bubbles;
public: