aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorEugene Sandulenko2015-12-08 21:53:42 +0100
committerWillem Jan Palenstijn2015-12-23 21:33:58 +0100
commitc1fc1687fc4fb271871a9c02c4cb3ffe2c00d158 (patch)
treeabfbb38df9e9e457b97a88a5e5bb23cd9dd18686 /engines
parente5f753749fc55beb0d48180d1d649fc81412182c (diff)
downloadscummvm-rg350-c1fc1687fc4fb271871a9c02c4cb3ffe2c00d158.tar.gz
scummvm-rg350-c1fc1687fc4fb271871a9c02c4cb3ffe2c00d158.tar.bz2
scummvm-rg350-c1fc1687fc4fb271871a9c02c4cb3ffe2c00d158.zip
LAB: Code naming standards
Diffstat (limited to 'engines')
-rw-r--r--engines/lab/engine.cpp27
-rw-r--r--engines/lab/lab.h3
2 files changed, 16 insertions, 14 deletions
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 46e60dc4e5..57383ec6dd 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -560,16 +560,17 @@ void LabEngine::mainGameLoop() {
}
}
-bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Common::Point tmpPos, uint16 &curInv, IntuiMessage *curMsg, bool &forceDraw, uint16 gadgetId, uint16 &actionMode) {
+bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 qualifier, Common::Point tmpPos,
+ uint16 &curInv, IntuiMessage *curMsg, bool &forceDraw, uint16 gadgetId, uint16 &actionMode) {
uint32 msgClass = tmpClass;
Common::Point curPos = tmpPos;
uint16 oldDirection = 0;
uint16 lastInv = MAPNUM;
CloseDataPtr oldcptr, tempcptr, hcptr = nullptr;
- ViewData *VPtr;
+ ViewData *vptr;
bool doit;
- uint16 NewDir;
+ uint16 newDir;
_anim->_doBlack = false;
@@ -577,7 +578,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
if (code == 13) {
// The return key
msgClass = MOUSEBUTTONS;
- Qualifier = IEQUALIFIER_LEFTBUTTON;
+ qualifier = IEQUALIFIER_LEFTBUTTON;
curPos = _event->getMousePos();
} else if (getPlatform() == Common::kPlatformWindows && (code == 'b' || code == 'B')) {
// Start bread crumbs
@@ -669,8 +670,8 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
if (_graphics->_longWinInFront) {
if ((msgClass == RAWKEY) || ((msgClass == MOUSEBUTTONS) &&
- ((IEQUALIFIER_LEFTBUTTON & Qualifier) ||
- (IEQUALIFIER_RBUTTON & Qualifier)))) {
+ ((IEQUALIFIER_LEFTBUTTON & qualifier) ||
+ (IEQUALIFIER_RBUTTON & qualifier)))) {
_graphics->_longWinInFront = false;
_graphics->_doNotDrawMessage = false;
_graphics->drawPanel();
@@ -741,10 +742,10 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
oldDirection = _direction;
- NewDir = processArrow(_direction, gadgetId - 6);
- doTurn(_direction, NewDir, &_cptr);
+ newDir = processArrow(_direction, gadgetId - 6);
+ doTurn(_direction, newDir, &_cptr);
_anim->_doBlack = true;
- _direction = NewDir;
+ _direction = newDir;
forceDraw = true;
mayShowCrumbIndicator();
@@ -941,7 +942,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
}
}
}
- } else if ((msgClass == MOUSEBUTTONS) && (IEQUALIFIER_LEFTBUTTON & Qualifier) && _mainDisplay) {
+ } else if ((msgClass == MOUSEBUTTONS) && (IEQUALIFIER_LEFTBUTTON & qualifier) && _mainDisplay) {
interfaceOff();
_mainDisplay = true;
@@ -1014,8 +1015,8 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
mayShowCrumbIndicator();
_graphics->screenUpdate();
} else if (msgClass == DELTAMOVE) {
- VPtr = getViewData(_roomNum, _direction);
- oldcptr = VPtr->_closeUps;
+ vptr = getViewData(_roomNum, _direction);
+ oldcptr = vptr->_closeUps;
if (hcptr == NULL) {
tempcptr = _cptr;
@@ -1041,7 +1042,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm
if (hcptr)
_event->setMousePos(Common::Point(_utils->scaleX((hcptr->x1 + hcptr->x2) / 2), _utils->scaleY((hcptr->y1 + hcptr->y2) / 2)));
- } else if ((msgClass == MOUSEBUTTONS) && (IEQUALIFIER_RBUTTON & Qualifier)) {
+ } else if ((msgClass == MOUSEBUTTONS) && (IEQUALIFIER_RBUTTON & qualifier)) {
eatMessages();
_alternate = !_alternate;
_anim->_doBlack = true;
diff --git a/engines/lab/lab.h b/engines/lab/lab.h
index 2cbea65269..a1a5bb0617 100644
--- a/engines/lab/lab.h
+++ b/engines/lab/lab.h
@@ -169,7 +169,8 @@ private:
GadgetList _mapGadgetList;
private:
- bool from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Common::Point tmpPos, uint16 &curInv, IntuiMessage * curMsg, bool &forceDraw, uint16 gadgetId, uint16 &actionMode);
+ bool from_crumbs(uint32 tmpClass, uint16 code, uint16 qualifier, Common::Point tmpPos,
+ uint16 &curInv, IntuiMessage *curMsg, bool &forceDraw, uint16 gadgetId, uint16 &actionMode);
public:
void waitTOF();