MORTEVIELLE: Remove var_mor

17 files changed, 14 insertions, 107 deletions

diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 48d73a20fd..2f39b61bad 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -32,7 +32,6 @@
 #include "mortevielle/mouse.h"
 #include "mortevielle/outtext.h"
 #include "mortevielle/speech.h"
-#include "mortevielle/var_mor.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp
index b53a9d5e80..1947705fe5 100644
--- a/engines/mortevielle/dialogs.cpp
+++ b/engines/mortevielle/dialogs.cpp
@@ -290,9 +290,9 @@ bool KnowledgeCheck::show() {
 	int rep;
 	int firstOption, lastOption;
 
-	Hotspot coor[kMaxRect+1];
+	Hotspot coor[kMaxHotspots+1];
 
-	for (int i = 0; i < kMaxRect; ++i) {
+	for (int i = 0; i <= kMaxHotspots; ++i) {
 		coor[i]._rect = Common::Rect();
 		coor[i]._enabled = false;
 	}
diff --git a/engines/mortevielle/dialogs.h b/engines/mortevielle/dialogs.h
index db13c09b54..1ed87456a9 100644
--- a/engines/mortevielle/dialogs.h
+++ b/engines/mortevielle/dialogs.h
@@ -28,12 +28,18 @@
 #ifndef MORTEVIELLE_ALERT_H
 #define MORTEVIELLE_ALERT_H
 
+#include "common/rect.h"
 #include "common/str.h"
 
 namespace Mortevielle {
 
 static const int NUM_LINES = 7;
-const int kMaxRect = 14;
+const int kMaxHotspots = 14;
+
+struct Hotspot {
+	Common::Rect _rect;
+	bool _enabled;
+};
 
 class Alert {
 private:
diff --git a/engines/mortevielle/graphics.cpp b/engines/mortevielle/graphics.cpp
index e290f60e69..a49bda7b73 100644
--- a/engines/mortevielle/graphics.cpp
+++ b/engines/mortevielle/graphics.cpp
@@ -26,7 +26,6 @@
 #include "mortevielle/graphics.h"
 #include "mortevielle/mortevielle.h"
 #include "mortevielle/mouse.h"
-#include "mortevielle/var_mor.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index a9fea17fcb..1cfafb8ff1 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -32,7 +32,6 @@
 #include "mortevielle/mortevielle.h"
 #include "mortevielle/mouse.h"
 #include "mortevielle/outtext.h"
-#include "mortevielle/var_mor.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/module.mk b/engines/mortevielle/module.mk
index 8cad2b8ad0..38e6e0508d 100644
--- a/engines/mortevielle/module.mk
+++ b/engines/mortevielle/module.mk
@@ -11,8 +11,7 @@ MODULE_OBJS := \
 	outtext.o \
 	saveload.o \
 	sound.o \
-	speech.o \
-	var_mor.o
+	speech.o
 
 # This module can be built as a plugin
 ifeq ($(ENABLE_MORTEVIELLE), DYNAMIC_PLUGIN)
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index ed9441c5ab..94821bf7cd 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -35,7 +35,6 @@
 #include "mortevielle/outtext.h"
 #include "mortevielle/saveload.h"
 #include "mortevielle/outtext.h"
-#include "mortevielle/var_mor.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/mouse.cpp b/engines/mortevielle/mouse.cpp
index 8516643835..b46b1d6598 100644
--- a/engines/mortevielle/mouse.cpp
+++ b/engines/mortevielle/mouse.cpp
@@ -29,7 +29,6 @@
 #include "common/rect.h"
 #include "mortevielle/mouse.h"
 #include "mortevielle/mortevielle.h"
-#include "mortevielle/var_mor.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/mouse.h b/engines/mortevielle/mouse.h
index b93ce6136d..0e235ad894 100644
--- a/engines/mortevielle/mouse.h
+++ b/engines/mortevielle/mouse.h
@@ -28,7 +28,7 @@
 #ifndef MORTEVIELLE_MOUSE_H
 #define MORTEVIELLE_MOUSE_H
 
-#include "mortevielle/var_mor.h"
+#include "common/rect.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp
index eb79963191..75d9bde9ff 100644
--- a/engines/mortevielle/outtext.cpp
+++ b/engines/mortevielle/outtext.cpp
@@ -31,7 +31,6 @@
 #include "mortevielle/outtext.h"
 #include "mortevielle/graphics.h"
 #include "mortevielle/mortevielle.h"
-#include "mortevielle/var_mor.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/outtext.h b/engines/mortevielle/outtext.h
index 3664fd6fa5..cc7bb1fb4a 100644
--- a/engines/mortevielle/outtext.h
+++ b/engines/mortevielle/outtext.h
@@ -29,7 +29,6 @@
 #define MORTEVIELLE_OUTTEXT_H
 
 #include "common/str.h"
-#include "mortevielle/var_mor.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/saveload.cpp b/engines/mortevielle/saveload.cpp
index 8ce97fbac0..af00de265e 100644
--- a/engines/mortevielle/saveload.cpp
+++ b/engines/mortevielle/saveload.cpp
@@ -31,7 +31,6 @@
 #include "mortevielle/mortevielle.h"
 #include "mortevielle/mouse.h"
 #include "mortevielle/saveload.h"
-#include "mortevielle/var_mor.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/sound.h b/engines/mortevielle/sound.h
index c469706305..9ad46e84d3 100644
--- a/engines/mortevielle/sound.h
+++ b/engines/mortevielle/sound.h
@@ -32,10 +32,11 @@
 #include "audio/mixer.h"
 #include "common/mutex.h"
 #include "common/queue.h"
-#include "mortevielle/var_mor.h"
 
 namespace Mortevielle {
 
+typedef int tablint[256];
+
 /**
  * Structure used to store pending notes to play
  */
diff --git a/engines/mortevielle/speech.cpp b/engines/mortevielle/speech.cpp
index 08f773cca1..09b0af730e 100644
--- a/engines/mortevielle/speech.cpp
+++ b/engines/mortevielle/speech.cpp
@@ -30,7 +30,6 @@
 #include "mortevielle/speech.h"
 #include "mortevielle/sound.h"
 #include "mortevielle/mortevielle.h"
-#include "mortevielle/var_mor.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/speech.h b/engines/mortevielle/speech.h
index 6521fd9927..f9af192089 100644
--- a/engines/mortevielle/speech.h
+++ b/engines/mortevielle/speech.h
@@ -29,7 +29,7 @@
 #define MORTEVIELLE_PAROLE_H
 
 #include "common/scummsys.h"
-#include "mortevielle/var_mor.h"
+#include "mortevielle/sound.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/var_mor.cpp b/engines/mortevielle/var_mor.cpp
deleted file mode 100644
index a451cb651f..0000000000
--- a/engines/mortevielle/var_mor.cpp
+++ /dev/null
@@ -1,44 +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 Mortville Manor DOS source code
- * Copyright (c) 1988-1989 Lankhor
- */
-
-#include "common/debug.h"
-#include "common/str.h"
-#include "common/textconsole.h"
-#include "mortevielle/mortevielle.h"
-#include "mortevielle/var_mor.h"
-
-namespace Mortevielle {
-
-/*---------------------------------------------------------------------------*/
-/*--------------------   PROCEDURES  AND  FONCTIONS   -----------------------*/
-/*---------------------------------------------------------------------------*/
-
-void musyc(tablint &tb, int nbseg, int att) {
-	warning("TODO: musyc");
-}
-
-} // End of namespace Mortevielle
diff --git a/engines/mortevielle/var_mor.h b/engines/mortevielle/var_mor.h
deleted file mode 100644
index bddf85cd90..0000000000
--- a/engines/mortevielle/var_mor.h
+++ /dev/null
@@ -1,46 +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 Mortville Manor DOS source code
- * Copyright (c) 1988-1989 Lankhor
- */
-
-#ifndef MORTEVIELLE_VAR_H
-#define MORTEVIELLE_VAR_H
-
-#include "common/rect.h"
-#include "common/str.h"
-
-namespace Mortevielle {
-
-struct Hotspot {
-	Common::Rect _rect;
-	bool _enabled;
-};
-
-typedef int tablint[256];
-typedef int tfxx[108];
-
-} // End of namespace Mortevielle
-
-#endif