From 93deecccefe3d299c584fd38c719a6e532753a05 Mon Sep 17 00:00:00 2001 From: Travis Howell Date: Mon, 9 Mar 2009 04:16:27 +0000 Subject: Minor cleanup. svn-id: r39259 --- engines/agos/agos.cpp | 4 ++-- engines/agos/agos.h | 2 +- engines/agos/cursor.cpp | 16 ++++++++-------- engines/agos/event.cpp | 2 +- engines/agos/input.cpp | 38 +++++++++++++++++++------------------- engines/agos/script_e1.cpp | 8 ++++---- engines/agos/verb.cpp | 16 ++++++++-------- 7 files changed, 43 insertions(+), 43 deletions(-) diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index 3a92553120..bde4c2c3fc 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -269,7 +269,7 @@ AGOSEngine::AGOSEngine(OSystem *syst) _dragAccept = false; _dragEnd = false; _dragFlag = false; - _dragMode = 0; + _dragMode = false; _dragCount = 0; _lastClickRem = 0; @@ -292,7 +292,7 @@ AGOSEngine::AGOSEngine(OSystem *syst) _initMouse = 0; _leftButtonDown = false; _rightButtonDown = false; - _clickOnly = 0; + _clickOnly = false; _oneClick = 0; _leftClick = 0; _rightClick = 0; diff --git a/engines/agos/agos.h b/engines/agos/agos.h index cafc732458..2b66b751f8 100644 --- a/engines/agos/agos.h +++ b/engines/agos/agos.h @@ -376,7 +376,7 @@ protected: bool _dragAccept; bool _dragEnd; bool _dragFlag; - uint8 _dragMode; + bool _dragMode; uint8 _dragCount; HitArea *_lastClickRem; diff --git a/engines/agos/cursor.cpp b/engines/agos/cursor.cpp index 01b7a2b4f6..7dffe2f963 100644 --- a/engines/agos/cursor.cpp +++ b/engines/agos/cursor.cpp @@ -486,7 +486,7 @@ void AGOSEngine_PN::handleMouseMoved() { if (_leftClick == true) { _leftClick = false; - if (_dragFlag != 0) { + if (_dragFlag) { _hitCalled = 4; } else if (_videoLockOut & 0x10) { if (_oneClick != 0) { @@ -571,8 +571,8 @@ void AGOSEngine::handleMouseMoved() { if (_leftClick == true) { _leftClick = false; - if (_dragMode != 0) { - _dragEnd = 1; + if (_dragMode) { + _dragEnd = true; } else { _oneClick = 1; } @@ -588,7 +588,7 @@ void AGOSEngine::handleMouseMoved() { } _leftButtonOld = _leftButton; - if (_dragMode != 0 || _lastHitArea3 != 0) { + if (_dragMode || _lastHitArea3) { x = 0; if (_needHitAreaRecalc == 0) goto get_out; @@ -596,11 +596,11 @@ void AGOSEngine::handleMouseMoved() { goto boxstuff; } - if (_leftButton != 0 && _dragAccept != 0 && _lastClickRem != NULL) { + if (_leftButton != 0 && _dragAccept && _lastClickRem != NULL) { _dragCount++; if (_dragCount == 20) { - _dragMode = 1; - _dragFlag = 1; + _dragMode = true; + _dragFlag = true; _needHitAreaRecalc++; } } @@ -847,7 +847,7 @@ void AGOSEngine::drawMousePointer() { } } - if (_dragFlag != 0) + if (_dragFlag) src = _common_handInfo; for (i = 0; i < 16; i++) { diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp index 387984e0bd..bc07320563 100644 --- a/engines/agos/event.cpp +++ b/engines/agos/event.cpp @@ -129,7 +129,7 @@ void AGOSEngine::killAllTimers() { next = cur->next; delTimeEvent(cur); } - _clickOnly = 0; + _clickOnly = false; } bool AGOSEngine::kickoffTimeEvents() { diff --git a/engines/agos/input.cpp b/engines/agos/input.cpp index 618ec11d8a..afb285e50c 100644 --- a/engines/agos/input.cpp +++ b/engines/agos/input.cpp @@ -117,7 +117,7 @@ void AGOSEngine::setup_cond_c_helper() { _lastHitArea = 0; _hitAreaObjectItem = NULL; - _nameLocked = 0; + _nameLocked = false; last = _lastNameOn; clearName(); @@ -178,8 +178,8 @@ void AGOSEngine::waitForInput() { _verbHitArea = 0; _hitAreaSubjectItem = NULL; _hitAreaObjectItem = NULL; - _clickOnly = 0; - _nameLocked = 0; + _clickOnly = false; + _nameLocked = false; if (getGameType() == GType_WW) { _mouseCursor = 0; @@ -192,7 +192,7 @@ void AGOSEngine::waitForInput() { while (!shouldQuit()) { _lastHitArea = NULL; _lastHitArea3 = NULL; - _dragAccept = 1; + _dragAccept = true; while (!shouldQuit()) { if ((getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) && @@ -206,7 +206,7 @@ void AGOSEngine::waitForInput() { if (_lastHitArea3 == (HitArea *) -1) { _lastHitArea = NULL; _lastHitArea3 = NULL; - _dragAccept = 1; + _dragAccept = true; } else { if (_lastHitArea3 || _dragMode) break; @@ -219,10 +219,10 @@ void AGOSEngine::waitForInput() { ha = _lastClickRem; if (ha == 0 || ha->itemPtr == NULL || !(ha->flags & kBFDragBox)) { - _dragFlag = 0; - _dragMode = 0; + _dragFlag = false; + _dragMode = false; _dragCount = 0; - _dragEnd = 0; + _dragEnd = false; continue; } @@ -234,18 +234,18 @@ void AGOSEngine::waitForInput() { hitarea_stuff_helper(); delay(100); - if (_dragFlag == 0) { - _dragFlag = 0; - _dragMode = 0; + if (!_dragFlag) { + _dragFlag = false; + _dragMode = false; _dragCount = 0; - _dragEnd = 0; + _dragEnd = false; } } while (!_dragEnd); - _dragFlag = 0; - _dragMode = 0; + _dragFlag = false; + _dragMode = false; _dragCount = 0; - _dragEnd = 0; + _dragEnd = false; boxController(_mouse.x, _mouse.y, 1); @@ -304,9 +304,9 @@ void AGOSEngine::waitForInput() { ) { _hitAreaSubjectItem = ha->itemPtr; id = setVerbText(ha); - _nameLocked = 0; + _nameLocked = false; displayName(ha); - _nameLocked = 1; + _nameLocked = true; if (_verbHitArea) { break; @@ -353,9 +353,9 @@ out_of_here: else if (getGameType() == GType_ELVIRA1) unlightMenuStrip(); - _nameLocked = 0; + _nameLocked = false; _needHitAreaRecalc++; - _dragAccept = 0; + _dragAccept = false; if (getGameType() == GType_WW && _mouseCursor < 3) _mouseCursor = 0; diff --git a/engines/agos/script_e1.cpp b/engines/agos/script_e1.cpp index 3be40b0f5b..0080748699 100644 --- a/engines/agos/script_e1.cpp +++ b/engines/agos/script_e1.cpp @@ -824,15 +824,15 @@ void AGOSEngine_Elvira1::oe1_enableInput() { _hitAreaSubjectItem = 0; _hitAreaObjectItem = 0; - _dragFlag = 0; - _dragAccept = 0; + _dragFlag = false; + _dragAccept = false; _dragCount = 0; - _dragMode = 0; + _dragMode = false; _lastHitArea3 = 0; _lastHitArea = 0; - _clickOnly = 1; + _clickOnly = true; } void AGOSEngine_Elvira1::oe1_setTime() { diff --git a/engines/agos/verb.cpp b/engines/agos/verb.cpp index 6f198af799..c348401968 100644 --- a/engines/agos/verb.cpp +++ b/engines/agos/verb.cpp @@ -238,7 +238,7 @@ void AGOSEngine::clearName() { if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2) return; - if (_nameLocked == 1 || _lastNameOn == 0) + if (_nameLocked || !_lastNameOn) return; resetNameWindow(); @@ -734,13 +734,13 @@ void AGOSEngine::boxController(uint x, uint y, uint mode) { _variableArray[500] = best_ha->verb & 0xBFFF; } - if (_clickOnly != 0 && best_ha->id < 8) { + if (_clickOnly && best_ha->id < 8) { uint id = best_ha->id; if (id >= 4) id -= 4; invertBox(findBox(id), 0, 0, 0, 0); - _clickOnly = 0; + _clickOnly = false; return; } } @@ -752,7 +752,7 @@ void AGOSEngine::boxController(uint x, uint y, uint mode) { } } - if (_clickOnly != 0) + if (_clickOnly) return; if (best_ha->flags & kBFInvertTouch) { @@ -858,7 +858,7 @@ void AGOSEngine_Waxworks::boxController(uint x, uint y, uint mode) { } } - if (getGameType() != GType_WW || _nameLocked == 0) { + if (getGameType() != GType_WW || !_nameLocked) { if (best_ha->flags & kBFNoTouchName) { clearName(); } else if (best_ha != _lastNameOn) { @@ -1104,13 +1104,13 @@ void AGOSEngine_PN::execMouseHit(HitArea *ha) { else hitBox1(ha); } else if (_hitCalled == 3) { - if ((ha->flags & kOBFDraggable) && _dragFlag == 0) { - _dragFlag = 1; + if ((ha->flags & kOBFDraggable) && !_dragFlag) { + _dragFlag = true; _dragStore = ha; _needHitAreaRecalc++; } } else if (_hitCalled == 4) { - _dragFlag = 0; + _dragFlag = false; _hitCalled = 0; _oneClick = 0; _dragCount = 0; -- cgit v1.2.3