diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/lab/engine.cpp | 48 | ||||
| -rw-r--r-- | engines/lab/labfun.h | 2 | ||||
| -rw-r--r-- | engines/lab/special.cpp | 16 |
3 files changed, 33 insertions, 33 deletions
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp index 33a642247d..de9b567a1a 100644 --- a/engines/lab/engine.cpp +++ b/engines/lab/engine.cpp @@ -746,7 +746,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm uint16 OldRoomNum, OldDirection = 0; uint16 LastInv = MAPNUM, Old; - CloseDataPtr OldCPtr, TempCPtr, HCPtr = NULL; + CloseDataPtr oldcptr, tempcptr, hcptr = NULL; ViewData *VPtr; bool doit; uint16 NewDir; @@ -859,7 +859,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm doMainView(&CPtr); _anim->_doBlack = true; - HCPtr = NULL; + hcptr = NULL; CPtr = NULL; mayShowCrumbIndicator(); screenUpdate(); @@ -913,7 +913,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm screenUpdate(); } else if (gadgetId >= 6) { /* Arrow Gadgets */ CPtr = NULL; - HCPtr = NULL; + hcptr = NULL; if ((gadgetId == 6) || (gadgetId == 8)) { if (gadgetId == 6) @@ -1141,7 +1141,7 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm if (doit) { - HCPtr = NULL; + hcptr = NULL; eatMessages(); if (actionMode == 0) { /* Take something. */ @@ -1165,16 +1165,16 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm drawStaticMessage(kTextNothing); } } else if (actionMode == 4) { /* Look at closeups */ - TempCPtr = CPtr; - setCurClose(curPos, &TempCPtr); + tempcptr = CPtr; + setCurClose(curPos, &tempcptr); - if (CPtr == TempCPtr) { + if (CPtr == tempcptr) { if (curPos.y < (VGAScaleY(149) + SVGACord(2))) drawStaticMessage(kTextNothing); - } else if (TempCPtr->GraphicName) { - if (*(TempCPtr->GraphicName)) { + } else if (tempcptr->GraphicName) { + if (*(tempcptr->GraphicName)) { _anim->_doBlack = true; - CPtr = TempCPtr; + CPtr = tempcptr; } else if (curPos.y < (VGAScaleY(149) + SVGACord(2))) drawStaticMessage(kTextNothing); } else if (curPos.y < (VGAScaleY(149) + SVGACord(2))) @@ -1195,32 +1195,32 @@ bool LabEngine::from_crumbs(uint32 tmpClass, uint16 code, uint16 Qualifier, Comm screenUpdate(); } else if (msgClass == DELTAMOVE) { VPtr = getViewData(_roomNum, Direction); - OldCPtr = VPtr->closeUps; + oldcptr = VPtr->closeUps; - if (HCPtr == NULL) { - TempCPtr = CPtr; - setCurClose(curPos, &TempCPtr); + if (hcptr == NULL) { + tempcptr = CPtr; + setCurClose(curPos, &tempcptr); - if ((TempCPtr == NULL) || (TempCPtr == CPtr)) { + if ((tempcptr == NULL) || (tempcptr == CPtr)) { if (CPtr == NULL) - HCPtr = OldCPtr; + hcptr = oldcptr; else - HCPtr = CPtr->SubCloseUps; + hcptr = CPtr->SubCloseUps; } else - HCPtr = TempCPtr->NextCloseUp; + hcptr = tempcptr->NextCloseUp; } else - HCPtr = HCPtr->NextCloseUp; + hcptr = hcptr->NextCloseUp; - if (HCPtr == NULL) { + if (hcptr == NULL) { if (CPtr == NULL) - HCPtr = OldCPtr; + hcptr = oldcptr; else - HCPtr = CPtr->SubCloseUps; + hcptr = CPtr->SubCloseUps; } - if (HCPtr) - _event->setMousePos(Common::Point(scaleX((HCPtr->x1 + HCPtr->x2) / 2), scaleY((HCPtr->y1 + HCPtr->y2) / 2))); + if (hcptr) + _event->setMousePos(Common::Point(scaleX((hcptr->x1 + hcptr->x2) / 2), scaleY((hcptr->y1 + hcptr->y2) / 2))); } else if ((msgClass == MOUSEBUTTONS) && (IEQUALIFIER_RBUTTON & Qualifier)) { eatMessages(); _alternate = !_alternate; diff --git a/engines/lab/labfun.h b/engines/lab/labfun.h index b20667bc2a..ad84402933 100644 --- a/engines/lab/labfun.h +++ b/engines/lab/labfun.h @@ -105,7 +105,7 @@ int32 longDrawMessage(const char *text); /* The Wipes */ -void doWipe(uint16 WipeType, CloseDataPtr *CPtr, char *filename); +void doWipe(uint16 WipeType, CloseDataPtr *cptr, char *filename); /* Double Buffer stuff */ diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp index 8e63d36ee5..946c8af9a8 100644 --- a/engines/lab/special.cpp +++ b/engines/lab/special.cpp @@ -892,17 +892,17 @@ void LabEngine::processMonitor(char *ntext, TextFont *monitorFont, bool isintera uint32 Class; uint16 Qualifier, Code, MouseX, MouseY; const char *Test = " ", *StartFileName = TextFileName; - CloseDataPtr StartCPtr = CPtr, TestCPtr, LastCPtr[10]; + CloseDataPtr startcptr = CPtr, testcptr, lastcptr[10]; uint16 depth = 0; - LastCPtr[0] = CPtr; + lastcptr[0] = CPtr; while (1) { if (isinteractive) { if (CPtr == NULL) - CPtr = StartCPtr; + CPtr = startcptr; - if (CPtr == StartCPtr) + if (CPtr == startcptr) Test = StartFileName; else Test = CPtr->GraphicName; @@ -955,7 +955,7 @@ void LabEngine::processMonitor(char *ntext, TextFont *monitorFont, bool isintera if (depth) { depth--; - CPtr = LastCPtr[depth]; + CPtr = lastcptr[depth]; } } else if (monitorPage > 0) { monitorPage = 0; @@ -963,13 +963,13 @@ void LabEngine::processMonitor(char *ntext, TextFont *monitorFont, bool isintera } } } else if (isinteractive) { - TestCPtr = CPtr; + testcptr = CPtr; MouseY = 64 + (MouseY / MonGadHeight) * 42; MouseX = 101; setCurClose(Common::Point(MouseX, MouseY), &CPtr, true); - if (TestCPtr != CPtr) { - LastCPtr[depth] = TestCPtr; + if (testcptr != CPtr) { + lastcptr[depth] = testcptr; depth++; } } |