TONY: Removed deprecated MPAL stubs file

13 files changed, 17 insertions, 129 deletions

diff --git a/engines/tony/font.cpp b/engines/tony/font.cpp
index 5396b73796..8fc011bb35 100644
--- a/engines/tony/font.cpp
+++ b/engines/tony/font.cpp
@@ -28,7 +28,6 @@
 
 #include "common/textconsole.h"
 #include "tony/mpal/mpalutils.h"
-#include "tony/mpal/stubs.h"
 #include "tony/font.h"
 #include "tony/input.h"
 #include "tony/inventory.h"
diff --git a/engines/tony/game.cpp b/engines/tony/game.cpp
index 64c91008a5..3551f55c83 100644
--- a/engines/tony/game.cpp
+++ b/engines/tony/game.cpp
@@ -33,7 +33,6 @@
 #include "tony/mpal/memory.h"
 #include "tony/mpal/mpal.h"
 #include "tony/mpal/mpalutils.h"
-#include "tony/mpal/stubs.h"
 #include "tony/custom.h"
 #include "tony/game.h"
 #include "tony/gfxengine.h"
diff --git a/engines/tony/loc.h b/engines/tony/loc.h
index aee4936490..e25bdb500c 100644
--- a/engines/tony/loc.h
+++ b/engines/tony/loc.h
@@ -32,7 +32,6 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "common/file.h"
-#include "tony/mpal/stubs.h"
 #include "tony/sound.h"
 #include "tony/utils.h"
 
diff --git a/engines/tony/module.mk b/engines/tony/module.mk
index 6512391d04..719a598ee4 100644
--- a/engines/tony/module.mk
+++ b/engines/tony/module.mk
@@ -21,8 +21,7 @@ MODULE_OBJS := \
 	mpal/memory.o \
 	mpal/mpal.o \
 	mpal/mpalutils.o \
-	mpal/lzo.o \
-	mpal/stubs.o
+	mpal/lzo.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_TONY), DYNAMIC_PLUGIN)
diff --git a/engines/tony/mpal/expr.cpp b/engines/tony/mpal/expr.cpp
index 7643c8bde3..cf688341be 100644
--- a/engines/tony/mpal/expr.cpp
+++ b/engines/tony/mpal/expr.cpp
@@ -47,10 +47,9 @@
  *                                                                        *
  **************************************************************************/
 
-#include "mpal.h"
-#include "memory.h"
-#include "mpaldll.h"
-#include "stubs.h"
+#include "tony/mpal/mpal.h"
+#include "tony/mpal/memory.h"
+#include "tony/mpal/mpaldll.h"
 #include "tony/tony.h"
 
 /*
diff --git a/engines/tony/mpal/memory.cpp b/engines/tony/mpal/memory.cpp
index 166e3598f8..4410e8016c 100644
--- a/engines/tony/mpal/memory.cpp
+++ b/engines/tony/mpal/memory.cpp
@@ -146,6 +146,15 @@ void MemoryManager::erase(HGLOBAL handle) {
 	erase(&item);
 }
 
+/****************************************************************************\
+*       Stand-alone methods
+\****************************************************************************/
+
+void CopyMemory(void *dst, const void *first, int size) {
+	Common::copy((const byte *)first, (const byte *)first + size, (byte *)dst);
+}
+
+
 } // end of namespace MPAL
 
 } // end of namespace Tony
diff --git a/engines/tony/mpal/memory.h b/engines/tony/mpal/memory.h
index 6fd55e7ce5..8d8411c6a1 100644
--- a/engines/tony/mpal/memory.h
+++ b/engines/tony/mpal/memory.h
@@ -79,6 +79,9 @@ public:
 #define GMEM_MOVEABLE 2
 #define GMEM_ZEROINIT 4
 
+// Stand-alone methods
+extern void CopyMemory(void *dst, const void *first, int size);
+
 } // end of namespace MPAL
 
 } // end of namespace Tony
