libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-18 07:53:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AGOS: Changed _leftButtonDown & _rightButtonDown from byte to int

Browse Source 
svn-id: r39256
This commit is contained in:
Max Horn 2009-03-09 03:45:33 +00:00
parent e080a59337
commit 563d76d342
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/agos/agos.cpp
View File

@ -290,8 +290,8 @@ AGOSEngine::AGOSEngine(OSystem *syst)
_pendingDeleteTimeEvent = 0;
_initMouse = 0;
_leftButtonDown = 0;
_rightButtonDown = 0;
_leftButtonDown = false;
_rightButtonDown = false;
_clickOnly = 0;
_oneClick = 0;
_leftClick = 0;

2
engines/agos/agos.h
View File

@ -409,7 +409,7 @@ protected:
uint16 _mouseHideCount;
bool _mouseToggle;
byte _leftButtonDown, _rightButtonDown;
bool _leftButtonDown, _rightButtonDown;
byte _leftButton, _leftButtonCount, _leftButtonOld;
byte _oneClick;
bool _clickOnly;

14
engines/agos/cursor.cpp
View File

@ -360,15 +360,15 @@ void AGOSEngine_PuzzlePack::handleMouseMoved() {
_mouse = _eventMan->getMousePos();
x = 0;
if (_lastHitArea3 == 0 && _leftButtonDown != 0) {
if (_lastHitArea3 == 0 && _leftButtonDown) {
_verbHitArea = 300;
_leftButtonDown = 0;
_leftButtonDown = false;
x = 1;
}
if (_rightButtonDown != 0) {
if (_rightButtonDown) {
_verbHitArea = (getGameId() == GID_DIMP) ? 301 : 300;
_rightButtonDown = 0;
_rightButtonDown = false;
x = 1;
}
@ -419,7 +419,7 @@ void AGOSEngine_Simon1::handleMouseMoved() {
}
if (_rightButtonDown) {
_rightButtonDown = 0;
_rightButtonDown = false;
setVerb(NULL);
}
} else if (getGameType() == GType_SIMON2) {
@ -453,8 +453,8 @@ void AGOSEngine_Simon1::handleMouseMoved() {
_leftButtonOld = _leftButton;
x = 0;
if (_lastHitArea3 == 0 && _leftButtonDown != 0) {
_leftButtonDown = 0;
if (_lastHitArea3 == 0 && _leftButtonDown) {
_leftButtonDown = false;
x = 1;
} else {
if (_litBoxFlag == 0 && _needHitAreaRecalc == 0)

4
engines/agos/event.cpp
View File

@ -503,7 +503,7 @@ void AGOSEngine::delay(uint amount) {
case Common::EVENT_LBUTTONDOWN:
if (getGameType() == GType_FF)
setBitFlag(89, true);
_leftButtonDown++;
_leftButtonDown = true;
_leftButton = 1;
break;
case Common::EVENT_LBUTTONUP:
@ -517,7 +517,7 @@ void AGOSEngine::delay(uint amount) {
case Common::EVENT_RBUTTONDOWN:
if (getGameType() == GType_FF)
setBitFlag(92, false);
_rightButtonDown++;
_rightButtonDown = true;
break;
case Common::EVENT_RBUTTONUP:
_rightClick = true;

4
engines/agos/input.cpp
View File

@ -126,7 +126,7 @@ void AGOSEngine::setup_cond_c_helper() {
while (!shouldQuit()) {
_lastHitArea = NULL;
_lastHitArea3 = 0;
_leftButtonDown = 0;
_leftButtonDown = false;
do {
if (_exitCutscene && getBitFlag(9)) {
@ -172,7 +172,7 @@ void AGOSEngine::waitForInput() {
HitArea *ha;
uint id;
_leftButtonDown = 0;
_leftButtonDown = false;
_lastHitArea = 0;
//_lastClickRem = 0;
_verbHitArea = 0;

2
engines/agos/vga.cpp
View File

@ -1213,7 +1213,7 @@ void AGOSEngine::vc33_setMouseOn() {
void AGOSEngine::vc34_setMouseOff() {
mouseOff();
_mouseHideCount = 200;
_leftButtonDown = 0;
_leftButtonDown = false;
}
void AGOSEngine::clearVideoBackGround(uint16 num, uint16 color) {