diff options
author | Strangerke | 2012-02-26 18:08:53 +0100 |
---|---|---|
committer | Strangerke | 2012-04-06 08:22:04 +0200 |
commit | 510cae8af11ec66d849d6d6912eacef048de8012 (patch) | |
tree | d4c0e74743c848667cb3337acacbb9c469dd0cba /engines/mortevielle/actions.cpp | |
parent | ce56512c99b522e3942a84993360203d5f9e8fbc (diff) | |
download | scummvm-rg350-510cae8af11ec66d849d6d6912eacef048de8012.tar.gz scummvm-rg350-510cae8af11ec66d849d6d6912eacef048de8012.tar.bz2 scummvm-rg350-510cae8af11ec66d849d6d6912eacef048de8012.zip |
MORTEVIELLE: Start removing deline() and delig
Diffstat (limited to 'engines/mortevielle/actions.cpp')
-rw-r--r-- | engines/mortevielle/actions.cpp | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp index 68d6e82c43..a22dd3bbf2 100644 --- a/engines/mortevielle/actions.cpp +++ b/engines/mortevielle/actions.cpp @@ -47,7 +47,6 @@ namespace Mortevielle { * @remarks Originally called 'taller' */ void fctMove() { - //int mx, cx, cy; int cx; if ((s.mlieu == 26) && (msg[4] == g_vm->_menu._depl[6])) { @@ -180,7 +179,6 @@ L2: * @remarks Originally called 'tprendre' */ void fctTake() { - //int cx, cy, cz; int cx; if (caff > 99) { @@ -354,8 +352,6 @@ void fctLift() { * @remarks Originally called 'tlire' */ void fctRead() { -// int iaff; - if (caff > 99) st4(caff); else { @@ -622,9 +618,8 @@ void fctOpen() { */ void fctPlace() { bool enterPassageFl; - char st[1410]; Common::String str_; - int i, tay; + int i; if (s.derobj == 0) { crep = 186; @@ -673,8 +668,9 @@ void fctPlace() { // Do you want to enter the hidden passage? int answer = Alert::show(g_vm->getEngineString(S_YES_NO), 1); if (answer== 1) { - deline(582, st, tay); - i = Alert::show(delig, 1); + Common::String alertTxt = delin2(582); + i = Alert::show(alertTxt, 1); + tesok = false; enterPassageFl = Ques::show(); hideMouse(); @@ -700,8 +696,8 @@ void fctPlace() { dessin(0); aniof(1, 2); aniof(1, 1); - deline(577, st, tay); - i = Alert::show(delig, 1); + alertTxt = delin2(577); + i = Alert::show(alertTxt, 1); aniof(2, 1); crep = 166; } @@ -1289,11 +1285,9 @@ void fctSound() { */ void fctDiscuss() { bool te[47]; - int cy, cx, max, haz, suj, co, lig, icm, - i, tay, choi, x, y, c; + int cy, cx, max, haz, suj, co, lig, icm, i, choi, x, y, c; char tou; Common::String lib[47]; - char st[1410]; bool f; finfouil(); @@ -1319,9 +1313,8 @@ void fctDiscuss() { for (int ix = 1; ix <= 46; ++ix) te[ix] = false; for (int ix = 1; ix <= 45; ++ix) { - deline(ix + c_tparler, st, tay); - lib[ix] = delig; - for (i = tay; i <= 40; ++i) + lib[ix] = delin2(ix + c_tparler); + for (i = lib[ix].size(); i <= 40; ++i) lib[ix] = lib[ix] + ' '; } lib[46] = lib[45]; |