From dcefb696eddb21120648ea5f8f9514ca368f958d Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Mon, 7 Dec 2015 23:58:18 +0100
Subject: LAB: Remove more extern variables

---
 engines/lab/anim.cpp        | 2 --
 engines/lab/interface.cpp   | 2 --
 engines/lab/interface.h     | 3 ---
 engines/lab/lab.h           | 8 ++++++++
 engines/lab/parsefun.h      | 1 -
 engines/lab/parsetypes.h    | 7 -------
 engines/lab/processroom.cpp | 2 +-
 engines/lab/savegame.cpp    | 4 +---
 engines/lab/transitions.cpp | 4 ++--
 9 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/engines/lab/anim.cpp b/engines/lab/anim.cpp
index 777a09ef3f..a9e7860e55 100644
--- a/engines/lab/anim.cpp
+++ b/engines/lab/anim.cpp
@@ -33,8 +33,6 @@
 
 namespace Lab {
 
-extern byte **startoffile;
-
 Anim::Anim(LabEngine *vm) : _vm(vm) {
 	_header = 0;
 	_curBit = 0;
diff --git a/engines/lab/interface.cpp b/engines/lab/interface.cpp
index 6aba1510f7..09c3fc80f8 100644
--- a/engines/lab/interface.cpp
+++ b/engines/lab/interface.cpp
@@ -36,8 +36,6 @@
 
 namespace Lab {
 
-extern bool IsHiRes;
-
 Common::KeyState _keyPressed;
 
 Gadget *createButton(uint16 x, uint16 y, uint16 id, uint16 key, Image *im, Image *imalt) {
diff --git a/engines/lab/interface.h b/engines/lab/interface.h
index a8d1140959..3e0460be1c 100644
--- a/engines/lab/interface.h
+++ b/engines/lab/interface.h
@@ -50,10 +50,7 @@ struct Gadget {
 	Image *_image, *_altImage;
 };
 
-extern Common::KeyState _keyPressed;
-
 /* Defines for the GadgetFlags portion */
-
 #define GADGETOFF 0x01
 
 typedef Common::List<Gadget *> GadgetList;
diff --git a/engines/lab/lab.h b/engines/lab/lab.h
index 44104fc1e6..af93367295 100644
--- a/engines/lab/lab.h
+++ b/engines/lab/lab.h
@@ -64,6 +64,13 @@ enum GameFeatures {
 
 typedef Common::List<Gadget *> GadgetList;
 
+struct CrumbData {
+	uint16 _roomNum;
+	uint16 _direction;
+};
+
+#define MAX_CRUMBS          128
+
 class LabEngine : public Engine {
 public:
 	LabEngine(OSystem *syst, const ADGameDescription *gameDesc);
@@ -170,6 +177,7 @@ public:
 	int followCrumbs();
 
 	void changeVolume(int delta);
+	char *getPictName(CloseDataPtr *lcptr);
 
 private:
 	// engine.cpp
diff --git a/engines/lab/parsefun.h b/engines/lab/parsefun.h
index c45727d907..78f7904e0b 100644
--- a/engines/lab/parsefun.h
+++ b/engines/lab/parsefun.h
@@ -43,7 +43,6 @@ bool parse(const char *inputFile);
 /* From ProcessRoom.c */
 
 ViewData *getViewData(uint16 roomNum, uint16 direction);
-char *getPictName(CloseDataPtr *lcptr);
 void drawDirection(CloseDataPtr lcptr);
 uint16 processArrow(uint16 curDirection, uint16 arrow);
 void setCurClose(Common::Point pos, CloseDataPtr *cptr, bool useAbsoluteCoords = false);
diff --git a/engines/lab/parsetypes.h b/engines/lab/parsetypes.h
index c7780ae09a..1f03bc3564 100644
--- a/engines/lab/parsetypes.h
+++ b/engines/lab/parsetypes.h
@@ -191,13 +191,6 @@ struct MapData {
 #pragma pack(pop)
 #endif
 
-struct CrumbData {
-	uint16 _roomNum;
-	uint16 _direction;
-};
-
-#define MAX_CRUMBS          128
-
 } // End of namespace Lab
 
 #endif /* LAB_PARSETYPES_H */
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index 7acf683247..8afa543cfe 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -143,7 +143,7 @@ static CloseDataPtr findCPtrMatch(CloseDataPtr cpmain, CloseDataPtr list) {
 /*****************************************************************************/
 /* Returns the current picture name.                                         */
 /*****************************************************************************/
-char *getPictName(CloseDataPtr *lcptr) {
+char *LabEngine::getPictName(CloseDataPtr *lcptr) {
 	ViewData *viewPtr = getViewData(g_lab->_roomNum, g_lab->_direction);
 
 	if (*lcptr != NULL) {
diff --git a/engines/lab/savegame.cpp b/engines/lab/savegame.cpp
index b28d1a2652..23e73c5bfb 100644
--- a/engines/lab/savegame.cpp
+++ b/engines/lab/savegame.cpp
@@ -43,8 +43,6 @@ namespace Lab {
 #define SAVEGAME_VERSION  1
 
 /*----- The machine independent section of saveGame.c -----*/
-/* Lab: Labyrinth specific */
-extern char *getPictName(CloseDataPtr *lcptr);
 
 void writeSaveGameHeader(Common::OutSaveFile *out, const Common::String &saveName) {
 	out->writeUint32BE(SAVEGAME_ID);
@@ -129,7 +127,7 @@ bool saveGame(uint16 Direction, uint16 Quarters, int slot, Common::String desc)
 
 	// Load scene pic
 	CloseDataPtr cPtr = nullptr;
-	g_lab->_graphics->readPict(getPictName(&cPtr), true);
+	g_lab->_graphics->readPict(g_lab->getPictName(&cPtr), true);
 
 	writeSaveGameHeader(file, desc);
 	file->writeUint16LE(g_lab->_roomNum);
diff --git a/engines/lab/transitions.cpp b/engines/lab/transitions.cpp
index caf52dc287..11064c14ed 100644
--- a/engines/lab/transitions.cpp
+++ b/engines/lab/transitions.cpp
@@ -285,11 +285,11 @@ void DisplayMan::doTransWipe(CloseDataPtr *cPtr, char *filename) {
 	}
 
 	if (filename == NULL)
-		_vm->_curFileName = getPictName(cPtr);
+		_vm->_curFileName = _vm->getPictName(cPtr);
 	else if (filename[0] > ' ')
 		_vm->_curFileName = filename;
 	else
-		_vm->_curFileName = getPictName(cPtr);
+		_vm->_curFileName = _vm->getPictName(cPtr);
 
 	byte *BitMapMem = readPictToMem(_vm->_curFileName, _screenWidth, lastY + 5);
 	setPalette(_vm->_anim->_diffPalette, 256);
-- 
cgit v1.2.3