aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2011-12-26 18:18:34 +0000
committerStrangerke2012-04-06 08:18:20 +0200
commitb36a336203e0f18278d72ded1974a0ddf911b783 (patch)
treeb6f8b8028fbafad1cda0e67fdfe410d3dbe9936e
parent321b86339fcad0b18f1c709692420b63bc4497ee (diff)
downloadscummvm-rg350-b36a336203e0f18278d72ded1974a0ddf911b783.tar.gz
scummvm-rg350-b36a336203e0f18278d72ded1974a0ddf911b783.tar.bz2
scummvm-rg350-b36a336203e0f18278d72ded1974a0ddf911b783.zip
MORTEVIELLE: real -> float
-rw-r--r--engines/mortevielle/droite.cpp8
-rw-r--r--engines/mortevielle/mor.cpp2
-rw-r--r--engines/mortevielle/ovd1.cpp6
-rw-r--r--engines/mortevielle/parole.cpp2
-rw-r--r--engines/mortevielle/parole2.cpp2
-rw-r--r--engines/mortevielle/var_mor.cpp14
6 files changed, 17 insertions, 17 deletions
diff --git a/engines/mortevielle/droite.cpp b/engines/mortevielle/droite.cpp
index 0ad212dec1..20899ced8b 100644
--- a/engines/mortevielle/droite.cpp
+++ b/engines/mortevielle/droite.cpp
@@ -1,7 +1,7 @@
void droite(int x, int y, int xx, int yy, int coul) {
int step, i;
- real a, b;
- real xr, yr, xro, yro;
+ float a, b;
+ float xr, yr, xro, yro;
xr = x;
yr = y;
@@ -9,7 +9,7 @@ void droite(int x, int y, int xx, int yy, int coul) {
yro = yy;
/*writeln(le_file,'(',x:4,',',y:4,') ==> (',xx:4,',',yy:4,')');*/
if (abs(y - yy) > abs(x - xx)) {
- a = (real)((x - xx)) / (y - yy);
+ a = (float)((x - xx)) / (y - yy);
b = (yr * xro - yro * xr) / (y - yy);
i = y;
if (y > yy) step = -1;
@@ -20,7 +20,7 @@ void droite(int x, int y, int xx, int yy, int coul) {
} while (!(i == yy));
/*writeln(le_file,'X == ',a:3:3,' * Y + ',b:3:3);*/
} else {
- a = (real)((y - yy)) / (x - xx);
+ a = (float)((y - yy)) / (x - xx);
b = ((yro * xr) - (yr * xro)) / (x - xx);
i = x;
if (x > xx) step = -1;
diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp
index cee4e31b93..1ec2332edb 100644
--- a/engines/mortevielle/mor.cpp
+++ b/engines/mortevielle/mor.cpp
@@ -279,7 +279,7 @@ void paint_rect(int x, int y, int dx, int dy) {
int hazard(int min, int max) {
int ha1;
- real ha2;
+ float ha2;
/* debug('hazard'); */
int hazard_result;
diff --git a/engines/mortevielle/ovd1.cpp b/engines/mortevielle/ovd1.cpp
index c2384273f2..8545fae233 100644
--- a/engines/mortevielle/ovd1.cpp
+++ b/engines/mortevielle/ovd1.cpp
@@ -171,7 +171,7 @@ void ani50() {
{
int cy, tay;
phrase st;
- real ix;
+ float ix;
char ch;
@@ -247,7 +247,7 @@ void ani50() {
int k;
boolean fin;
char ch;
- real x, y;
+ float x, y;
/* debug('o3 music'); */
@@ -260,7 +260,7 @@ void ani50() {
blockread(fic, mem[0x47a0 + 0], 123);
close(fic);
demus(0x3800, 0x5000, 623);
- addfix = (real)((tempo_mus - addv[1])) / 256;
+ addfix = (float)((tempo_mus - addv[1])) / 256;
cctable(tbi);
fin = false;
diff --git a/engines/mortevielle/parole.cpp b/engines/mortevielle/parole.cpp
index 42a46e1209..03940f5235 100644
--- a/engines/mortevielle/parole.cpp
+++ b/engines/mortevielle/parole.cpp
@@ -68,7 +68,7 @@ void veracf(byte b) {
/* overlay */ void cctable(tablint &t) {
int k;
- array<0, 256, real> tb;
+ array<0, 256, float> tb;
tb[0] = 0;
diff --git a/engines/mortevielle/parole2.cpp b/engines/mortevielle/parole2.cpp
index 02ec4fb908..eec9798ada 100644
--- a/engines/mortevielle/parole2.cpp
+++ b/engines/mortevielle/parole2.cpp
@@ -66,7 +66,7 @@ void parole(int rep, int ht, int typ) {
tempo = tempo_bruit;
} else if (haut > 5) tempo = tempo_f;
else tempo = tempo_m;
- addfix = (real)((tempo - addv[0])) / 256;
+ addfix = (float)((tempo - addv[0])) / 256;
cctable(tbi);
switch (typ) {
case 1 : {
diff --git a/engines/mortevielle/var_mor.cpp b/engines/mortevielle/var_mor.cpp
index d0edc2e8c8..ffd7dcb602 100644
--- a/engines/mortevielle/var_mor.cpp
+++ b/engines/mortevielle/var_mor.cpp
@@ -13,7 +13,7 @@
/*------------------------- CONSTANTES ----------------------------------*/
/*---------------------------------------------------------------------------*/
-const real freq0 = 1.19318e6;
+const float freq0 = 1.19318e6;
const int seg_syst = 0x6fed;
const int segmou = 0x6f00;
@@ -177,7 +177,7 @@ const array<0, 15, byte> rang
/*---------------------------------------------------------------------------*/
typedef varying_string<11> path_chars;
-typedef real long_int;
+typedef float long_int;
typedef varying_string<255> str255;
typedef varying_string<125> str125;
typedef varying_string<30> str30;
@@ -206,7 +206,7 @@ typedef array<0, maxtd, ind> tabind;
typedef matrix<1, 7, 0, 24, byte> tab_mlieu;
-typedef array<0, 255, real> table;
+typedef array<0, 255, float> table;
typedef array<0, 255, int> tablint;
typedef int word1;
@@ -393,7 +393,7 @@ tab_mlieu v_lieu;
tfxx l;
tablint tbi;
chariot c1, c2, c3;
-real addfix;
+float addfix;
pal_cga palsav;
array<0, 90, tabdb> tabpal;
pal_cga palcga;
@@ -424,7 +424,7 @@ void hirs() {
break;
case ams : {
hires;
- inline_((real)(0xb8) / 6 / 0 / /* => mov ax,6 */
+ inline_((float)(0xb8) / 6 / 0 / /* => mov ax,6 */
0xcd / 0x10); /* => int 16 */
port[0x3d9] = 15;
port[0x3df] = 0;
@@ -433,7 +433,7 @@ void hirs() {
}
break;
case ega : {
- inline_((real)(0xb8) / 14 / 0 / /* MOV AX, 14 ; mode video 14 = 640*200 16 couleurs */
+ inline_((float)(0xb8) / 14 / 0 / /* MOV AX, 14 ; mode video 14 = 640*200 16 couleurs */
0xcd / 0x10); /* INT 16 */
res = 2;
}
@@ -445,7 +445,7 @@ void hirs() {
port[0x3b4] = i;
port[0x3b5] = herc[i];
}
- inline_((real)(0xfc) / 0xb9 / 0 / 0x80 / 0xb8 / 0 / 0xb0 / 0x8e / 0xc0 / 0x31 / 0xff / 0x31 / 0xc0 / 0xf3 / 0xab);
+ inline_((float)(0xfc) / 0xb9 / 0 / 0x80 / 0xb8 / 0 / 0xb0 / 0x8e / 0xc0 / 0x31 / 0xff / 0x31 / 0xc0 / 0xf3 / 0xab);
port[0x3b8] = 10;
res = 2;
}