diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp index f3bc31b6375..adcb17b5edc 100644 --- a/engines/mortevielle/actions.cpp +++ b/engines/mortevielle/actions.cpp @@ -862,7 +862,7 @@ L2: x = (hazard(0, 10)) - 5; parole(7, x, 1); aniof(1, 1); - /* tkey(5,32000);*/ + tip(z, x); s.conf = s.conf + 1; s.mlieu = 15; @@ -882,7 +882,7 @@ L2: x = (hazard(0, 10)) - 5; parole(7, x, 1); aniof(1, 1); - /* tkey(1,32000);*/ + s.mlieu = ment; affrep(); debloc(s.mlieu); @@ -1069,7 +1069,6 @@ L2: mov_mouse(f, tou); CHECK_QUIT; - /* if keypressed then read(kbd,tou);*/ read_pos_mouse(x, y, c); x = x * (3 - res); if (x > 319) cx = 41; diff --git a/engines/mortevielle/droite.cpp b/engines/mortevielle/droite.cpp index c0a48a51aa1..fc52ff7bd3b 100644 --- a/engines/mortevielle/droite.cpp +++ b/engines/mortevielle/droite.cpp @@ -41,7 +41,7 @@ void droite(int x, int y, int xx, int yy, int coul) { yr = y; xro = xx; yro = yy; - /*writeln(le_file,'(',x:4,',',y:4,') ==> (',xx:4,',',yy:4,')');*/ + if (abs(y - yy) > abs(x - xx)) { a = (float)((x - xx)) / (y - yy); b = (yr * xro - yro * xr) / (y - yy); @@ -52,7 +52,6 @@ void droite(int x, int y, int xx, int yy, int coul) { g_vm->_screenSurface.setPixel(Common::Point(abs((int)(a * i + b)), i), coul); i = i + step; } while (!(i == yy)); - /*writeln(le_file,'X == ',a:3:3,' * Y + ',b:3:3);*/ } else { a = (float)((y - yy)) / (x - xx); b = ((yro * xr) - (yr * xro)) / (x - xx); @@ -63,7 +62,6 @@ void droite(int x, int y, int xx, int yy, int coul) { g_vm->_screenSurface.setPixel(Common::Point(i, abs((int)(a * i + b))), coul); i = i + step; } while (!(i == xx)); - /*writeln(le_file,'Y == ',a:3:3,' * X + ',b:3:3);*/ } } diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp index 36e23bf6538..2d4df26e469 100644 --- a/engines/mortevielle/mor.cpp +++ b/engines/mortevielle/mor.cpp @@ -144,50 +144,10 @@ void ecrf1() { } void clsf1() { -// int i, j; - /* debug('clsf1'); */ hide_mouse(); g_vm->_screenSurface.fillRect(0, Common::Rect(0, 11, 514, 175)); - /* if Gd=ams then port[$3DD]:=15; - case Gd of - ams, - cga : begin - for j:=0 to 63 do - begin - for i:=6 to 86 do - begin - mem[$B800:i*80+j]:=0; - mem[$Ba00:i*80+j]:=0; - end; - mem[$b800:6960+j]:=0; - mem[$ba00:400+j]:=0; - end; - end; - ega : begin - port[$3C4]:= 2; - port[$3C5]:= 15; - port[$3CE]:= 8; - port[$3CF]:= 255; - for j:=0 to 63 do - for i:=11 to 174 do - mem[$A000:i*80+j]:=0; - end; - tan : begin - for j:=0 to 128 do - begin - for i:=3 to 43 do - begin - mem[$B800:i*160+j]:=0; - mem[$Ba00:i*160+j]:=0; - mem[$bc00:i*160+j]:=0; - if i<>43 then mem[$be00:i*160+j]:=0; - end; - mem[$be00:320+j]:=0; - end; - end; - end; - droite(256*res,11,256*res,175,0);*/ + show_mouse(); } @@ -208,9 +168,7 @@ void clsf2() { } void ecrf2() { - /* debug('ecrf2'); */ text_color(5); - /*g_vm->_screenSurface.drawBox(0,175,630,15,15);*/ } void ecr2(Common::String str_) { @@ -266,9 +224,6 @@ void ecrf6() { void ecrf7() { text_color(4); - /* draw_mode(2); - text_height(4*res); - text_style(normal);*/ } void clsf10() { diff --git a/engines/mortevielle/mor2.cpp b/engines/mortevielle/mor2.cpp index 5d9d9b24e28..5d33175a604 100644 --- a/engines/mortevielle/mor2.cpp +++ b/engines/mortevielle/mor2.cpp @@ -402,11 +402,7 @@ void sparl(float adr, float rep) { deline(repint + c_paroles, st, tay); afftex(st, 230, 4, 65, 24, 5); f3f8(); - /*g_vm->_screenSurface.drawBox(43,30,90,19,15); - gotoxy(7,5); - write('F3: Encore'); - gotoxy(7,6); - write('F8: Stop');*/ + key = 0; do { parole(repint, haut[caff - 69], 0); @@ -428,19 +424,11 @@ void finfouil() { void mfoudi() { int cx; - for (cx = 1; cx <= 7; cx ++) menu_disable(depl[cx]); - for (cx = 1; cx <= 11; cx ++) menu_disable(men[cx]); - /* menu_disable(menup, scacher); - menu_disable(menup, attacher); - menu_disable(menup, defoncer); - menu_disable(menup, dormir); - menu_disable(menup, entrer); - menu_disable(menup, fermer); - menu_disable(menup, frapper); - menu_disable(menup, manger); - menu_disable(menup, mettre); - menu_disable(menup, ouvrir); - menu_disable(menup, sortir); */ + for (cx = 1; cx <= 7; cx ++) + menu_disable(depl[cx]); + for (cx = 1; cx <= 11; cx ++) + menu_disable(men[cx]); + menut(sonder, g_vm->getString(S_SUITE)); menut(soulever, g_vm->getString(S_STOP)); } diff --git a/engines/mortevielle/taffich.cpp b/engines/mortevielle/taffich.cpp index 55fdbb74420..a9f727a41b4 100644 --- a/engines/mortevielle/taffich.cpp +++ b/engines/mortevielle/taffich.cpp @@ -219,19 +219,4 @@ void taffich() { } } -/* begin - for i:=0 to 15 do - begin - PalH:=WRITE_LE_UINT16(&mem[$7000:succ(i) shl 1]; - Alllum[i]:=PalH and 15 + PalH shr 4 and 15 + PalH shr 8 and 15; - end; - for i:=0 to 15 do - begin - k:=0; - for j:=0 to 15 do if Alllum[j]>Alllum[k] then k:=j; - mem[$7000:2+k shl 1]:= Rang[i]; - Alllum[k]:=-1; - end; - end;*/ - } // End of namespace Mortevielle diff --git a/engines/mortevielle/var_mor.h b/engines/mortevielle/var_mor.h index 5f13a254dd9..a872af199bc 100644 --- a/engines/mortevielle/var_mor.h +++ b/engines/mortevielle/var_mor.h @@ -347,7 +347,7 @@ extern int x, extern int t_cph[6401]; extern byte tabdon[4001]; -/* t_dxx : array[0..121] of int;*/ + extern Common::String stpou; /* donne le % d'indices */ extern byte is; extern char mode;