6 files changed, 34 insertions, 77 deletions
diff --git a/engines/tony/adv.h b/engines/tony/adv.h
deleted file mode 100644
index e3171aa3ee..0000000000
--- a/engines/tony/adv.h
+++ /dev/null
@@ -1,72 +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 original Tony Tough source code
- *
- * Copyright (c) 1997-2003 Nayma Software
- */
-
-#ifndef TONY_ADV_H
-#define TONY_ADV_H
-
-#include "common/coroutines.h"
-#include "tony/mpal/memory.h"
-#include "tony/gfxcore.h"
-
-
-namespace Tony {
-
-// X & Y dimensions of the adventure
-#define RM_SX       640
-#define RM_SY       480
-
-// X & Y dimensions of bigbuf
-#define RM_BBX      (RM_SX)
-#define RM_BBY      (RM_SY)
-
-// Skipping X & Y
-#define RM_SKIPY    ((RM_BBY - RM_SY) / 2)
-#define RM_SKIPX    0
-
-// Tony's actions
-enum RMTonyAction {
-	TA_GOTO = 0,
-	TA_TAKE,
-	TA_USE,
-	TA_EXAMINE,
-	TA_TALK,
-	TA_PERORATE,
-
-	TA_COMBINE = 10,
-	TA_RECEIVECOMBINE,
-	TA_COMBINEGIVE,
-	TA_RECEIVECOMBINEGIVE
-};
-
-// Global Functions
-void mainEnableGUI();
-void mainDisableGUI();
-
-} // End of namespace Tony
-
-#endif
diff --git a/engines/tony/custom.cpp b/engines/tony/custom.cpp
index 4171691e87..f0a9197c6d 100644
--- a/engines/tony/custom.cpp
+++ b/engines/tony/custom.cpp
@@ -31,7 +31,6 @@
 #include "common/savefile.h"
 #include "tony/mpal/mpal.h"
 #include "tony/mpal/memory.h"
-#include "tony/adv.h"
 #include "tony/custom.h"
 #include "tony/font.h"
 #include "tony/game.h"
diff --git a/engines/tony/game.h b/engines/tony/game.h
index bb6a356f0a..1c955176bf 100644
--- a/engines/tony/game.h
+++ b/engines/tony/game.h
@@ -29,7 +29,6 @@
 #ifndef TONY_GAME_H
 #define TONY_GAME_H
 
-#include "tony/adv.h"
 #include "tony/gfxcore.h"
 #include "tony/input.h"
 #include "tony/loc.h"
@@ -53,6 +52,38 @@ namespace Tony {
 	(buf8)->init(*raw, raw->width(), raw->height(), true); \
 	delete raw;
 
+// X & Y dimensions of the adventure
+#define RM_SX       640
+#define RM_SY       480
+
+// X & Y dimensions of bigbuf
+#define RM_BBX      (RM_SX)
+#define RM_BBY      (RM_SY)
+
+// Skipping X & Y
+#define RM_SKIPY    ((RM_BBY - RM_SY) / 2)
+#define RM_SKIPX    0
+
+// Tony's actions
+enum RMTonyAction {
+	TA_GOTO = 0,
+	TA_TAKE,
+	TA_USE,
+	TA_EXAMINE,
+	TA_TALK,
+	TA_PERORATE,
+
+	TA_COMBINE = 10,
+	TA_RECEIVECOMBINE,
+	TA_COMBINEGIVE,
+	TA_RECEIVECOMBINEGIVE
+};
+
+// Global Functions
+void mainEnableGUI();
+void mainDisableGUI();
+
+// Classes
 class RMPointer {
 public:
 	enum PointerType {
diff --git a/engines/tony/globals.h b/engines/tony/globals.h
index 75f7f8d1dd..d8d8d3eba5 100644
--- a/engines/tony/globals.h
+++ b/engines/tony/globals.h
@@ -24,7 +24,6 @@
 #define TONY_GLOBALS
 
 #include "common/savefile.h"
-#include "tony/adv.h"
 #include "tony/gfxengine.h"
 #include "tony/input.h"
 #include "tony/inventory.h"
diff --git a/engines/tony/loc.cpp b/engines/tony/loc.cpp
index a92282cc3f..7a151ac292 100644
--- a/engines/tony/loc.cpp
+++ b/engines/tony/loc.cpp
@@ -29,7 +29,7 @@
 #include "common/memstream.h"
 #include "common/scummsys.h"
 #include "tony/mpal/mpalutils.h"
-#include "tony/adv.h"
+#include "tony/game.h"
 #include "tony/loc.h"
 #include "tony/tony.h"
 
diff --git a/engines/tony/window.h b/engines/tony/window.h
index b2732a3f0c..2e8769707f 100644
--- a/engines/tony/window.h
+++ b/engines/tony/window.h
@@ -31,7 +31,7 @@
 
 #include "common/scummsys.h"
 #include "common/rect.h"
-#include "tony/adv.h"
+#include "tony/game.h"
 
 namespace Tony {