aboutsummaryrefslogtreecommitdiff
path: root/engines/mortevielle
diff options
context:
space:
mode:
authorStrangerke2013-07-23 09:13:32 +0200
committerStrangerke2013-07-23 09:13:32 +0200
commitee6bb6719c40dc9bdf859e2f49c637bf2ee16dee (patch)
tree3c26603b8bfcf0a44bc7f66310a9a512372f0f28 /engines/mortevielle
parenta5b18d79051a2cf660ffcffbc30dcd5f7dc69795 (diff)
downloadscummvm-rg350-ee6bb6719c40dc9bdf859e2f49c637bf2ee16dee.tar.gz
scummvm-rg350-ee6bb6719c40dc9bdf859e2f49c637bf2ee16dee.tar.bz2
scummvm-rg350-ee6bb6719c40dc9bdf859e2f49c637bf2ee16dee.zip
MORTEVIELLE: Janitorial: Misc cosmetic changes
Diffstat (limited to 'engines/mortevielle')
-rw-r--r--engines/mortevielle/actions.cpp8
-rw-r--r--engines/mortevielle/mortevielle.cpp2
-rw-r--r--engines/mortevielle/outtext.cpp3
-rw-r--r--engines/mortevielle/outtext.h2
-rw-r--r--engines/mortevielle/saveload.h2
5 files changed, 9 insertions, 8 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index b2adebfe83..62caa4829f 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -609,10 +609,10 @@ void MortevielleEngine::fctOpen() {
} while (!((tmpPlace > 6) || (_openObjects[tmpPlace] == 0) || (_openObjects[tmpPlace] == _num)));
if (_openObjects[tmpPlace] != _num) {
if (!( ((_num == 3) && ((_coreVar._currPlace == OWN_ROOM)
- || (_coreVar._currPlace == ROOM9)
- || (_coreVar._currPlace == BLUE_ROOM)
+ || (_coreVar._currPlace == ROOM9)
+ || (_coreVar._currPlace == BLUE_ROOM)
|| (_coreVar._currPlace == BATHROOM)))
- || ((_num == 4) && ((_coreVar._currPlace == GREEN_ROOM)
+ || ((_num == 4) && ((_coreVar._currPlace == GREEN_ROOM)
|| (_coreVar._currPlace == PURPLE_ROOM)
|| (_coreVar._currPlace == RED_ROOM)))
|| ((_coreVar._currPlace == DARKBLUE_ROOM) && (_num == 5))
@@ -1344,7 +1344,7 @@ void MortevielleEngine::fctDiscuss() {
int x, y;
Common::String lib[47];
- int choice;
+ int choice;
int displId;
endSearch();
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index 418b0a079f..3a839a23da 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -354,7 +354,7 @@ Common::Error MortevielleEngine::run() {
// Run the main game loop
mainGame();
-
+
// Cleanup (allocated in initialize())
_screenSurface.free();
free(_speechManager._cfiphBuffer);
diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp
index 9673917741..c74165e827 100644
--- a/engines/mortevielle/outtext.cpp
+++ b/engines/mortevielle/outtext.cpp
@@ -263,9 +263,10 @@ void TextHandler::taffich() {
}
for (int i = 0; i <= 15; ++i) {
int k = 0;
- for (int j = 0; j <= 15; ++j)
+ for (int j = 0; j <= 15; ++j) {
if (alllum[j] > alllum[k])
k = j;
+ }
_vm->_mem[(kAdrPictureComp * 16) + 2 + (k << 1)] = rang[i];
alllum[k] = -1;
}
diff --git a/engines/mortevielle/outtext.h b/engines/mortevielle/outtext.h
index a4b078682a..514aae3a4c 100644
--- a/engines/mortevielle/outtext.h
+++ b/engines/mortevielle/outtext.h
@@ -42,7 +42,7 @@ private:
public:
void setParent(MortevielleEngine *vm);
void displayStr(Common::String inputStr, int x, int y, int dx, int dy, int typ);
- void loadDesFile(Common::String filename, int32 passe, int long_);
+ void loadDesFile(Common::String filename, int32 skipSize, int length);
void loadAniFile(Common::String filename, int32 skipSize, int length);
void taffich();
};
diff --git a/engines/mortevielle/saveload.h b/engines/mortevielle/saveload.h
index 6613b62ac7..0121a04d8e 100644
--- a/engines/mortevielle/saveload.h
+++ b/engines/mortevielle/saveload.h
@@ -61,7 +61,7 @@ public:
Common::Error loadGame(const Common::String &filename);
Common::Error saveGame(int n, const Common::String &saveName);
Common::Error loadGame(int slot);
- Common::Error saveGame(int slot);
+ Common::Error saveGame(int slot);
void writeSavegameHeader(Common::OutSaveFile *out, const Common::String &saveName);
static bool readSavegameHeader(Common::InSaveFile *in, SavegameHeader &header);