TONY: Remove adv.h

scummvm · Sep 1, 2012 · 1f41e55 · 1f41e55
1 parent 3ab8ebc
commit 1f41e55
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 77 deletions.
diff --git a/engines/tony/adv.h b/engines/tony/adv.h
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -31,7 +31,7 @@
 
 #include "common/scummsys.h"
 #include "common/rect.h"
-#include "tony/adv.h"
+#include "tony/game.h"
 
 namespace Tony {