diff options
| -rw-r--r-- | engines/lab/image.h | 2 | ||||
| -rw-r--r-- | engines/lab/interface.h | 6 | ||||
| -rw-r--r-- | engines/lab/lab.h | 8 | ||||
| -rw-r--r-- | engines/lab/music.h | 2 | ||||
| -rw-r--r-- | engines/lab/special.cpp | 16 |
5 files changed, 17 insertions, 17 deletions
diff --git a/engines/lab/image.h b/engines/lab/image.h index 0e2f831705..34e3d36658 100644 --- a/engines/lab/image.h +++ b/engines/lab/image.h @@ -55,4 +55,4 @@ public: } // End of namespace Lab -#endif // LAB_H +#endif // LAB_IMAGE_H diff --git a/engines/lab/interface.h b/engines/lab/interface.h index c4b2341871..10e081532b 100644 --- a/engines/lab/interface.h +++ b/engines/lab/interface.h @@ -28,8 +28,8 @@ * */ -#ifndef LAB_INTEFACE_H -#define LAB_INTEFACE_H +#ifndef LAB_INTEFARCE_H +#define LAB_INTEFARCE_H namespace Lab { @@ -112,4 +112,4 @@ IntuiMessage *getMsg(); } // End of namespace Lab -#endif // LAB_INTEFACE_H +#endif // LAB_INTEFARCE_H diff --git a/engines/lab/lab.h b/engines/lab/lab.h index 08f7fc6174..92ffa26591 100644 --- a/engines/lab/lab.h +++ b/engines/lab/lab.h @@ -28,8 +28,8 @@ * */ -#ifndef LAB_H -#define LAB_H +#ifndef LAB_LAB_H +#define LAB_LAB_H #include "common/system.h" #include "common/random.h" @@ -242,7 +242,7 @@ private: uint16 processArrow(uint16 curDirection, uint16 arrow); void processJournal(); void processMap(uint16 curRoom); - void processMonitor(char *ntext, TextFont *monitorFont, bool isinteractive, uint16 x1, uint16 y1, uint16 x2, uint16 y2); + void processMonitor(char *ntext, TextFont *monitorFont, bool isInteractive, uint16 x1, uint16 y1, uint16 x2, uint16 y2); Common::Rect roomCoords(uint16 curRoom); bool saveRestoreGame(); void setCurrentClose(Common::Point pos, CloseDataPtr *closePtrList, bool useAbsoluteCoords); @@ -254,4 +254,4 @@ extern LabEngine *g_lab; } // End of namespace Lab -#endif // LAB_H +#endif // LAB_LAB_H diff --git a/engines/lab/music.h b/engines/lab/music.h index 57524ba953..02c68209eb 100644 --- a/engines/lab/music.h +++ b/engines/lab/music.h @@ -43,7 +43,7 @@ class LabEngine; //----- From LabMusic.c ----- //--------------------------- -#define MAXBUFFERS 5L +#define MAXBUFFERS 5 class Music { private: diff --git a/engines/lab/special.cpp b/engines/lab/special.cpp index f043d0ae62..5b2da2a3be 100644 --- a/engines/lab/special.cpp +++ b/engines/lab/special.cpp @@ -394,7 +394,7 @@ void LabEngine::drawMonText(char *text, TextFont *monitorFont, uint16 x1, uint16 /** * Processes user input. */ -void LabEngine::processMonitor(char *ntext, TextFont *monitorFont, bool isinteractive, uint16 x1, uint16 y1, uint16 x2, uint16 y2) { +void LabEngine::processMonitor(char *ntext, TextFont *monitorFont, bool isInteractive, uint16 x1, uint16 y1, uint16 x2, uint16 y2) { const char *test = " ", *startFileName = _monitorTextFilename; CloseDataPtr startClosePtr = _closeDataPtr, lastClosePtr[10]; uint16 depth = 0; @@ -402,7 +402,7 @@ void LabEngine::processMonitor(char *ntext, TextFont *monitorFont, bool isintera lastClosePtr[0] = _closeDataPtr; while (1) { - if (isinteractive) { + if (isInteractive) { if (_closeDataPtr == NULL) _closeDataPtr = startClosePtr; @@ -417,7 +417,7 @@ void LabEngine::processMonitor(char *ntext, TextFont *monitorFont, bool isintera ntext = _resource->getText(_monitorTextFilename); _graphics->fade(false, 0); - drawMonText(ntext, monitorFont, x1, y1, x2, y2, isinteractive); + drawMonText(ntext, monitorFont, x1, y1, x2, y2, isInteractive); _graphics->fade(true, 0); delete[] ntext; } @@ -445,17 +445,17 @@ void LabEngine::processMonitor(char *ntext, TextFont *monitorFont, bool isintera if ((mouseX >= _utils->vgaScaleX(259)) && (mouseX <= _utils->vgaScaleX(289))) { if (!_lastPage) { _monitorPage += 1; - drawMonText(ntext, monitorFont, x1, y1, x2, y2, isinteractive); + drawMonText(ntext, monitorFont, x1, y1, x2, y2, isInteractive); } } else if ((mouseX >= _utils->vgaScaleX(0)) && (mouseX <= _utils->vgaScaleX(31))) { return; } else if ((mouseX >= _utils->vgaScaleX(290)) && (mouseX <= _utils->vgaScaleX(320))) { if (_monitorPage >= 1) { _monitorPage -= 1; - drawMonText(ntext, monitorFont, x1, y1, x2, y2, isinteractive); + drawMonText(ntext, monitorFont, x1, y1, x2, y2, isInteractive); } } else if ((mouseX >= _utils->vgaScaleX(31)) && (mouseX <= _utils->vgaScaleX(59))) { - if (isinteractive) { + if (isInteractive) { _monitorPage = 0; if (depth) { @@ -464,10 +464,10 @@ void LabEngine::processMonitor(char *ntext, TextFont *monitorFont, bool isintera } } else if (_monitorPage > 0) { _monitorPage = 0; - drawMonText(ntext, monitorFont, x1, y1, x2, y2, isinteractive); + drawMonText(ntext, monitorFont, x1, y1, x2, y2, isInteractive); } } - } else if (isinteractive) { + } else if (isInteractive) { CloseDataPtr tmpClosePtr = _closeDataPtr; mouseY = 64 + (mouseY / _monitorGadgetHeight) * 42; mouseX = 101; |