4 files changed, 5 insertions, 3 deletions
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 19948270fb..da8197ec2f 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -421,11 +421,11 @@ bool LabEngine::doCloseUp(CloseDataPtr closePtr) {
 /******************************************************************************/
 /* Gets the current inventory name.                                           */
 /******************************************************************************/
-static const char *getInvName(uint16 CurInv) {
+const char *LabEngine::getInvName(uint16 CurInv) {
 	if (MainDisplay)
 		return Inventory[CurInv].BInvName;
 
-	if ((CurInv == LAMPNUM) && g_lab->_conditions->in(LAMPON))
+	if ((CurInv == LAMPNUM) && _conditions->in(LAMPON))
 		return "P:Mines/120";
 
 	if ((CurInv == BELTNUM) && g_lab->_conditions->in(BELTGLOW))
diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp
index 6dc88004bd..f741476924 100644
--- a/engines/lab/lab.cpp
+++ b/engines/lab/lab.cpp
@@ -113,6 +113,7 @@ LabEngine::LabEngine(OSystem *syst, const ADGameDescription *gameDesc)
     _moveGadgetList = 0;
     _invGadgetList = 0;
 
+    _curFileName = " ";
 
 	//const Common::FSNode gameDataDir(ConfMan.get("path"));
 	//SearchMan.addSubDirectoryMatching(gameDataDir, "game");
diff --git a/engines/lab/lab.h b/engines/lab/lab.h
index d49481548e..faedce94ec 100644
--- a/engines/lab/lab.h
+++ b/engines/lab/lab.h
@@ -197,6 +197,7 @@ private:
 	bool doUse(uint16 curInv);
 	void mayShowCrumbIndicator();
 	void mayShowCrumbIndicatorOff();
+	const char *getInvName(uint16 curInv);
 };
 
 extern LabEngine *g_lab;
diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index 3eeb00da54..9f2948b265 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -322,7 +322,7 @@ bool takeItem(uint16 x, uint16 y, CloseDataPtr *cptr) {
 /*****************************************************************************/
 /* Processes the action list.                                                */
 /*****************************************************************************/
-static void doActions(Action * APtr, CloseDataPtr *LCPtr) {
+static void doActions(Action *APtr, CloseDataPtr *LCPtr) {
 	CloseDataPtr TLCPtr;
 	bool FirstLoaded = true;
 	char **str, *Test;