23 files changed, 268 insertions, 256 deletions

diff --git a/engines/mortevielle/actions.h b/engines/mortevielle/actions.h
index 690de1d80e..904a58d87c 100644
--- a/engines/mortevielle/actions.h
+++ b/engines/mortevielle/actions.h
@@ -31,38 +31,38 @@
 namespace Mortevielle {
 
 /* NIVEAU 4 */
-void taller();
-void tprendre();
-void tsprendre();
-void tsoulever();
-void tlire();
-void tslire();
-void tregarder();
-void tsregarder();
-void tfouiller();
-void tsfouiller();
-void touvrir();
-void tmettre();
-void ttourner();
-void tcacher();
-void tattacher();
-void tfermer();
-void tfrapper();
-void tposer();
-void tecouter();
-void tmanger();
-void tentrer();
-void tdormir();
-void tdefoncer();
-void tsortir();
-void tattendre();
-void tsonder();
-void tparler();
-void tsentir();
-void tgratter();
+extern void taller();
+extern void tprendre();
+extern void tsprendre();
+extern void tsoulever();
+extern void tlire();
+extern void tslire();
+extern void tregarder();
+extern void tsregarder();
+extern void tfouiller();
+extern void tsfouiller();
+extern void touvrir();
+extern void tmettre();
+extern void ttourner();
+extern void tcacher();
+extern void tattacher();
+extern void tfermer();
+extern void tfrapper();
+extern void tposer();
+extern void tecouter();
+extern void tmanger();
+extern void tentrer();
+extern void tdormir();
+extern void tdefoncer();
+extern void tsortir();
+extern void tattendre();
+extern void tsonder();
+extern void tparler();
+extern void tsentir();
+extern void tgratter();
 /* NIVEAU 2 */
-void tmaj1();
-void tencore();
+extern void tmaj1();
+extern void tencore();
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/alert.cpp b/engines/mortevielle/alert.cpp
index c939da6f9c..45c1b355a2 100644
--- a/engines/mortevielle/alert.cpp
+++ b/engines/mortevielle/alert.cpp
@@ -25,8 +25,9 @@
  * Copyright (c) 1988-1989 Lankhor
  */
 
-#include "mortevielle/alert.h"
 #include "common/str.h"
+#include "mortevielle/alert.h"
+#include "mortevielle/level15.h"
 
 namespace Mortevielle {
 
diff --git a/engines/mortevielle/alert.h b/engines/mortevielle/alert.h
index 4c53b14416..f7a9e7d1c1 100644
--- a/engines/mortevielle/alert.h
+++ b/engines/mortevielle/alert.h
@@ -32,8 +32,8 @@
 
 namespace Mortevielle {
 
-int do_alert(Common::String str_, int n);
-int do_alert(Common::String str_, int n);
+extern int do_alert(Common::String str_, int n);
+extern int do_alert(Common::String str_, int n);
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/boite.h b/engines/mortevielle/boite.h
index d0e7b0e2e3..d4a1d1e45f 100644
--- a/engines/mortevielle/boite.h
+++ b/engines/mortevielle/boite.h
@@ -30,7 +30,7 @@
 
 namespace Mortevielle {
 
-void boite(int x, int y, int dx, int dy, int coul);
+extern void boite(int x, int y, int dx, int dy, int coul);
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/disk.h b/engines/mortevielle/disk.h
index 464c3b7e1a..06df8e029a 100644
--- a/engines/mortevielle/disk.h
+++ b/engines/mortevielle/disk.h
@@ -30,10 +30,10 @@
 
 namespace Mortevielle {
 
-void dem1();
-void takesav(int n);
-void ld_game(int n);
-void sv_game(int n);
+extern void dem1();
+extern void takesav(int n);
+extern void ld_game(int n);
+extern void sv_game(int n);
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/droite.h b/engines/mortevielle/droite.h
index 73ed30d1ad..6017f481cd 100644
--- a/engines/mortevielle/droite.h
+++ b/engines/mortevielle/droite.h
@@ -30,7 +30,7 @@
 
 namespace Mortevielle {
 
-void droite(int x, int y, int xx, int yy, int coul);
+extern void droite(int x, int y, int xx, int yy, int coul);
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/keyboard.h b/engines/mortevielle/keyboard.h
index fbef23feb0..7b2510fe06 100644
--- a/engines/mortevielle/keyboard.h
+++ b/engines/mortevielle/keyboard.h
@@ -30,9 +30,9 @@
 
 namespace Mortevielle {
 
-char readkey1();
-int testou();
-void teskbd();
+extern char readkey1();
+extern int testou();
+extern void teskbd();
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/level15.h b/engines/mortevielle/level15.h
index 73a9d3f32b..aee94c9c09 100644
--- a/engines/mortevielle/level15.h
+++ b/engines/mortevielle/level15.h
@@ -28,25 +28,27 @@
 #ifndef MORTEVIELLE_LEVEL15_H
 #define MORTEVIELLE_LEVEL15_H
 
+#include "mortevielle/var_mor.h"
+
 namespace Mortevielle {
 
 /* NIVEAU 15 */
-void copcha();
-bool dans_rect(rectangle r);
-void outbloc(int n, pattern p, t_nhom pal);
-void writepal(int n);
-void pictout(int seg, int dep, int x, int y);
-void putxy(int x, int y);
-// int calad(int x, int y);
-void sauvecr(int y, int dy);
-void charecr(int y, int dy);
-// int peek(int ad);
-// int peekw(int ad);
-// real peekl(int ad);
-// void procedure poke(int ad, int n);
-void adzon();
-int animof(int ouf, int num);
-// void affgd(int offs, int dep, int x, int y);
+extern void copcha();
+extern bool dans_rect(rectangle r);
+extern void outbloc(int n, pattern p, t_nhom pal);
+extern void writepal(int n);
+extern void pictout(int seg, int dep, int x, int y);
+extern void putxy(int x, int y);
+// extern int calad(int x, int y);
+extern void sauvecr(int y, int dy);
+extern void charecr(int y, int dy);
+// extern int peek(int ad);
+// extern int peekw(int ad);
+// extern real peekl(int ad);
+// extern void procedure poke(int ad, int n);
+extern void adzon();
+extern int animof(int ouf, int num);
+// extern void affgd(int offs, int dep, int x, int y);
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/menu.h b/engines/mortevielle/menu.h
index 2b548a2f35..1ea6931c0e 100644
--- a/engines/mortevielle/menu.h
+++ b/engines/mortevielle/menu.h
@@ -33,17 +33,17 @@
 namespace Mortevielle {
 
 /* NIVEAU 14*/
-void menut(int no, Common::String nom);
-void menu_disable(int no);
-void menu_enable(int no);
-void menu_aff();
-void draw_menu();
-void invers(int ix);
-void util(int x, int y);
-void menu_down(int ii);
-void menu_up(int xx);
-void erase_menu();
-void mdn();
+extern void menut(int no, Common::String nom);
+extern void menu_disable(int no);
+extern void menu_enable(int no);
+extern void menu_aff();
+extern void draw_menu();
+extern void invers(int ix);
+extern void util(int x, int y);
+extern void menu_down(int ii);
+extern void menu_up(int xx);
+extern void erase_menu();
+extern void mdn();
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/mor.h b/engines/mortevielle/mor.h
index 88e718b853..cabc3c4e92 100644
--- a/engines/mortevielle/mor.h
+++ b/engines/mortevielle/mor.h
@@ -33,95 +33,95 @@
 namespace Mortevielle {
 
 /* Niveau 14 suite */
-void testfi();
-int readclock();
-void modif(int &nu);
-void dessine(int ad, int x, int y);
-void dessine_rouleau();
-void text_color(int c);
+extern void testfi();
+extern int readclock();
+extern void modif(int &nu);
+extern void dessine(int ad, int x, int y);
+extern void dessine_rouleau();
+extern void text_color(int c);
 /* NIVEAU 13 */
-void text1(int x, int y, int nb, int m);
-void initouv();
-void ecrf1();
-void clsf1();
-void clsf2();
-void ecrf2();
-void ecr2(Common::String str_);
-void clsf3();
-void ecr3(Common::String text);
-void ecrf6();
-void ecrf7();
-void clsf10();
-void stop();
-void paint_rect(int x, int y, int dx, int dy);
-int hazard(int min, int max);
-void calch(int &j, int &h, int &m);
-void conv(int x, int &y);
+extern void text1(int x, int y, int nb, int m);
+extern void initouv();
+extern void ecrf1();
+extern void clsf1();
+extern void clsf2();
+extern void ecrf2();
+extern void ecr2(Common::String str_);
+extern void clsf3();
+extern void ecr3(Common::String text);
+extern void ecrf6();
+extern void ecrf7();
+extern void clsf10();
+extern void stop();
+extern void paint_rect(int x, int y, int dx, int dy);
+extern int hazard(int min, int max);
+extern void calch(int &j, int &h, int &m);
+extern void conv(int x, int &y);
 /* NIVEAU 12 */
-void okpas();
-void modobj(int m);
-void modobj2(int m, bool t1, bool t2);
-void repon(int f, int m);
-void f3f8();
-void t5(int cx);
-void affper(int per);
-void choix(int min, int max, int &per);
-void cpl1(int &p);
-void cpl2(int &p);
-void cpl3(int &p);
-void cpl5(int &p);
-void cpl6(int &p);
-void person();
-void chlm(int &per);
-void pendule();
+extern void okpas();
+extern void modobj(int m);
+extern void modobj2(int m, bool t1, bool t2);
+extern void repon(int f, int m);
+extern void f3f8();
+extern void t5(int cx);
+extern void affper(int per);
+extern void choix(int min, int max, int &per);
+extern void cpl1(int &p);
+extern void cpl2(int &p);
+extern void cpl3(int &p);
+extern void cpl5(int &p);
+extern void cpl6(int &p);
+extern void person();
+extern void chlm(int &per);
+extern void pendule();
 /*************
  * NIVEAU 11 *
  *************/
-void debloc(int l);
-void cpl10(int &p, int &h);
-void cpl11(int &p, int &h);
-void cpl12(int &p);
-void cpl13(int &p);
-void cpl15(int &p);
-void cpl20(int &p, int &h);
-void quelq1(int l);
-void quelq2();
-void quelq5();
-void quelq6(int l);
-void quelq10(int h, int &per);
-void quelq11(int h, int &per);
-void quelq12(int &per);
-void quelq15(int &per);
-void quelq20(int h, int &per);
-void frap();
-void nouvp(int l, int &p);
-void tip(int ip, int &cx);
-void ecfren(int &p, int &haz, int cf, int l);
-void becfren(int l);
+extern void debloc(int l);
+extern void cpl10(int &p, int &h);
+extern void cpl11(int &p, int &h);
+extern void cpl12(int &p);
+extern void cpl13(int &p);
+extern void cpl15(int &p);
+extern void cpl20(int &p, int &h);
+extern void quelq1(int l);
+extern void quelq2();
+extern void quelq5();
+extern void quelq6(int l);
+extern void quelq10(int h, int &per);
+extern void quelq11(int h, int &per);
+extern void quelq12(int &per);
+extern void quelq15(int &per);
+extern void quelq20(int h, int &per);
+extern void frap();
+extern void nouvp(int l, int &p);
+extern void tip(int ip, int &cx);
+extern void ecfren(int &p, int &haz, int cf, int l);
+extern void becfren(int l);
 /* NIVEAU 10 */
-void init_nbrepm();
-void phaz(int &haz, int &p, int cf);
-void inzon();
-void dprog();
-void pl1(int cf);
-void pl2(int cf);
-void pl5(int cf);
-void pl6(int cf);
-void pl9(int cf);
-void pl10(int cf);
-void pl11(int cf);
-void pl12(int cf);
-void pl13(int cf);
-void pl15(int cf);
-void pl20(int cf);
-void t11(int l11, int &a);
-void cavegre();
-void writetp(Common::String s, int t);
-void messint(int nu);
-void aniof(int ouf, int num);
-void musique(int so);
+extern void init_nbrepm();
+extern void phaz(int &haz, int &p, int cf);
+extern void inzon();
+extern void dprog();
+extern void pl1(int cf);
+extern void pl2(int cf);
+extern void pl5(int cf);
+extern void pl6(int cf);
+extern void pl9(int cf);
+extern void pl10(int cf);
+extern void pl11(int cf);
+extern void pl12(int cf);
+extern void pl13(int cf);
+extern void pl15(int cf);
+extern void pl20(int cf);
+extern void t11(int l11, int &a);
+extern void cavegre();
+extern void writetp(Common::String s, int t);
+extern void messint(int nu);
+extern void aniof(int ouf, int num);
+extern void musique(int so);
 /* NIVEAU 9 */
-void dessin(int ad);
+extern void dessin(int ad);
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/mor2.h b/engines/mortevielle/mor2.h
index a1732a16d4..6668d54113 100644
--- a/engines/mortevielle/mor2.h
+++ b/engines/mortevielle/mor2.h
@@ -30,52 +30,52 @@
 
 namespace Mortevielle {
 
-void tinke();
-void fenat(char ans);
+extern void tinke();
+extern void fenat(char ans);
 /* NIVEAU 8 */
-void afdes(int ad);
-void tkey1(bool d);
-void tmlieu(int mli);
+extern void afdes(int ad);
+extern void tkey1(bool d);
+extern void tmlieu(int mli);
 /* NIVEAU 7 */
-void tlu(int af, int ob);
-void delin(int n);
-void affrep();
-void mfouen();
-void atf3f8(int &key);
+extern void tlu(int af, int ob);
+extern void delin(int n);
+extern void affrep();
+extern void mfouen();
+extern void atf3f8(int &key);
 /* NIVEAU 6 */
-void tperd();
-void tsort();
-void st4(int ob);
-void cherjer(int ob, bool &d);
-void st1sama();
-void modinv();
-void sparl(float adr, float rep);
-void finfouil();
-void mfoudi();
-void mennor();
-void premtet();
+extern void tperd();
+extern void tsort();
+extern void st4(int ob);
+extern void cherjer(int ob, bool &d);
+extern void st1sama();
+extern void modinv();
+extern void sparl(float adr, float rep);
+extern void finfouil();
+extern void mfoudi();
+extern void mennor();
+extern void premtet();
 /* NIVEAU 5 */
-void ajchai();
-void ajjer(int ob);
-void t1sama();
-void t1vier();
-void t1neig();
-void t1deva();
-void t1derr();
-void t1deau();
-void tctrm();
-void quelquun();
-void tsuiv();
-void tfleche();
-void tcoord(int sx);
-void st7(int ob);
-void treg(int ob);
-void avpoing(int &ob);
-void rechai(int &ch);
-void t23coul(int &l);
-void maivid();
-void st13(int ob);
-void aldepl();
+extern void ajchai();
+extern void ajjer(int ob);
+extern void t1sama();
+extern void t1vier();
+extern void t1neig();
+extern void t1deva();
+extern void t1derr();
+extern void t1deau();
+extern void tctrm();
+extern void quelquun();
+extern void tsuiv();
+extern void tfleche();
+extern void tcoord(int sx);
+extern void st7(int ob);
+extern void treg(int ob);
+extern void avpoing(int &ob);
+extern void rechai(int &ch);
+extern void t23coul(int &l);
+extern void maivid();
+extern void st13(int ob);
+extern void aldepl();
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/mort.h b/engines/mortevielle/mort.h
index 0b78deb028..fa42288963 100644
--- a/engines/mortevielle/mort.h
+++ b/engines/mortevielle/mort.h
@@ -30,9 +30,9 @@
 
 namespace Mortevielle {
 
-void divers(int np, bool b);
+extern void divers(int np, bool b);
 /* NIVEAU 0 */
-int main(int argc, const char *argv[]);
+extern int main(int argc, const char *argv[]);
 } // End of namespace Mortevielle
 
 #endif
diff --git a/engines/mortevielle/mouse.cpp b/engines/mortevielle/mouse.cpp
index 791920f845..a6b1768b96 100644
--- a/engines/mortevielle/mouse.cpp
+++ b/engines/mortevielle/mouse.cpp
@@ -336,7 +336,7 @@ void mov_mouse(bool &funct, char &key) {
 	while (p_key) {
 		input >> kbd >> in1;
 		read_pos_mouse(cx, cy, cd);
-		switch (upcase(in1)) {
+		switch (toupper(in1)) {
 		case '4' :
 			cx = cx - 8;
 			break;
@@ -382,6 +382,13 @@ void mov_mouse(bool &funct, char &key) {
 		break;
 		case '\33' : {
 			p_key = keypressed();
+
+			if ((p_key >= ';') && (p_key <= 'D')) {
+				funct = true;
+				key = in2;
+				return;
+			}
+
 			if (p_key) {
 				input >> kbd >> in2;
 				switch (in2) {
@@ -397,12 +404,6 @@ void mov_mouse(bool &funct, char &key) {
 				case 'H' :
 					cy = pred(int, cy);
 					break;
-				case RANGE_10(';', 'D') : {
-					funct = true;
-					key = in2;
-					return;
-				}
-				break;
 				case 'G' : {
 					cx = cx - 1;
 					cy = cy - 1;
diff --git a/engines/mortevielle/mouse.h b/engines/mortevielle/mouse.h
index 90fe91e373..33fd280561 100644
--- a/engines/mortevielle/mouse.h
+++ b/engines/mortevielle/mouse.h
@@ -31,13 +31,13 @@
 namespace Mortevielle {
 
 void init_mouse();
-//void change_mouse(int t);
-//void dessine_souris(int xf, int yf);
-void hide_mouse();
-void show_mouse();
-void pos_mouse(int x, int y);
-void read_pos_mouse(int &x, int &y, int &c);
-void mov_mouse(bool &funct, char &key);
+//extern void change_mouse(int t);
+//extern void dessine_souris(int xf, int yf);
+extern void hide_mouse();
+extern void show_mouse();
+extern void pos_mouse(int x, int y);
+extern void read_pos_mouse(int &x, int &y, int &c);
+extern void mov_mouse(bool &funct, char &key);
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/outtext.h b/engines/mortevielle/outtext.h
index 14ef8c6c7e..45b5745bbf 100644
--- a/engines/mortevielle/outtext.h
+++ b/engines/mortevielle/outtext.h
@@ -32,10 +32,10 @@
 
 namespace Mortevielle {
 
-static void cinq_huit(char &c, int &ind, byte &pt, bool &the_end);
-void deline(int num , char *l , int &tl);
-static int l_motsuiv(int p, char *ch, int &tab);
-void afftex(char *ch, int x, int y, int dx, int dy, int typ);
+//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);
+extern void afftex(char *ch, int x, int y, int dx, int dy, int typ);
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/ovd1.h b/engines/mortevielle/ovd1.h
index 4cad37c0ab..96239ed3d5 100644
--- a/engines/mortevielle/ovd1.h
+++ b/engines/mortevielle/ovd1.h
@@ -30,20 +30,20 @@
 
 namespace Mortevielle {
 
-void dem2();
-void ani50();
-//void apzuul();
-void aff50(bool c);
-void init_menu();
-void charpal();
-void chartex();
-void dialpre();
-void init_lieu();
-void music();
-void charge_bruit5();
-void charge_cfiec();
-void charge_cfiph();
-void suite();
+extern void dem2();
+extern void ani50();
+//extern void apzuul();
+extern void aff50(bool c);
+extern void init_menu();
+extern void charpal();
+extern void chartex();
+extern void dialpre();
+extern void init_lieu();
+extern void music();
+extern void charge_bruit5();
+extern void charge_cfiec();
+extern void charge_cfiph();
+extern void suite();
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/parole.h b/engines/mortevielle/parole.h
index b0282e15bd..daea40cbf0 100644
--- a/engines/mortevielle/parole.h
+++ b/engines/mortevielle/parole.h
@@ -30,16 +30,16 @@
 
 namespace Mortevielle {
 
-void spfrac(int wor);
-void charg_car();
-void entroct(byte o);
-void veracf(byte b);
-void cctable(tablint &t);
-void regenbruit();
-void charge_son();
-void charge_phbruit();
-void charge_bruit();
-void trait_car();
+extern void spfrac(int wor);
+extern void charg_car();
+extern void entroct(byte o);
+extern void veracf(byte b);
+extern void cctable(tablint &t);
+extern void regenbruit();
+extern void charge_son();
+extern void charge_phbruit();
+extern void charge_bruit();
+extern void trait_car();
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/parole2.h b/engines/mortevielle/parole2.h
index ed7108f3b8..01cf277422 100644
--- a/engines/mortevielle/parole2.h
+++ b/engines/mortevielle/parole2.h
@@ -30,10 +30,10 @@
 
 namespace Mortevielle {
 
-void rot_chariot();
-void init_chariot();
-void trait_ph();
-void parole(int rep, int ht, int typ);
+extern void rot_chariot();
+extern void init_chariot();
+extern void trait_ph();
+extern void parole(int rep, int ht, int typ);
 
 } // End of namespace Mortevielle
 
diff --git a/engines/mortevielle/prog.h b/engines/mortevielle/prog.h
index 4fccca4f65..fbcd92f469 100644
--- a/engines/mortevielle/prog.h
+++ b/engines/mortevielle/prog.h
@@ -30,18 +30,18 @@
 
 namespace Mortevielle {
 
-void change_gd(int ngd);
-void antegame();
+extern void change_gd(int ngd);
+extern void antegame();
 
 /* NIVEAU 3 */
 /* procedure PROGRAMME */
-void tmaj3();
-void tsitu();
-void tecran();
+extern void tmaj3();
+extern void tsitu();
+extern void tecran();
 
 /* NIVEAU 1 */
-void theure();
-void tjouer();
+extern void theure();
+extern void tjouer();
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/ques.h b/engines/mortevielle/ques.h
index f748d3e0b5..7260bfa6a2 100644
--- a/engines/mortevielle/ques.h
+++ b/engines/mortevielle/ques.h
@@ -32,7 +32,7 @@
 
 namespace Mortevielle {
 
-bool ques();
+extern bool ques();
 
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/sprint.h b/engines/mortevielle/sprint.h
index 42259f0593..8484214fa3 100644
--- a/engines/mortevielle/sprint.h
+++ b/engines/mortevielle/sprint.h
@@ -32,8 +32,9 @@
 
 namespace Mortevielle {
 
-void fill_box(int x, int y, int dx);
-void clear_box(int x, int y, int dx);
-void writeg(Common::String l, int c);
+extern void fill_box(int x, int y, int dx);
+extern void clear_box(int x, int y, int dx);
+extern void writeg(Common::String l, int c);
+
 } // End of namespace Mortevielle
 #endif
diff --git a/engines/mortevielle/taffich.h b/engines/mortevielle/taffich.h
index 41f0612a4f..bea3c09f2a 100644
--- a/engines/mortevielle/taffich.h
+++ b/engines/mortevielle/taffich.h
@@ -32,9 +32,10 @@
 
 namespace Mortevielle {
 
-void chardes(Common::String nom, float passe, int long_);
-void charani(Common::String nom, float passe, int long_);
-void taffich();
+extern void chardes(Common::String nom, float passe, int long_);
+extern void charani(Common::String nom, float passe, int long_);
+extern void taffich();
+
 } // End of namespace Mortevielle
 
 #endif
diff --git a/engines/mortevielle/var_mor.h b/engines/mortevielle/var_mor.h
index 59d98fe58e..6b4ae2f70a 100644
--- a/engines/mortevielle/var_mor.h
+++ b/engines/mortevielle/var_mor.h
@@ -41,6 +41,12 @@ namespace Mortevielle {
                                                   musique & paroles Oct 88 )
                                                                              */
 
+/*---------------------------------------------------------------------------*/
+/*-------------------------     DEFINES    ----------------------------------*/
+/*---------------------------------------------------------------------------*/
+
+#define pred(type, v) (v - 1)
+#define succ(type, v) (v + 1)
 
 /*---------------------------------------------------------------------------*/
 /*-------------------------    CONSTANTS   ----------------------------------*/