From b1b7bd8501c7e474317c5ad8d8e8e9244e960a12 Mon Sep 17 00:00:00 2001 From: Paul Gilbert Date: Sun, 12 Feb 2012 22:35:50 +1100 Subject: MORTEVIELLE: Removed all the code that was commented out in the original source --- engines/mortevielle/keyboard.cpp | 22 --------------------- engines/mortevielle/level15.cpp | 39 ------------------------------------- engines/mortevielle/mor.cpp | 29 ++------------------------- engines/mortevielle/mor2.cpp | 4 +--- engines/mortevielle/mortevielle.cpp | 3 --- engines/mortevielle/mouse.cpp | 18 +---------------- engines/mortevielle/ovd1.cpp | 31 ++++------------------------- engines/mortevielle/parole.cpp | 3 +-- engines/mortevielle/ques.cpp | 2 -- engines/mortevielle/var_mor.cpp | 2 +- 10 files changed, 10 insertions(+), 143 deletions(-) diff --git a/engines/mortevielle/keyboard.cpp b/engines/mortevielle/keyboard.cpp index 4eba4c4a0d..a330a382d9 100644 --- a/engines/mortevielle/keyboard.cpp +++ b/engines/mortevielle/keyboard.cpp @@ -49,28 +49,6 @@ int testou() { case '\23' : sonoff = ! sonoff; break; - /* Prevent changing graphics mode - case '\1': - case '\3': - case '\5' : { - newgd = (uint)pred(int, ord(ch)) >> 1; - testou_result = 61; - return testou_result; - } - break; - case '\10' : { - newgd = her; - testou_result = 61; - return testou_result; - } - break; - case '\24' : { - newgd = tan; - testou_result = 61; - return testou_result; - } - break; - */ case '\26' : if ((c_zzz == 1) && (c_zzz == 2)) { zzuul(&adcfiec[161 * 16], ((822 * 128) - (161 * 16)) / 64); diff --git a/engines/mortevielle/level15.cpp b/engines/mortevielle/level15.cpp index c017bf24d3..8d89767e91 100644 --- a/engines/mortevielle/level15.cpp +++ b/engines/mortevielle/level15.cpp @@ -112,12 +112,6 @@ void pictout(int seg, int dep, int x, int y) { g_vm->_screenSurface.drawPicture(surface, x, y); } -/* -function calad(x,y:int):int; - begin - calad:=pred(x)+320*pred(y) - end; - */ void sauvecr(int y, int dy) { hide_mouse(); s_sauv(gd, y, dy); @@ -129,28 +123,6 @@ void charecr(int y, int dy) { s_char(gd, y, dy); show_mouse(); } -/* -function peek(ad:int):int; -begin - peek:=tabdon[ad]; -end; - -function peekw(ad:int):int; -begin - peekw:=tabdon[ad] shl 8+tabdon[succ(ad)]; -end; - -function peekl(ad:int):real; -begin - peekl:=tabdon[ad+3]+tabdon[ad+2] shl 8; -end; - - -procedure poke (ad,n:int); -begin - tabdon[ad]:=lo(n); -end; - */ void adzon() { Common::File f; @@ -186,15 +158,4 @@ int animof(int ouf, int num) { return animof_result; } -/*procedure affgd(offs,dep,x,y:int); -begin - case Gd of - Ams : affams(offs,dep,x,y); - Cga : affcga(offs,dep,x,y); - Ega : affega(offs,dep,x,y); - Her : affher(offs,dep,x,y); - Tan : afftan(offs,dep,x,y); - end; -end;*/ - } // End of namespace Mortevielle diff --git a/engines/mortevielle/mor.cpp b/engines/mortevielle/mor.cpp index 2f48999638..36e23bf653 100644 --- a/engines/mortevielle/mor.cpp +++ b/engines/mortevielle/mor.cpp @@ -656,8 +656,7 @@ void pendule() { /* debug('pendule'); */ hide_mouse(); - /*paint_rect(572,114,18,20); - paint_rect(577,114,6,20);*/ + paint_rect(570, 118, 20, 10); paint_rect(578, 114, 6, 18); if ((gd == cga) || (gd == her)) @@ -1238,23 +1237,7 @@ void writetp(Common::String s, int t) { * a waiting message between scenes. */ void messint(int nu) { - /* Method is deprecated - clsf1(); - clsf2(); - clsf3(); - - GfxSurface surface; - surface.decode(&mem[0x73a2 * 16 + 1008]); - - WRITE_LE_UINT16(&mem[0x7413 * 16 + 12], 80); - WRITE_LE_UINT16(&mem[0x7413 * 16 + 14], 40); - writepal(90); - - g_vm->_screenSurface.drawPicture(surface, 0, 0); - g_vm->_screenSurface.drawPicture(surface, 0, 70); - - repon(7, nu); - */ + // Method is deprecated } void aniof(int ouf, int num) { @@ -1278,7 +1261,6 @@ void aniof(int ouf, int num) { void musique(int so) { bool i; int haz; - /* dep: array[1..5] of float;*/ /* debug('musique'); */ if (so == 0) { /*musik(0)*/ @@ -1315,13 +1297,6 @@ void musique(int so) { i = true; } if (! i) { - /* dep[1]:= 1416; - dep[2]:= 1512; - dep[3]:= 1692; - dep[4]:= 1884; - dep[5]:= 2046; - haz:= hazard(1,5); - musik(dep[haz]);*/ haz = hazard(1, 17); parole(haz, 1, 2); } diff --git a/engines/mortevielle/mor2.cpp b/engines/mortevielle/mor2.cpp index 71546e943b..5d9d9b24e2 100644 --- a/engines/mortevielle/mor2.cpp +++ b/engines/mortevielle/mor2.cpp @@ -677,9 +677,7 @@ void tcoord(int sx) atdon = atdon + 4; cy = succ(int, cy); } - /* for cy:=0 to caff-1 do - a:=a+ tabdon[amzon+3+4*cy]; - b:= peek(amzon+3+4*caff); */ + b = tabdon[atdon]; if (b == 0) goto L1; a = a + fleche; diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp index 4cbc2b4ee3..026f17d718 100644 --- a/engines/mortevielle/mortevielle.cpp +++ b/engines/mortevielle/mortevielle.cpp @@ -134,9 +134,6 @@ Common::ErrorCode MortevielleEngine::initialise() { // Setup the mouse cursor initMouse(); - /*init_debug;*/ - /* ecri_seg;*/ - //pio_initialize(argc, argv); gd = ega; newgd = gd; zuul = false; diff --git a/engines/mortevielle/mouse.cpp b/engines/mortevielle/mouse.cpp index 631be60cf8..51af36b5f0 100644 --- a/engines/mortevielle/mouse.cpp +++ b/engines/mortevielle/mouse.cpp @@ -49,14 +49,13 @@ int s_s[12][6]; void init_mouse() { -// int i, j; registres reg; mouse_shwn = 0; x_s = 0; y_s = 0; p_o_s = 0; - /*int_m:= False;*/ + g_vm->setMouseClick(false); m_show = m_arrow; if ((READ_LE_UINT16(&mem[0xcc]) == 0) && (READ_LE_UINT16(&mem[0xce]) == 0)) int_m = false; @@ -75,21 +74,6 @@ void init_mouse() { } } -/*procedure change_mouse( t : int ); -begin - m_show:= t; -end;*/ - -/*procedure dessine_souris(xf,yf:int); - var x, xx, y :int; -begin - case m_show of - m_arrow : begin - affput(2,Gd,xf,yf,0,0); - end; - end; -end; */ - void hide_mouse() { int i, j, k, ps;; bool imp; diff --git a/engines/mortevielle/ovd1.cpp b/engines/mortevielle/ovd1.cpp index df79b72a6b..6650dd04b2 100644 --- a/engines/mortevielle/ovd1.cpp +++ b/engines/mortevielle/ovd1.cpp @@ -45,25 +45,11 @@ namespace Mortevielle { // For ScummVM, we need to do check for file errors where we do the file access const int ioresult = 0; +/** + * Check for disk 2 being in the drive + */ void dem2() { - /* Deprecated check for disk 2 - - untyped_file f; - int k; - - // -- demande de disk 2 -- - while (ioresult != 0); - assign(f, "mort.001"); - //$i- - reset(f); - while (ioresult != 0) { - show_mouse(); - k = do_alert(al_mess2, 1); - hide_mouse(); - reset(f); - } - close(f); - */ + // Deprecated under ScummVM } void ani50() { @@ -75,15 +61,6 @@ void ani50() { repon(2, c_paroles + 143); } -/*overlay procedure apzuul; - begin - if (c_zzz=1) or (c_zzz=2) then - begin - zzuul(adcfiec+161,0,1644); - c_zzz:=succ(c_zzz); - end; - end;*/ - /* overlay */ void aff50(bool c) { caff = 50; maff = 0; diff --git a/engines/mortevielle/parole.cpp b/engines/mortevielle/parole.cpp index ba43b5955d..2a8984195a 100644 --- a/engines/mortevielle/parole.cpp +++ b/engines/mortevielle/parole.cpp @@ -128,8 +128,7 @@ void veracf(byte b) { error("Missing file - sonmus.mor"); f.read(&mem[0x7414 * 16 + 0], 273); - /*blockread(f,mem[adson * 16+0],300); - blockread(f,mem[adson * 16+2400+0],245);*/ + g_vm->_soundManager.demus(&mem[0x7414 * 16], &mem[adson * 16], 273); f.close(); } diff --git a/engines/mortevielle/ques.cpp b/engines/mortevielle/ques.cpp index 17921951cf..aadedbd9cc 100644 --- a/engines/mortevielle/ques.cpp +++ b/engines/mortevielle/ques.cpp @@ -113,13 +113,11 @@ namespace Mortevielle { while (coor[k].etat && ! dans_rect(coor[k])) k = k + 1; if (coor[k].etat) { if ((memk != 0) && (memk != k)) { - /*DeLine(T_rec[ta[i]+memk].indis,T_rec[ta[i]+memk].point,st,tay);*/ for (j = 1; j <= tmax; j ++) st[j] = chaines[memk][j]; st[1 + tmax] = '$'; afftex(st, 100, 27 + memk * 8, 100, 1, 0); } if (memk != k) { - /*DeLine(T_rec[pred(prem)+k].indis,T_rec[pred(prem)+k].point,st,tay);*/ for (j = 1; j <= tmax; j ++) st[j] = chaines[k][j]; st[1 + tmax] = '$'; afftex(st, 100, 27 + k * 8, 100, 1, 1); diff --git a/engines/mortevielle/var_mor.cpp b/engines/mortevielle/var_mor.cpp index 7b6156263c..5c72961630 100644 --- a/engines/mortevielle/var_mor.cpp +++ b/engines/mortevielle/var_mor.cpp @@ -174,7 +174,7 @@ int x, int t_cph[6401]; byte tabdon[4001]; -/* t_dxx : array[0..121] of int;*/ + Common::String stpou; /* donne le % d'indices */ //Translation: "Provides the % of hints" byte is; char mode; -- cgit v1.2.3