diff options
author | Paul Gilbert | 2011-12-30 22:52:56 +1100 |
---|---|---|
committer | Strangerke | 2012-04-06 08:18:52 +0200 |
commit | 6998d530dcf5e691c2624dcb401345743e4c7ed7 (patch) | |
tree | 9be93bdc238520402a5cad2b72acde86dc537020 /engines | |
parent | 1a0e3b571af1f21c6a03b0e789c3fea7dc8a93d6 (diff) | |
download | scummvm-rg350-6998d530dcf5e691c2624dcb401345743e4c7ed7.tar.gz scummvm-rg350-6998d530dcf5e691c2624dcb401345743e4c7ed7.tar.bz2 scummvm-rg350-6998d530dcf5e691c2624dcb401345743e4c7ed7.zip |
MORTEVIELLE: Further bugfixes to include files and added includes
Diffstat (limited to 'engines')
-rw-r--r-- | engines/mortevielle/actions.cpp | 2 | ||||
-rw-r--r-- | engines/mortevielle/mor2.cpp | 2 | ||||
-rw-r--r-- | engines/mortevielle/mouse.h | 2 | ||||
-rw-r--r-- | engines/mortevielle/outtext.h | 2 | ||||
-rw-r--r-- | engines/mortevielle/taffich.cpp | 3 | ||||
-rw-r--r-- | engines/mortevielle/var_mor.h | 5 |
6 files changed, 13 insertions, 3 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp index 146542a5f7..359857eeb4 100644 --- a/engines/mortevielle/actions.cpp +++ b/engines/mortevielle/actions.cpp @@ -986,7 +986,7 @@ L2: /* overlay */ void tparler() { - array<1, 46, bool> te; + bool te[47]; int ix, cy, cx, max, haz, suj, co, lig, icm, i, tay, choi, x, y, c; char tou; diff --git a/engines/mortevielle/mor2.cpp b/engines/mortevielle/mor2.cpp index b6c3ee93fe..50d12452a5 100644 --- a/engines/mortevielle/mor2.cpp +++ b/engines/mortevielle/mor2.cpp @@ -27,6 +27,8 @@ #include "mortevielle/mor2.h" #include "mortevielle/var_mor.h" +#include "mortevielle/mouse.h" +#include "mortevielle/outtext.h" namespace Mortevielle { diff --git a/engines/mortevielle/mouse.h b/engines/mortevielle/mouse.h index 33fd280561..2a22d04e4c 100644 --- a/engines/mortevielle/mouse.h +++ b/engines/mortevielle/mouse.h @@ -30,6 +30,8 @@ namespace Mortevielle { +extern bool clic; + void init_mouse(); //extern void change_mouse(int t); //extern void dessine_souris(int xf, int yf); diff --git a/engines/mortevielle/outtext.h b/engines/mortevielle/outtext.h index 45b5745bbf..ad69ca9109 100644 --- a/engines/mortevielle/outtext.h +++ b/engines/mortevielle/outtext.h @@ -32,6 +32,8 @@ namespace Mortevielle { +extern Common::String delig; + //static void cinq_huit(char &c, int &ind, byte &pt, bool &the_end); extern void deline(int num , char *l , int &tl); //static int l_motsuiv(int p, char *ch, int &tab); diff --git a/engines/mortevielle/taffich.cpp b/engines/mortevielle/taffich.cpp index 6a937e2e93..85b2157b6e 100644 --- a/engines/mortevielle/taffich.cpp +++ b/engines/mortevielle/taffich.cpp @@ -25,8 +25,9 @@ * Copyright (c) 1988-1989 Lankhor */ -#include "mortevielle/taffich.h" #include "common/str.h" +#include "mortevielle/taffich.h" +#include "mortevielle/var_mor.h" namespace Mortevielle { diff --git a/engines/mortevielle/var_mor.h b/engines/mortevielle/var_mor.h index fa25962909..88b42a845f 100644 --- a/engines/mortevielle/var_mor.h +++ b/engines/mortevielle/var_mor.h @@ -49,8 +49,9 @@ namespace Mortevielle { #define succ(type, v) (v + 1) #define ord(v) ((int) v) -// TODO: Replace with a cleaner shutdown mechanism +// TODO: Replace the following with proper implementations #define mortevielle_exit(ret) error("Exit the game") +#define clrscr {} /*---------------------------------------------------------------------------*/ /*------------------------- CONSTANTS ----------------------------------*/ @@ -222,6 +223,8 @@ struct nhom { byte hom[4]; }; +typedef nhom t_nhom[16]; + struct t_pcga { byte p; nhom a[16]; |