[Scummvm-cvs-logs] SF.net SVN: scummvm:[39259] scummvm/trunk/engines/agos
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Mon Mar 9 05:16:27 CET 2009
Revision: 39259
http://scummvm.svn.sourceforge.net/scummvm/?rev=39259&view=rev
Author: Kirben
Date: 2009-03-09 04:16:27 +0000 (Mon, 09 Mar 2009)
Log Message:
-----------
Minor cleanup.
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.cpp
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/cursor.cpp
scummvm/trunk/engines/agos/event.cpp
scummvm/trunk/engines/agos/input.cpp
scummvm/trunk/engines/agos/script_e1.cpp
scummvm/trunk/engines/agos/verb.cpp
Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp 2009-03-09 03:58:18 UTC (rev 39258)
+++ scummvm/trunk/engines/agos/agos.cpp 2009-03-09 04:16:27 UTC (rev 39259)
@@ -269,7 +269,7 @@
_dragAccept = false;
_dragEnd = false;
_dragFlag = false;
- _dragMode = 0;
+ _dragMode = false;
_dragCount = 0;
_lastClickRem = 0;
@@ -292,7 +292,7 @@
_initMouse = 0;
_leftButtonDown = false;
_rightButtonDown = false;
- _clickOnly = 0;
+ _clickOnly = false;
_oneClick = 0;
_leftClick = 0;
_rightClick = 0;
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2009-03-09 03:58:18 UTC (rev 39258)
+++ scummvm/trunk/engines/agos/agos.h 2009-03-09 04:16:27 UTC (rev 39259)
@@ -376,7 +376,7 @@
bool _dragAccept;
bool _dragEnd;
bool _dragFlag;
- uint8 _dragMode;
+ bool _dragMode;
uint8 _dragCount;
HitArea *_lastClickRem;
Modified: scummvm/trunk/engines/agos/cursor.cpp
===================================================================
--- scummvm/trunk/engines/agos/cursor.cpp 2009-03-09 03:58:18 UTC (rev 39258)
+++ scummvm/trunk/engines/agos/cursor.cpp 2009-03-09 04:16:27 UTC (rev 39259)
@@ -486,7 +486,7 @@
if (_leftClick == true) {
_leftClick = false;
- if (_dragFlag != 0) {
+ if (_dragFlag) {
_hitCalled = 4;
} else if (_videoLockOut & 0x10) {
if (_oneClick != 0) {
@@ -571,8 +571,8 @@
if (_leftClick == true) {
_leftClick = false;
- if (_dragMode != 0) {
- _dragEnd = 1;
+ if (_dragMode) {
+ _dragEnd = true;
} else {
_oneClick = 1;
}
@@ -588,7 +588,7 @@
}
_leftButtonOld = _leftButton;
- if (_dragMode != 0 || _lastHitArea3 != 0) {
+ if (_dragMode || _lastHitArea3) {
x = 0;
if (_needHitAreaRecalc == 0)
goto get_out;
@@ -596,11 +596,11 @@
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 @@
}
}
- if (_dragFlag != 0)
+ if (_dragFlag)
src = _common_handInfo;
for (i = 0; i < 16; i++) {
Modified: scummvm/trunk/engines/agos/event.cpp
===================================================================
--- scummvm/trunk/engines/agos/event.cpp 2009-03-09 03:58:18 UTC (rev 39258)
+++ scummvm/trunk/engines/agos/event.cpp 2009-03-09 04:16:27 UTC (rev 39259)
@@ -129,7 +129,7 @@
next = cur->next;
delTimeEvent(cur);
}
- _clickOnly = 0;
+ _clickOnly = false;
}
bool AGOSEngine::kickoffTimeEvents() {
Modified: scummvm/trunk/engines/agos/input.cpp
===================================================================
--- scummvm/trunk/engines/agos/input.cpp 2009-03-09 03:58:18 UTC (rev 39258)
+++ scummvm/trunk/engines/agos/input.cpp 2009-03-09 04:16:27 UTC (rev 39259)
@@ -117,7 +117,7 @@
_lastHitArea = 0;
_hitAreaObjectItem = NULL;
- _nameLocked = 0;
+ _nameLocked = false;
last = _lastNameOn;
clearName();
@@ -178,8 +178,8 @@
_verbHitArea = 0;
_hitAreaSubjectItem = NULL;
_hitAreaObjectItem = NULL;
- _clickOnly = 0;
- _nameLocked = 0;
+ _clickOnly = false;
+ _nameLocked = false;
if (getGameType() == GType_WW) {
_mouseCursor = 0;
@@ -192,7 +192,7 @@
while (!shouldQuit()) {
_lastHitArea = NULL;
_lastHitArea3 = NULL;
- _dragAccept = 1;
+ _dragAccept = true;
while (!shouldQuit()) {
if ((getGameType() == GType_SIMON1 || getGameType() == GType_SIMON2) &&
@@ -206,7 +206,7 @@
if (_lastHitArea3 == (HitArea *) -1) {
_lastHitArea = NULL;
_lastHitArea3 = NULL;
- _dragAccept = 1;
+ _dragAccept = true;
} else {
if (_lastHitArea3 || _dragMode)
break;
@@ -219,10 +219,10 @@
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 @@
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 @@
) {
_hitAreaSubjectItem = ha->itemPtr;
id = setVerbText(ha);
- _nameLocked = 0;
+ _nameLocked = false;
displayName(ha);
- _nameLocked = 1;
+ _nameLocked = true;
if (_verbHitArea) {
break;
@@ -353,9 +353,9 @@
else if (getGameType() == GType_ELVIRA1)
unlightMenuStrip();
- _nameLocked = 0;
+ _nameLocked = false;
_needHitAreaRecalc++;
- _dragAccept = 0;
+ _dragAccept = false;
if (getGameType() == GType_WW && _mouseCursor < 3)
_mouseCursor = 0;
Modified: scummvm/trunk/engines/agos/script_e1.cpp
===================================================================
--- scummvm/trunk/engines/agos/script_e1.cpp 2009-03-09 03:58:18 UTC (rev 39258)
+++ scummvm/trunk/engines/agos/script_e1.cpp 2009-03-09 04:16:27 UTC (rev 39259)
@@ -824,15 +824,15 @@
_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() {
Modified: scummvm/trunk/engines/agos/verb.cpp
===================================================================
--- scummvm/trunk/engines/agos/verb.cpp 2009-03-09 03:58:18 UTC (rev 39258)
+++ scummvm/trunk/engines/agos/verb.cpp 2009-03-09 04:16:27 UTC (rev 39259)
@@ -238,7 +238,7 @@
if (getGameType() == GType_ELVIRA1 || getGameType() == GType_ELVIRA2)
return;
- if (_nameLocked == 1 || _lastNameOn == 0)
+ if (_nameLocked || !_lastNameOn)
return;
resetNameWindow();
@@ -734,13 +734,13 @@
_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 @@
}
}
- if (_clickOnly != 0)
+ if (_clickOnly)
return;
if (best_ha->flags & kBFInvertTouch) {
@@ -858,7 +858,7 @@
}
}
- 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 @@
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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list