libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-07 10:48:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MORTEVIELLE: remove error messages uselessly loaded

Browse Source
This commit is contained in:
Strangerke 2012-02-27 23:19:33 +01:00
parent 1384677991
commit 05848e5d2d
6 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/mortevielle/mor.cpp
View File

@ -47,7 +47,8 @@ const int ioresult = 0;
void testfi() {
if (ioresult != 0) {
caff = Alert::show(err_mess, 1);
// Theoritical message
warning("IO Error");
g_vm->quitGame();
}
}

26
engines/mortevielle/mor2.cpp
View File

@ -77,18 +77,18 @@ void tinke() {
else
stpo = chr(cf + 48);
stpou = Common::String(d3);
stpou += d5;
stpou += d4;
stpou += d3;
stpou += d1;
stpou += stpo;
stpou += '0';
stpou += d2;
stpou += d4;
stpou += d3;
stpou += d6;
stpou += d4;
_hintPctMessage = Common::String(d3);
_hintPctMessage += d5;
_hintPctMessage += d4;
_hintPctMessage += d3;
_hintPctMessage += d1;
_hintPctMessage += stpo;
_hintPctMessage += '0';
_hintPctMessage += d2;
_hintPctMessage += d4;
_hintPctMessage += d3;
_hintPctMessage += d6;
_hintPctMessage += d4;
}
if (m > _minute) {
_minute = 30;
@ -648,7 +648,7 @@ void tfleche() {
} while (!(qust || rect || anyone));
if (qust && (touch == '\103'))
Alert::show(stpou, 1);
Alert::show(_hintPctMessage, 1);
} while (!((touch == '\73') || ((touch == '\104') && (x != 0) && (y != 0)) || (anyone) || (rect)));
if (touch == '\73')

7
engines/mortevielle/mortevielle.cpp
View File

@ -134,10 +134,7 @@ Common::ErrorCode MortevielleEngine::initialise() {
return result;
// Load some error messages (was previously in chartex())
al_mess = deline(578); // Insert floppy #1
err_mess = deline(579); // Floppy error
ind_mess = deline(580); // You should have noticed %d hints
al_mess2 = deline(581); // Insert floppy #2
_hintPctMessage = deline(580); // You should have noticed %d hints
// Set default EGA palette
_paletteManager.setDefaultPalette();
@ -588,7 +585,7 @@ void MortevielleEngine::handleAction() {
if (choisi && (msg[3] == MENU_LOAD))
g_vm->_savegameManager.loadGame((msg[4] & 7) - 1);
if (inkey == '\103') { /* F9 */
temps = Alert::show(stpou, 1);
temps = Alert::show(_hintPctMessage, 1);
return;
} else if (inkey == '\77') {
if ((mnumo != OPCODE_NONE) && ((msg[3] == MENU_ACTION) || (msg[3] == MENU_SUB_ACTION))) {

3
engines/mortevielle/prog.cpp
View File

@ -35,6 +35,7 @@
#include "mortevielle/taffich.h"
#include "mortevielle/var_mor.h"
#include "mortevielle/mouse.h"
#include "mortevielle/outtext.h"
namespace Mortevielle {
@ -112,7 +113,7 @@ void MortevielleEngine::gameLoaded() {
iouv = 0;
dobj = 0;
affrep();
stpou = ind_mess;
_hintPctMessage = deline(580);
while ((test[k] == false) && (k < 2)) {
++k;

6
engines/mortevielle/var_mor.cpp
View File

@ -174,13 +174,9 @@ int x,
int t_cph[6401];
byte tabdon[4001];
Common::String stpou; // Provides the % of hints
Common::String _hintPctMessage; // Provides the % of hints
byte is;
byte mode;
Common::String al_mess,
err_mess,
ind_mess,
al_mess2;
int nbrep[9];
int nbrepm[9];

6
engines/mortevielle/var_mor.h
View File

@ -324,13 +324,9 @@ extern int x,
extern int t_cph[6401];
extern byte tabdon[4001];
extern Common::String stpou; /* donne le % d'indices */
extern Common::String _hintPctMessage; // gives the pct of hints found
extern byte is;
extern byte mode;
extern Common::String al_mess,
err_mess,
ind_mess,
al_mess2;
extern int nbrep[9];
extern int nbrepm[9];