From a8b6003751087e922f11b6c750ddbf45b305a119 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Wed, 2 Dec 2015 20:50:12 +0100
Subject: LAB: Merged in allocroom.cpp

---
 engines/lab/allocroom.cpp | 69 -----------------------------------------------
 engines/lab/engine.cpp    | 32 ++++++++++++++++++++++
 engines/lab/module.mk     |  1 -
 3 files changed, 32 insertions(+), 70 deletions(-)
 delete mode 100644 engines/lab/allocroom.cpp

(limited to 'engines/lab')

diff --git a/engines/lab/allocroom.cpp b/engines/lab/allocroom.cpp
deleted file mode 100644
index 22617cb774..0000000000
--- a/engines/lab/allocroom.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-/*
- * This code is based on Labyrinth of Time code with assistance of
- *
- * Copyright (c) 1993 Terra Nova Development
- * Copyright (c) 2004 The Wyrmkeep Entertainment Co.
- *
- */
-
-#include "lab/parsetypes.h"
-
-namespace Lab {
-
-/* Have to make sure that ROOMBUFFERSIZE is bigger than the biggest piece of memory
-   that we need */
-#define ROOMBUFFERSIZE (2 * 20480L)
-
-extern RoomData *_rooms;
-
-static void *_roomBuffer = nullptr;
-static uint16 _curMarker  = 0;
-static void *_memPlace = nullptr;
-
-/*****************************************************************************/
-/* Allocates the memory for the room buffers.                                */
-/*****************************************************************************/
-bool initRoomBuffer() {
-	_curMarker = 0;
-
-	if ((_roomBuffer = calloc(ROOMBUFFERSIZE, 1))) {
-		_memPlace = _roomBuffer;
-
-		return true;
-	} else
-		return false;
-}
-
-/*****************************************************************************/
-/* Frees the memory for the room buffers.                                    */
-/*****************************************************************************/
-void freeRoomBuffer() {
-	if (_roomBuffer) {
-		free(_roomBuffer);
-		_roomBuffer = nullptr;
-	}
-}
-
-} // End of namespace Lab
diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index da8197ec2f..1b9a45b0f7 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -1416,4 +1416,36 @@ void LabEngine::mayShowCrumbIndicatorOff() {
 	}
 }
 
+/* Have to make sure that ROOMBUFFERSIZE is bigger than the biggest piece of memory
+   that we need */
+#define ROOMBUFFERSIZE (2 * 20480L)
+
+static void *_roomBuffer = nullptr;
+static uint16 _curMarker  = 0;
+static void *_memPlace = nullptr;
+
+/*****************************************************************************/
+/* Allocates the memory for the room buffers.                                */
+/*****************************************************************************/
+bool initRoomBuffer() {
+	_curMarker = 0;
+
+	if ((_roomBuffer = calloc(ROOMBUFFERSIZE, 1))) {
+		_memPlace = _roomBuffer;
+
+		return true;
+	} else
+		return false;
+}
+
+/*****************************************************************************/
+/* Frees the memory for the room buffers.                                    */
+/*****************************************************************************/
+void freeRoomBuffer() {
+	if (_roomBuffer) {
+		free(_roomBuffer);
+		_roomBuffer = nullptr;
+	}
+}
+
 } // End of namespace Lab
diff --git a/engines/lab/module.mk b/engines/lab/module.mk
index 67d6b286d5..18bb7e6916 100644
--- a/engines/lab/module.mk
+++ b/engines/lab/module.mk
@@ -1,7 +1,6 @@
 MODULE := engines/lab
 
 MODULE_OBJS := \
-	allocroom.o \
 	anim.o \
 	detection.o \
 	engine.o \
-- 
cgit v1.2.3