diff --git a/engines/tony/mpal/mpal.cpp b/engines/tony/mpal/mpal.cpp
index 854372cdda..6ec92e74c1 100644
--- a/engines/tony/mpal/mpal.cpp
+++ b/engines/tony/mpal/mpal.cpp
@@ -55,7 +55,6 @@
 #include "tony/mpal/lzo.h"	
 #include "tony/mpal/mpal.h"
 #include "tony/mpal/mpaldll.h"
-#include "tony/mpal/stubs.h"
 
 namespace Tony {
 
diff --git a/engines/tony/mpal/mpaldll.h b/engines/tony/mpal/mpaldll.h
index a7b6dfc5aa..69e58720a4 100644
--- a/engines/tony/mpal/mpaldll.h
+++ b/engines/tony/mpal/mpaldll.h
@@ -52,7 +52,6 @@
 
 #include "common/file.h"
 #include "tony/mpal/memory.h"
-#include "tony/mpal/stubs.h"
 #include "tony/mpal/loadmpc.h"
 #include "tony/mpal/expr.h"
 
diff --git a/engines/tony/mpal/mpalutils.h b/engines/tony/mpal/mpalutils.h
index cb8d4ec97d..a9f8403fcd 100644
--- a/engines/tony/mpal/mpalutils.h
+++ b/engines/tony/mpal/mpalutils.h
@@ -25,8 +25,7 @@
 #define TONY_MPAL_MPALUTILS
 
 #include "common/scummsys.h"
-#include "memory.h"
-#include "stubs.h"
+#include "tony/mpal/memory.h"
 
 namespace Tony {
 
diff --git a/engines/tony/mpal/stubs.cpp b/engines/tony/mpal/stubs.cpp
deleted file mode 100644
index 89740fdd52..0000000000
--- a/engines/tony/mpal/stubs.cpp
+++ /dev/null
@@ -1,49 +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 file contains stubs and mappings for things used by the MPAL
-*		library that are handled differently under ScummVM
-\****************************************************************************/
-
-#include "common/algorithm.h"
-#include "common/system.h"
-#include "engines/engine.h"
-#include "tony/tony.h"
-#include "stubs.h"
-
-namespace Tony {
-
-namespace MPAL {
-
-uint16 GetAsyncKeyState(Common::KeyCode kc) {
-	return 0;
-}
-
-void CopyMemory(void *dst, const void *first, int size) {
-	Common::copy((const byte *)first, (const byte *)first + size, (byte *)dst);
-}
-
-} // end of namespace MPAL
-
-} // end of namespace Tony
diff --git a/engines/tony/mpal/stubs.h b/engines/tony/mpal/stubs.h
deleted file mode 100644
index 66f83997ae..0000000000
--- a/engines/tony/mpal/stubs.h
+++ /dev/null
@@ -1,66 +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 file contains stubs and mappings for things used by the MPAL
-*		library that are handled differently under ScummVM
-\****************************************************************************/
-
-#ifndef MPAL_STUBS
-#define MPAL_STUBS
-
-#include "common/scummsys.h"
-#include "common/algorithm.h"
-#include "common/keyboard.h"
-#include "tony/mpal/memory.h"
-
-namespace Tony {
-
-namespace MPAL {
-
-/****************************************************************************\
-*       Types
-\****************************************************************************/
-
-typedef uint32 (*LPTHREAD_START_ROUTINE)(void *lpThreadParameter);
-typedef void (*LPTHREAD_ROUTINE)(void *lpThreadParameter);
-
-/****************************************************************************\
-*       Defines
-\****************************************************************************/
-
-#define MB_OK 1
-
-/****************************************************************************\
-*       Methods
-\****************************************************************************/
-
-extern void CopyMemory(void *dst, const void *first, int size);
-
-extern uint16 GetAsyncKeyState(Common::KeyCode kc);
-
-} // end of namespace MPAL
-
-} // end of namespace Tony
-
-#endif
diff --git a/engines/tony/tonychar.h b/engines/tony/tonychar.h
index 9cea3a4b2d..201803dc5f 100644
--- a/engines/tony/tonychar.h
+++ b/engines/tony/tonychar.h
@@ -30,7 +30,6 @@
 #define TONY_TONYCHAR_H
 
 #include "common/coroutines.h"
-#include "tony/mpal/stubs.h"
 #include "tony/loc.h"
 
 namespace Tony {