aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2011-12-27 23:13:54 +0000
committerStrangerke2012-04-06 08:18:41 +0200
commita61fb2cf25e49b03f99432b798855015c67d1efc (patch)
tree7b6995c7a599a987225362da354c29b6d2ac3e80
parentcd596ffb9b43bc2b251eeade7c7e89a158856fb1 (diff)
downloadscummvm-rg350-a61fb2cf25e49b03f99432b798855015c67d1efc.tar.gz
scummvm-rg350-a61fb2cf25e49b03f99432b798855015c67d1efc.tar.bz2
scummvm-rg350-a61fb2cf25e49b03f99432b798855015c67d1efc.zip
MORTEVIELLE: long_int -> float
-rw-r--r--engines/mortevielle/mor.cpp4
-rw-r--r--engines/mortevielle/mor2.cpp2
-rw-r--r--engines/mortevielle/mor2.h2
-rw-r--r--engines/mortevielle/taffich.cpp6
-rw-r--r--engines/mortevielle/taffich.h6
-rw-r--r--engines/mortevielle/var_mor.h1
6 files changed, 10 insertions, 11 deletions
diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp
index eca3021ec2..e55b4ed435 100644
--- a/engines/mortevielle/mor.cpp
+++ b/engines/mortevielle/mor.cpp
@@ -531,7 +531,7 @@ void affper(int per) {
/* overlay */ void choix(int min, int max, int &per) {
bool i;
int haz, cx, cy, cz;
- long_int per2, cz2;
+ float per2, cz2;
/* debug('o0 choix'); */
haz = hazard(min, max);
@@ -1259,7 +1259,7 @@ void aniof(int ouf, int num) {
void musique(int so) {
bool i;
int haz;
- /* dep: array[1..5] of long_int;*/
+ /* dep: array[1..5] of float;*/
/* debug('musique'); */
if (so == 0) { /*musik(0)*/
diff --git a/engines/mortevielle/mor2.cpp b/engines/mortevielle/mor2.cpp
index 45146c1bce..dea21bde0a 100644
--- a/engines/mortevielle/mor2.cpp
+++ b/engines/mortevielle/mor2.cpp
@@ -362,7 +362,7 @@ void modinv() {
}
}
-void sparl(long_int adr, long_int rep) {
+void sparl(float adr, float rep) {
const array<1, 8, int> haut
= {{0, 1, -3, 6, -2, 2, 7, -1}};
int key, ad, tay, repint;
diff --git a/engines/mortevielle/mor2.h b/engines/mortevielle/mor2.h
index adfbff9d26..a1732a16d4 100644
--- a/engines/mortevielle/mor2.h
+++ b/engines/mortevielle/mor2.h
@@ -49,7 +49,7 @@ void st4(int ob);
void cherjer(int ob, bool &d);
void st1sama();
void modinv();
-void sparl(long_int adr, long_int rep);
+void sparl(float adr, float rep);
void finfouil();
void mfoudi();
void mennor();
diff --git a/engines/mortevielle/taffich.cpp b/engines/mortevielle/taffich.cpp
index df5580786f..0a19301173 100644
--- a/engines/mortevielle/taffich.cpp
+++ b/engines/mortevielle/taffich.cpp
@@ -30,7 +30,7 @@
namespace Mortevielle {
-void chardes(Common::String nom, long_int passe, int long_) {
+void chardes(Common::String nom, float passe, int long_) {
int i, p, l;
byte b;
untyped_file f;
@@ -60,7 +60,7 @@ void chardes(Common::String nom, long_int passe, int long_) {
/*$i+*/
}
-void charani(Common::String nom, long_int passe, int long_) {
+void charani(Common::String nom, float passe, int long_) {
int i, p, l;
byte b;
untyped_file f;
@@ -101,7 +101,7 @@ void taffich() {
};
int i, m, a, b, cx, handle,
npal;
- long_int lgt, lhandle;
+ float lgt, lhandle;
Common::String nom;
int palh, k, j;
int alllum[16];
diff --git a/engines/mortevielle/taffich.h b/engines/mortevielle/taffich.h
index ccc64bf2c5..41f0612a4f 100644
--- a/engines/mortevielle/taffich.h
+++ b/engines/mortevielle/taffich.h
@@ -32,9 +32,9 @@
namespace Mortevielle {
-void chardes(Common::String nom, long_int passe, int long_);
-void charani(Common::String nom, long_int passe, int long_);
+void chardes(Common::String nom, float passe, int long_);
+void charani(Common::String nom, float passe, int long_);
void taffich();
} // End of namespace Mortevielle
-#endif \ No newline at end of file
+#endif
diff --git a/engines/mortevielle/var_mor.h b/engines/mortevielle/var_mor.h
index 4a526a32f1..42f95d5615 100644
--- a/engines/mortevielle/var_mor.h
+++ b/engines/mortevielle/var_mor.h
@@ -201,7 +201,6 @@ const byte rang[16] = {15, 14, 11, 7, 13, 12, 10, 6, 9, 5, 3, 1, 2, 4, 8, 0};
/*-------------------------------- TYPES --------------------------------*/
/*---------------------------------------------------------------------------*/
-typedef float long_int;
typedef file<byte> fichier_byte;
struct sav_chaine {
int conf;