MORTEVIELLE: Fix several errors, add some includes

scummvm · Apr 6, 2012 · bc51e86 · bc51e86
1 parent 2ffc1fd
commit bc51e86
Show file tree

Hide file tree

Showing 11 changed files with 393 additions and 391 deletions.
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
@@ -26,6 +26,8 @@
  */
 
 #include "mortevielle/actions.h"
+#include "mortevielle/mor.h"
+#include "mortevielle/mor2.h"
 
 namespace Mortevielle {
 

diff --git a/engines/mortevielle/alert.h b/engines/mortevielle/alert.h
@@ -33,7 +33,7 @@
 namespace Mortevielle {
 
 int do_alert(Common::String str_, int n);
-void decod(Common::String s, int &nbc, int &nbl, int &col, Common::String &c, Common::String &cs);
+static void decod(Common::String s, int &nbc, int &nbl, int &col, Common::String &c, Common::String &cs);
 static void posit(int ji, int &coldep, int &esp);
 static void fait_boite(int lidep, int nli, int tx);
 static void fait_choix(Common::String c, int &coldep, int &nbcase, array<1, 2, varying_string<3> > &s, int &esp);

diff --git a/engines/mortevielle/boite.cpp b/engines/mortevielle/boite.cpp
@@ -26,6 +26,8 @@
  */
 
 #include "mortevielle/boite.h"
+#include "mortevielle/mouse.h"
+#include "mortevielle/var_mor.h"
 
 namespace Mortevielle {
 

diff --git a/engines/mortevielle/droite.cpp b/engines/mortevielle/droite.cpp
@@ -26,6 +26,7 @@
  */
 
 #include "mortevielle/droite.h"
+#include "mortevielle/var_mor.h"
 
 namespace Mortevielle {
 

diff --git a/engines/mortevielle/level15.cpp b/engines/mortevielle/level15.cpp
@@ -26,6 +26,7 @@
  */
 
 #include "mortevielle/level15.h"
+#include "mortevielle/var_mor.h"
 
 namespace Mortevielle {
 

diff --git a/engines/mortevielle/mor2.h b/engines/mortevielle/mor2.h
@@ -40,7 +40,7 @@ void tmlieu(int mli);
 void tlu(int af, int ob);
 void delin(int n);
 void affrep();
-void mfouen()
+void mfouen();
 void atf3f8(int &key);
 /* NIVEAU 6 */
 void tperd();

diff --git a/engines/mortevielle/prog.cpp b/engines/mortevielle/prog.cpp
@@ -25,6 +25,7 @@
  * Copyright (c) 1988-1989 Lankhor
  */
 
+#include "mortevielle/mor2.h"
 #include "mortevielle/prog.h"
 
 namespace Mortevielle {

diff --git a/engines/mortevielle/ques.cpp b/engines/mortevielle/ques.cpp
@@ -31,14 +31,8 @@
 namespace Mortevielle {
 
 /* overlay */ bool ques() {
-	const array<1, 10, int> ta
-	= {{
-			511, 516, 524, 531, 545,
-			552, 559, 563, 570, 576
-		}
-	};
-	const array<1, 10, int> ok
-	= {{ 4, 7, 1, 6, 4, 4, 2, 5, 3, 1 }};
+	const int ta[10] = {511, 516, 524, 531, 545, 552, 559, 563, 570, 576};
+	const int ok[10] = {4, 7, 1, 6, 4, 4, 2, 5, 3, 1 };
 
 	bool q, func, test;
 	int i, j, k, y, memk;

diff --git a/engines/mortevielle/sprint.cpp b/engines/mortevielle/sprint.cpp
@@ -25,6 +25,7 @@
  * Copyright (c) 1988-1989 Lankhor
  */
 
+#include "mortevielle/mouse.h"
 #include "mortevielle/sprint.h"
 #include "common/str.h"