aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2012-03-27 22:54:50 +0200
committerStrangerke2012-04-06 08:23:56 +0200
commitcdea613e51db56477ab213a3a0e87c3773348d08 (patch)
tree5ed0273ec5c50d10a586e4a7343d0adc00c40312
parenta1c268e08296c08e147a537c1bb4bba23794d891 (diff)
downloadscummvm-rg350-cdea613e51db56477ab213a3a0e87c3773348d08.tar.gz
scummvm-rg350-cdea613e51db56477ab213a3a0e87c3773348d08.tar.bz2
scummvm-rg350-cdea613e51db56477ab213a3a0e87c3773348d08.zip
MORTEVIELLE: Remove trailing spaces
-rw-r--r--engines/mortevielle/actions.cpp18
-rw-r--r--engines/mortevielle/detection.cpp2
-rw-r--r--engines/mortevielle/dialogs.cpp4
-rw-r--r--engines/mortevielle/dialogs.h2
-rw-r--r--engines/mortevielle/graphics.cpp50
-rw-r--r--engines/mortevielle/menu.cpp12
-rw-r--r--engines/mortevielle/mortevielle.cpp58
-rw-r--r--engines/mortevielle/mortevielle.h18
-rw-r--r--engines/mortevielle/mouse.cpp4
-rw-r--r--engines/mortevielle/outtext.cpp4
-rw-r--r--engines/mortevielle/saveload.cpp20
-rw-r--r--engines/mortevielle/sound.cpp2
-rw-r--r--engines/mortevielle/sound.h4
-rw-r--r--engines/mortevielle/speech.cpp8
14 files changed, 103 insertions, 103 deletions
diff --git a/engines/mortevielle/actions.cpp b/engines/mortevielle/actions.cpp
index 011728870c..48d73a20fd 100644
--- a/engines/mortevielle/actions.cpp
+++ b/engines/mortevielle/actions.cpp
@@ -70,10 +70,10 @@ void MortevielleEngine::fctMove() {
_coreVar._currPlace = ATTIC;
_menu.setDestinationText(ATTIC);
}
-
+
if (_num != 6)
_coreVar._currPlace = ROOM26;
-
+
if ((_num > 1) && (_num < 6))
_ment = _num - 1;
else if (_num > 7)
@@ -116,10 +116,10 @@ void MortevielleEngine::fctMove() {
menuChoice = 6;
else if (((_coreVar._currPlace == LANDING) || (_coreVar._currPlace == ROOM26)) && (menuChoice == 4))
menuChoice = 6;
-
+
if ((_coreVar._currPlace > MOUNTAIN) && (_coreVar._currPlace != ROOM26))
menuChoice += 10;
-
+
if ((_coreVar._currPlace == CHAPEL) && (menuChoice == 13))
menuChoice = 16;
else if (_coreVar._currPlace == MANOR_FRONT) {
@@ -710,7 +710,7 @@ void MortevielleEngine::fctPlace() {
drawClock();
if (_currBitIndex != 0)
showPeoplePresent(_currBitIndex);
- else
+ else
displayAloneText();
_menu.displayMenu();
@@ -1109,7 +1109,7 @@ void MortevielleEngine::fctEat() {
else
h = 1;
}
-
+
_jh += h;
_crep = 135;
prepareRoom();
@@ -1145,7 +1145,7 @@ void MortevielleEngine::fctEnter() {
_x = (getRandomNumber(0, 10)) - 5;
_speechManager.startSpeech(7, _x, 1);
aniof(1, 1);
-
+
_x = convertBitIndexToCharacterIndex(z);
++_coreVar._faithScore;
_coreVar._currPlace = LANDING;
@@ -1166,7 +1166,7 @@ void MortevielleEngine::fctEnter() {
_x = (getRandomNumber(0, 10)) - 5;
_speechManager.startSpeech(7, _x, 1);
aniof(1, 1);
-
+
_coreVar._currPlace = _ment;
affrep();
resetRoomVariables(_coreVar._currPlace);
@@ -1590,7 +1590,7 @@ void MortevielleEngine::endGame() {
repon(2, 35);
startMusicOrSpeech(0);
testKey(false);
- // A wait message was displayed.
+ // A wait message was displayed.
// testKey (aka tkey1) was called before and after.
// Most likely the double call is useless, thus removed
//
diff --git a/engines/mortevielle/detection.cpp b/engines/mortevielle/detection.cpp
index 5997b4c349..994563d497 100644
--- a/engines/mortevielle/detection.cpp
+++ b/engines/mortevielle/detection.cpp
@@ -41,7 +41,7 @@ static const PlainGameDescriptor MortevielleGame[] = {
class MortevielleMetaEngine : public AdvancedMetaEngine {
public:
- MortevielleMetaEngine() : AdvancedMetaEngine(Mortevielle::MortevielleGameDescriptions, sizeof(ADGameDescription),
+ MortevielleMetaEngine() : AdvancedMetaEngine(Mortevielle::MortevielleGameDescriptions, sizeof(ADGameDescription),
MortevielleGame) {
_md5Bytes = 512;
_singleid = "mortevielle";
diff --git a/engines/mortevielle/dialogs.cpp b/engines/mortevielle/dialogs.cpp
index b90f165b6c..b53a9d5e80 100644
--- a/engines/mortevielle/dialogs.cpp
+++ b/engines/mortevielle/dialogs.cpp
@@ -418,7 +418,7 @@ void f3f8::draw() {
}
/**
- * Alert function - Loop until F8 is pressed, update
+ * Alert function - Loop until F8 is pressed, update
* Graphical Device if modified
* @remarks Originally called 'diver'
*/
@@ -462,7 +462,7 @@ void f3f8::aff50(bool drawAni50Fl) {
ani50();
else
g_vm->repon(2, kDialogStringIndex + 142);
-
+
// Draw the f3/f8 dialog
draw();
}
diff --git a/engines/mortevielle/dialogs.h b/engines/mortevielle/dialogs.h
index 40109c894b..db13c09b54 100644
--- a/engines/mortevielle/dialogs.h
+++ b/engines/mortevielle/dialogs.h
@@ -58,6 +58,6 @@ public:
static void aff50(bool drawAni50Fl);
static void ani50();
};
-
+
} // End of namespace Mortevielle
#endif
diff --git a/engines/mortevielle/graphics.cpp b/engines/mortevielle/graphics.cpp
index 2b6607513b..e290f60e69 100644
--- a/engines/mortevielle/graphics.cpp
+++ b/engines/mortevielle/graphics.cpp
@@ -31,8 +31,8 @@
namespace Mortevielle {
/*-------------------------------------------------------------------------*
- * Palette Manager
- *
+ * Palette Manager
+ *
*-------------------------------------------------------------------------*/
/**
@@ -71,7 +71,7 @@ void PaletteManager::setDefaultPalette() {
/*-------------------------------------------------------------------------*
* Image decoding
- *
+ *
* The code in this section is responsible for decoding image resources.
* Images are broken down into rectangular sections, which can use one
* of 18 different encoding methods.
@@ -138,7 +138,7 @@ void GfxSurface::decode(const byte *pSrc) {
_xSize = READ_BE_UINT16(pSrc + 2) + 1;
_ySize = READ_BE_UINT16(pSrc + 4) + 1;
majTtxTty();
-
+
pSrc += 6;
pDest = &outputBuffer[0];
@@ -159,7 +159,7 @@ void GfxSurface::decode(const byte *pSrc) {
const byte *pSrcSaved = pSrc;
bool savedNibbleFlag = _nibbleFlag;
int savedLookupIndex = _lookupIndex;
-
+
do {
pSrc = pSrcSaved;
_nibbleFlag = savedNibbleFlag;
@@ -237,7 +237,7 @@ void GfxSurface::decode(const byte *pSrc) {
pDest = &outputBuffer[_yp * DEFAULT_WIDTH + _xp];
pSrcStart = pSrc;
INCR_TAIX;
-
+
for (int yCtr = 0; yCtr < _ySize; ++yCtr, pDest += DEFAULT_WIDTH) {
byte *pDestLine = pDest;
for (int xCtr = 0; xCtr < _xSize; ++xCtr) {
@@ -490,7 +490,7 @@ void GfxSurface::horizontal(const byte *&pSrc, byte *&pDest, const byte *&pLooku
break;
continue;
}
-
+
bool continueFlag = false;
do {
for (int xIndex = 0; xIndex < _xSize; ++xIndex) {
@@ -599,7 +599,7 @@ void GfxSurface::vertical(const byte *&pSrc, byte *&pDest, const byte *&pLookup)
pDest += _thickness;
drawIndex += _thickness;
}
-
+
while (_xSize < (drawIndex + _thickness)) {
if (--_thickness == 0)
return;
@@ -622,7 +622,7 @@ void GfxSurface::vertical(const byte *&pSrc, byte *&pDest, const byte *&pLookup)
for (int xCtr = 0; xCtr < _thickness; ++xCtr)
*--pDest = csuiv(pSrc, pLookup);
}
- }
+ }
if ((_ySize % 2) == 0) {
pDest += _thickness;
drawIndex += _thickness;
@@ -743,7 +743,7 @@ void GfxSurface::diag(const byte *&pSrc, byte *&pDest, const byte *&pLookup) {
NIH();
increments(pDest);
}
-
+
NIH();
NIV();
increments(pDest);
@@ -780,7 +780,7 @@ void GfxSurface::diag(const byte *&pSrc, byte *&pDest, const byte *&pLookup) {
NIH();
increments(pDest);
}
-
+
NIH();
NIV();
increments(pDest);
@@ -791,13 +791,13 @@ void GfxSurface::diag(const byte *&pSrc, byte *&pDest, const byte *&pLookup) {
break;
} else {
pDest += _xInc;
-
+
if (--drawIndex == 0) {
TF2(pSrc, pDest, pLookup, diagIndex);
NIH();
break;
}
- }
+ }
NIH();
}
@@ -885,7 +885,7 @@ void ScreenSurface::updateScreen() {
// Iterate through copying dirty areas to the screen
for (Common::List<Common::Rect>::iterator i = _dirtyRects.begin(); i != _dirtyRects.end(); ++i) {
Common::Rect r = *i;
- g_system->copyRectToScreen((const byte *)getBasePtr(r.left, r.top), pitch,
+ g_system->copyRectToScreen((const byte *)getBasePtr(r.left, r.top), pitch,
r.left, r.top, r.width(), r.height());
}
_dirtyRects.clear();
@@ -896,7 +896,7 @@ void ScreenSurface::updateScreen() {
/**
* Draws a decoded picture on the screen
- * @remarks - Because the ScummVM surface is using a double height 640x400 surface to
+ * @remarks - Because the ScummVM surface is using a double height 640x400 surface to
* simulate the original 640x400 surface, all Y values have to be doubled.
* - Image resources are stored at 320x200, so when drawn onto the screen a single pixel
* from the source image is drawn using the two pixels at the given index in the palette map
@@ -909,13 +909,13 @@ void ScreenSurface::drawPicture(GfxSurface &surface, int x, int y) {
y += surface._offset.y;
// Lock the affected area of the surface to write to
- Graphics::Surface destSurface = lockArea(Common::Rect(x * 2, y * 2,
+ Graphics::Surface destSurface = lockArea(Common::Rect(x * 2, y * 2,
(x + surface.w) * 2, (y + surface.h) * 2));
// Get a lookup for the palette mapping
const byte *paletteMap = &g_vm->_mem[0x7000 * 16 + 2];
- // Loop through writing
+ // Loop through writing
for (int yp = 0; yp < surface.h; ++yp) {
if (((y + yp) < 0) || ((y + yp) >= 200))
continue;
@@ -948,7 +948,7 @@ void ScreenSurface::drawPicture(GfxSurface &surface, int x, int y) {
void ScreenSurface::copyFrom(Graphics::Surface &src, int x, int y) {
Graphics::Surface destSurface = lockArea(Common::Rect(x, y, x + src.w, y + src.h));
- // Loop through writing
+ // Loop through writing
for (int yp = 0; yp < src.h; ++yp) {
if (((y + yp) < 0) || ((y + yp) >= SCREEN_HEIGHT))
continue;
@@ -961,11 +961,11 @@ void ScreenSurface::copyFrom(Graphics::Surface &src, int x, int y) {
/**
* Draws a character at the specified co-ordinates
- * @remarks Because the ScummVM surface is using a double height 640x400 surface to
+ * @remarks Because the ScummVM surface is using a double height 640x400 surface to
* simulate the original 640x400 surface, all Y values have to be doubled
*/
void ScreenSurface::writeCharacter(const Common::Point &pt, unsigned char ch, int palIndex) {
- Graphics::Surface destSurface = lockArea(Common::Rect(pt.x, pt.y * 2,
+ Graphics::Surface destSurface = lockArea(Common::Rect(pt.x, pt.y * 2,
pt.x + FONT_WIDTH, (pt.y + FONT_HEIGHT) * 2));
// Get the start of the character to use
@@ -988,7 +988,7 @@ void ScreenSurface::writeCharacter(const Common::Point &pt, unsigned char ch, in
/**
* Draws a box at the specified position and size
- * @remarks Because the ScummVM surface is using a double height 640x400 surface to
+ * @remarks Because the ScummVM surface is using a double height 640x400 surface to
* simulate the original 640x400 surface, all Y values have to be doubled
*/
void ScreenSurface::drawBox(int x, int y, int dx, int dy, int col) {
@@ -1011,13 +1011,13 @@ void ScreenSurface::drawBox(int x, int y, int dx, int dy, int col) {
/**
* Fills an area with the specified colour
- * @remarks Because the ScummVM surface is using a double height 640x400 surface to
+ * @remarks Because the ScummVM surface is using a double height 640x400 surface to
* simulate the original 640x400 surface, all Y values have to be doubled
*/
void ScreenSurface::fillRect(int colour, const Common::Rect &bounds) {
Graphics::Surface destSurface = lockArea(Common::Rect(bounds.left, bounds.top * 2,
bounds.right, bounds.bottom * 2));
-
+
// Fill the area
destSurface.fillRect(Common::Rect(0, 0, destSurface.w, destSurface.h), colour);
}
@@ -1032,7 +1032,7 @@ void ScreenSurface::clearScreen() {
/**
* Sets a single pixel at the specified co-ordinates
- * @remarks Because the ScummVM surface is using a double height 640x400 surface to
+ * @remarks Because the ScummVM surface is using a double height 640x400 surface to
* simulate the original 640x400 surface, all Y values have to be doubled
*/
void ScreenSurface::setPixel(const Common::Point &pt, int palIndex) {
@@ -1115,7 +1115,7 @@ void ScreenSurface::drawLine(int x, int y, int xx, int yy, int coul) {
yr = y;
xro = xx;
yro = yy;
-
+
if (abs(y - yy) > abs(x - xx)) {
a = (float)((x - xx)) / (y - yy);
b = (yr * xro - yro * xr) / (y - yy);
diff --git a/engines/mortevielle/menu.cpp b/engines/mortevielle/menu.cpp
index d7ece8a7eb..4dcb034f76 100644
--- a/engines/mortevielle/menu.cpp
+++ b/engines/mortevielle/menu.cpp
@@ -177,7 +177,7 @@ void Menu::displayMenu() {
int pt, x, y, color, msk, num_letr;
g_vm->_mouse.hideMouse();
-
+
g_vm->_screenSurface.fillRect(7, Common::Rect(0, 0, 639, 10));
col = 28 * g_vm->_res;
if (g_vm->_currGraphicalDevice == MODE_CGA)
@@ -434,9 +434,9 @@ void Menu::mdn() {
return;
else
g_vm->_prevPos = curPos;
-
- bool tes = (curPos.y < 11)
- && ((curPos.x >= (28 * g_vm->_res) && curPos.x <= (28 * g_vm->_res + 24))
+
+ bool tes = (curPos.y < 11)
+ && ((curPos.x >= (28 * g_vm->_res) && curPos.x <= (28 * g_vm->_res + 24))
|| (curPos.x >= (76 * g_vm->_res) && curPos.x <= (76 * g_vm->_res + 24))
|| ((curPos.x > 124 * g_vm->_res) && (curPos.x < 124 * g_vm->_res + 24))
|| ((curPos.x > 172 * g_vm->_res) && (curPos.x < 172 * g_vm->_res + 24))
@@ -481,7 +481,7 @@ void Menu::mdn() {
menuDown(_msg3);
g_vm->setMouseClick(false);
- } else {
+ } else {
// A menu was clicked on
_menuSelected = (_multiTitle) && (_msg4 != OPCODE_NONE);
menuUp(_msg3);
@@ -551,7 +551,7 @@ void Menu::initMenu() {
* @remarks Originally called 'mfoudi'
*/
void Menu::setSearchMenu() {
- for (int i = 1; i <= 7; ++i)
+ for (int i = 1; i <= 7; ++i)
disableMenuItem(_moveMenu[i]);
for (int i = 1; i <= 11; ++i)
diff --git a/engines/mortevielle/mortevielle.cpp b/engines/mortevielle/mortevielle.cpp
index 2c3313ea45..af4db82bae 100644
--- a/engines/mortevielle/mortevielle.cpp
+++ b/engines/mortevielle/mortevielle.cpp
@@ -86,7 +86,7 @@ MortevielleEngine::MortevielleEngine(OSystem *system, const ADGameDescription *g
_toiletsPresenceBobMax = false;
_bathRoomPresenceBobMax = false;
_room9PresenceLeo = false;
-
+
_soundOff = false;
_largestClearScreen = false;
_hiddenHero = false;
@@ -144,7 +144,7 @@ bool MortevielleEngine::canSaveGameStateCurrently() {
* Load in a savegame at the specified slot number
*/
Common::Error MortevielleEngine::loadGameState(int slot) {
- return _savegameManager.loadGame(slot);
+ return _savegameManager.loadGame(slot);
}
/**
@@ -153,7 +153,7 @@ Common::Error MortevielleEngine::loadGameState(int slot) {
Common::Error MortevielleEngine::saveGameState(int slot, const Common::String &desc) {
if (slot == 0)
return Common::kWritingFailed;
-
+
return _savegameManager.saveGame(slot, desc);
}
@@ -296,7 +296,7 @@ void MortevielleEngine::readStaticStrings(Common::File &f, int dataSize, DataTyp
char ch;
while ((ch = (char)f.readByte()) != '\0')
s += ch;
-
+
if (dataType == kStaticStrings)
_engineStrings.push_back(s);
else if (dataType == kGameStrings)
@@ -319,7 +319,7 @@ bool MortevielleEngine::keyPressed() {
// Check if it's time to draw the next frame
if (g_system->getMillis() > (_lastGameFrame + GAME_FRAME_DELAY)) {
_lastGameFrame = g_system->getMillis();
-
+
_screenSurface.updateScreen();
}
@@ -327,7 +327,7 @@ bool MortevielleEngine::keyPressed() {
g_system->delayMillis(5);
// Return if there are any pending key presses
- return !_keypresses.empty();
+ return !_keypresses.empty();
}
/**
@@ -387,7 +387,7 @@ void MortevielleEngine::addKeypress(Common::Event &evt) {
// Handle alphabetic keys
if ((evt.kbd.keycode >= Common::KEYCODE_a) && (evt.kbd.keycode <= Common::KEYCODE_z)) {
- if (evt.kbd.hasFlags(Common::KBD_CTRL))
+ if (evt.kbd.hasFlags(Common::KBD_CTRL))
ch = evt.kbd.keycode - Common::KEYCODE_a + 1;
else
ch = evt.kbd.keycode - Common::KEYCODE_a + 'A';
@@ -560,7 +560,7 @@ void MortevielleEngine::mainGame() {
if (_reloadCFIEC)
loadCFIEC();
- for (_crep = 1; _crep <= _c_zzz; ++_crep)
+ for (_crep = 1; _crep <= _c_zzz; ++_crep)
decodeNumber(&_cfiecBuffer[161 * 16], ((822 * 128) - (161 * 16)) / 64);
loadBRUIT5();
@@ -719,7 +719,7 @@ void MortevielleEngine::loadPlaces() {
for (int i = 0; i < 7; ++i) {
for (int j = 0; j < 25; ++j)
- _v_lieu[i][j] = f.readByte();
+ _v_lieu[i][j] = f.readByte();
}
f.close();
@@ -846,7 +846,7 @@ void MortevielleEngine::resetPresenceInRooms(int roomId) {
}
/**
- * Engine function - Show the people present in the given room
+ * Engine function - Show the people present in the given room
* @remarks Originally called 'affper'
*/
void MortevielleEngine::showPeoplePresent(int bitIndex) {
@@ -937,8 +937,8 @@ int MortevielleEngine::getPresenceStatsGreenRoom() {
int retVal = 0;
updateHour(day, hour, minute);
- // The original uses an || instead of an &&, resulting
- // in an always true condition. Based on the other tests,
+ // The original uses an || instead of an &&, resulting
+ // in an always true condition. Based on the other tests,
// and on other scenes, we use an && instead.
if ((hour > 7) && (hour < 11))
retVal = 25;
@@ -978,7 +978,7 @@ int MortevielleEngine::getPresenceStatsPurpleRoom() {
retVal = 20;
else if ((hour >= 0) && (hour < 8))
retVal = 50;
-
+
return retVal;
}
@@ -1707,7 +1707,7 @@ void MortevielleEngine::startDialog(int16 rep) {
Common::String dialogStr = getString(rep + kDialogStringIndex);
_text.displayStr(dialogStr, 230, 4, 65, 24, 5);
f3f8::draw();
-
+
key = 0;
do {
_speechManager.startSpeech(rep, haut[_caff - 69], 0);
@@ -1808,7 +1808,7 @@ void MortevielleEngine::gotoManorBack() {
}
/**
- * Engine function - Dead : Flooded in Well
+ * Engine function - Dead : Flooded in Well
* @remarks Originally called 't1deau'
*/
void MortevielleEngine::floodedInWell() {
@@ -2095,7 +2095,7 @@ void MortevielleEngine::clearScreenType10() {
st = getEngineString(S_LOURDE);
else if (_coreVar._faithScore > 65)
st = getEngineString(S_MALSAINE);
-
+
co = 580 - (_screenSurface.getStringWidth(st) / 2);
_screenSurface.putxy(co, 92);
_screenSurface.drawString(st, 4);
@@ -2145,7 +2145,7 @@ void MortevielleEngine::decodeNumber(byte *pStart, int count) {
*pStart = 0;
else if (v & 0xff00)
*pStart = 0xff;
- else
+ else
*pStart = (byte)v;
}
}
@@ -2312,7 +2312,7 @@ void MortevielleEngine::setPal(int n) {
if (n < 89)
palette(_cgaPal[n]._p);
-
+
for (int i = 0; i <= 15; ++i)
displayCGAPattern(i, _patternArr[pal[i]._id], pal);
}
@@ -2361,7 +2361,7 @@ void MortevielleEngine::loadPalette() {
}
}
f.close();
-
+
if (!f.open("cxx.mor"))
error("Missing file - cxx.mor");
@@ -2408,16 +2408,16 @@ void MortevielleEngine::loadTexts() {
warning("Missing file - TXX.INP or .MOR - Switching to DAT file");
return;
}
- }
+ }
if (!ntpFile.open("TXX.NTP")) {
warning("Missing file - TXX.INP or .MOR - Switching to DAT file");
return;
}
-
+
if ((inpFile.size() > (kMaxTi * 2)) || (ntpFile.size() > (kMaxTd * 3))) {
warning("TXX file - Unexpected format - Switching to DAT file");
return;
- }
+ }
for (int i = 0; i < inpFile.size() / 2; ++i)
_inpBuffer[i] = inpFile.readUint16LE();
@@ -2478,7 +2478,7 @@ void MortevielleEngine::music() {
return;
_reloadCFIEC = true;
-
+
Common::File fic;
if (!fic.open("mort.img"))
error("Missing file - mort.img");
@@ -2730,7 +2730,7 @@ void MortevielleEngine::drawClock() {
int h, co;
_mouse.hideMouse();
-
+
_screenSurface.drawRectangle(570, 118, 20, 10);
_screenSurface.drawRectangle(578, 114, 6, 18);
if ((_currGraphicalDevice == MODE_CGA) || (_currGraphicalDevice == MODE_HERCULES))
@@ -2740,7 +2740,7 @@ void MortevielleEngine::drawClock() {
if (_minute == 0)
_screenSurface.drawLine(((uint)x >> 1) * _res, y, ((uint)x >> 1) * _res, (y - rg), co);
- else
+ else
_screenSurface.drawLine(((uint)x >> 1) * _res, y, ((uint)x >> 1) * _res, (y + rg), co);
h = _hour;
@@ -3058,7 +3058,7 @@ int MortevielleEngine::checkLeoMaxRandomPresence() {
int retval = getRandomNumber(1, 2);
if (retval == 2)
retval = 128;
-
+
return retval;
}
@@ -3230,7 +3230,7 @@ void MortevielleEngine::writetp(Common::String s, int t) {
void MortevielleEngine::aniof(int ouf, int num) {
if ((_caff == 7) && ((num == 4) || (num == 5)))
return;
-
+
if ((_caff == 10) && (num == 7))
num = 6;
else if (_caff == 12) {
@@ -3280,7 +3280,7 @@ void MortevielleEngine::dessin() {
else if ((_caff == 24) && (_coreVar._wellObjectId != 0))
aniof(1, 1);
}
-
+
if (_caff < ROOM26)
startMusicOrSpeech(1);
}
@@ -3311,7 +3311,7 @@ void MortevielleEngine::testKey(bool d) {
_mouse.getMousePosition(x, y, c);
keyPressed();
} while (c != 0);
-
+
// Event loop
do {
if (d)
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index 98d4b042bb..68ea2277e9 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -61,7 +61,7 @@ namespace Mortevielle {
#define chr(v) ((unsigned char) v)
#define lo(v) ((v) & 0xff)
#define hi(v) (((v) >> 8) & 0xff)
-#define swap(v) (((lo(v)) << 8) | ((hi(v)) >> 8))
+#define swap(v) (((lo(v)) << 8) | ((hi(v)) >> 8))
#define odd(v) (((v) % 2) == 1)
// Debug channels
@@ -79,12 +79,12 @@ enum {
// Static string list
enum {
- S_YES_NO = 0, S_GO_TO = 1, S_SOMEONE_ENTERS = 2, S_COOL = 3, S_LOURDE = 4,
+ S_YES_NO = 0, S_GO_TO = 1, S_SOMEONE_ENTERS = 2, S_COOL = 3, S_LOURDE = 4,
S_MALSAINE = 5, S_IDEM = 6, S_YOU = 7, S_ARE = 8, S_ALONE = 9,
S_HEAR_NOISE = 10, S_SHOULD_HAVE_NOTICED = 11, S_NUMBER_OF_HINTS = 12,
- S_WANT_TO_WAKE_UP = 13, S_OK = 14, S_SAVE_LOAD = 15, S_RESTART = 18, S_F3 = 19,
- S_F8 = 20, S_HIDE_SELF = 21, S_TAKE = 22, S_PROBE = 23, S_RAISE = 24, S_SUITE = 25,
- S_STOP = 26, S_USE_DEP_MENU = 27, S_LIFT = 28, S_READ = 29,
+ S_WANT_TO_WAKE_UP = 13, S_OK = 14, S_SAVE_LOAD = 15, S_RESTART = 18, S_F3 = 19,
+ S_F8 = 20, S_HIDE_SELF = 21, S_TAKE = 22, S_PROBE = 23, S_RAISE = 24, S_SUITE = 25,
+ S_STOP = 26, S_USE_DEP_MENU = 27, S_LIFT = 28, S_READ = 29,
S_LOOK = 30, S_SEARCH = 31, S_OPEN = 32, S_PUT = 33, S_TURN = 34, S_TIE = 35, S_CLOSE = 36,
S_HIT = 37, S_POSE = 38, S_SMASH = 39,
@@ -133,7 +133,7 @@ const int kSecretPassageQuestionStringIndex = 510; // Unusued?
const int kMaxPatt = 20;
const int OPCODE_NONE = 0;
-enum verbs {OPCODE_ATTACH = 0x301, OPCODE_WAIT = 0x302, OPCODE_FORCE = 0x303, OPCODE_SLEEP = 0x304, OPCODE_LISTEN = 0x305,
+enum verbs {OPCODE_ATTACH = 0x301, OPCODE_WAIT = 0x302, OPCODE_FORCE = 0x303, OPCODE_SLEEP = 0x304, OPCODE_LISTEN = 0x305,
OPCODE_ENTER = 0x306, OPCODE_CLOSE = 0x307, OPCODE_SEARCH = 0x308, OPCODE_KNOCK = 0x309, OPCODE_SCRATCH = 0x30a,
OPCODE_READ = 0x30b, OPCODE_EAT = 0x30c, OPCODE_PLACE = 0x30d, OPCODE_OPEN = 0x30e, OPCODE_TAKE = 0x30f,
OPCODE_LOOK = 0x310, OPCODE_SMELL = 0x311, OPCODE_SOUND = 0x312, OPCODE_LEAVE = 0x313, OPCODE_LIFT = 0x314,
@@ -141,7 +141,7 @@ enum verbs {OPCODE_ATTACH = 0x301, OPCODE_WAIT = 0x302, OPCODE_FORCE = 0x303,
OPCODE_SLOOK = 0x405};
static const int _actionMenu[12] = { OPCODE_NONE,
- OPCODE_SHIDE, OPCODE_ATTACH, OPCODE_FORCE, OPCODE_SLEEP,
+ OPCODE_SHIDE, OPCODE_ATTACH, OPCODE_FORCE, OPCODE_SLEEP,
OPCODE_ENTER, OPCODE_CLOSE, OPCODE_KNOCK, OPCODE_EAT,
OPCODE_PLACE, OPCODE_OPEN, OPCODE_LEAVE
};
@@ -155,8 +155,8 @@ static const int _actionMenu[12] = { OPCODE_NONE,
enum places {
OWN_ROOM = 0, GREEN_ROOM = 1, PURPLE_ROOM = 2, TOILETS = 3, DARKBLUE_ROOM = 4,
BLUE_ROOM = 5, RED_ROOM = 6, BATHROOM = 7, GREEN_ROOM2 = 8, ROOM9 = 9,
- DINING_ROOM = 10, BUREAU = 11, KITCHEN = 12, ATTIC = 13, CELLAR = 14,
- LANDING = 15, CRYPT = 16, SECRET_PASSAGE = 17, ROOM18 = 18, MOUNTAIN = 19,
+ DINING_ROOM = 10, BUREAU = 11, KITCHEN = 12, ATTIC = 13, CELLAR = 14,
+ LANDING = 15, CRYPT = 16, SECRET_PASSAGE = 17, ROOM18 = 18, MOUNTAIN = 19,
CHAPEL = 20, MANOR_FRONT = 21, MANOR_BACK = 22, INSIDE_WELL = 23, WELL = 24,
DOOR = 25, ROOM26 = 26, ROOM27 = 27
};
diff --git a/engines/mortevielle/mouse.cpp b/engines/mortevielle/mouse.cpp
index f914860820..8516643835 100644
--- a/engines/mortevielle/mouse.cpp
+++ b/engines/mortevielle/mouse.cpp
@@ -40,7 +40,7 @@ namespace Mortevielle {
void MouseHandler::initMouse() {
_counter = 0;
_pos = Common::Point(0, 0);
-
+
g_vm->setMouseClick(false);
}
@@ -108,7 +108,7 @@ void MouseHandler::hideMouse() {
case MODE_HERCULES:
j = ((uint)_pos.y >> 1) * 80 + ((uint)_pos.x >> 3);
for (int i = 0; i <= 5; ++i) {
- for (int k = 0; k <= 3; ++k)
+ for (int k = 0; k <= 3; ++k)
WRITE_LE_UINT16(&g_vm->_mem[0xb000 * 16 + k * 0x200 + j], s_s[i][k]);
j += 80;
}
diff --git a/engines/mortevielle/outtext.cpp b/engines/mortevielle/outtext.cpp
index f53a7b2804..eb79963191 100644
--- a/engines/mortevielle/outtext.cpp
+++ b/engines/mortevielle/outtext.cpp
@@ -58,7 +58,7 @@ void TextHandler::displayStr(Common::String inputStr, int x, int y, int dx, int
int i, j;
// Safeguard: add $ just in case
- inputStr += '$';
+ inputStr += '$';
g_vm->_screenSurface.putxy(x, y);
if (g_vm->_res == 1)
@@ -151,7 +151,7 @@ void TextHandler::loadDesFile(Common::String filename, int32 skipSize, int lengt
}
f.close();
- for (int i = remainingSkipSize; i <= length + remainingSkipSize; ++i)
+ for (int i = remainingSkipSize; i <= length + remainingSkipSize; ++i)
g_vm->_mem[0x7000 * 16 + i - remainingSkipSize] = g_vm->_mem[0x6000 * 16 + i];
}
diff --git a/engines/mortevielle/saveload.cpp b/engines/mortevielle/saveload.cpp
index 4c5e6252d5..8ce97fbac0 100644
--- a/engines/mortevielle/saveload.cpp
+++ b/engines/mortevielle/saveload.cpp
@@ -110,7 +110,7 @@ void SavegameManager::loadSavegame(int n) {
g_vm->_tabdon[i + kAcha] = _tabdonSaveBuffer[i];
// Close the stream
- delete stream;
+ delete stream;
}
/**
@@ -120,7 +120,7 @@ Common::Error SavegameManager::loadGame(int n) {
g_vm->_mouse.hideMouse();
g_vm->displayEmptyHand();
loadSavegame(n);
-
+
/* Initialization */
g_vm->charToHour();
g_vm->initGame();
@@ -138,13 +138,13 @@ Common::Error SavegameManager::saveGame(int n, const Common::String &saveName) {
g_vm->_mouse.hideMouse();
g_vm->hourToChar();
-
+
for (i = 0; i <= 389; ++i)
_tabdonSaveBuffer[i] = g_vm->_tabdon[i + kAcha];
g_vm->_saveStruct = g_vm->_coreVar;
if (g_vm->_saveStruct._currPlace == ROOM26)
g_vm->_saveStruct._currPlace = LANDING;
-
+
Common::String filename = generateSaveName(n);
f = g_system->getSavefileManager()->openForSaving(filename);
@@ -162,7 +162,7 @@ Common::Error SavegameManager::saveGame(int n, const Common::String &saveName) {
// Close the save file
f->finalize();
delete f;
-
+
// Skipped: dialog asking to swap floppy
g_vm->_mouse.showMouse();
@@ -252,18 +252,18 @@ SaveStateList SavegameManager::listSaves(const char *target) {
// ScummVm savegame. Read in the header to get the savegame name
SavegameHeader header;
validFlag = readSavegameHeader(in, header);
-
+
if (validFlag) {
delete header.thumbnail;
saveDescription = header.saveName;
}
} else if (file->size() == 497) {
// Form an appropriate savegame name
- saveDescription = (slotNumber == 0) ? "Initial game state" :
+ saveDescription = (slotNumber == 0) ? "Initial game state" :
Common::String::format("Savegame #%d", slotNumber);
validFlag = true;
}
-
+
if (validFlag)
// Got a valid savegame
saveList.push_back(SaveStateDescriptor(slotNumber, saveDescription));
@@ -278,7 +278,7 @@ SaveStateList SavegameManager::listSaves(const char *target) {
SaveStateDescriptor SavegameManager::querySaveMetaInfos(int slot) {
Common::String fileName = Mortevielle::SavegameManager::generateSaveName(slot);
Common::InSaveFile *f = g_system->getSavefileManager()->openForLoading(fileName);
-
+
if (f) {
// Check to see if it's a ScummVM savegame or not
char buffer[4];
@@ -311,7 +311,7 @@ SaveStateDescriptor SavegameManager::querySaveMetaInfos(int slot) {
return desc;
}
}
-
+
return SaveStateDescriptor();
}
diff --git a/engines/mortevielle/sound.cpp b/engines/mortevielle/sound.cpp
index 5f634c595c..9f0738c6c8 100644
--- a/engines/mortevielle/sound.cpp
+++ b/engines/mortevielle/sound.cpp
@@ -178,7 +178,7 @@ void SoundManager::playNote(int frequency, int32 length) {
void SoundManager::musyc(tablint &tb, int nbseg, int att) {
#ifdef DEBUG
const byte *pSrc = &mem[0x5000 * 16];
-
+
// Convert the countdown amount to a tempo rate, and then to note length in microseconds
int tempo = TIMER_FREQUENCY / att;
int length = 1000000 / tempo;
diff --git a/engines/mortevielle/sound.h b/engines/mortevielle/sound.h
index 5c70bc8d0f..c469706305 100644
--- a/engines/mortevielle/sound.h
+++ b/engines/mortevielle/sound.h
@@ -48,7 +48,7 @@ struct SpeakerNote {
length = noteLength;
}
};
-
+
/**
* This is a modified PC Speaker class that allows the queueing of an entire song
* sequence one note at a time.
@@ -103,7 +103,7 @@ public:
void decodeMusic(const byte *PSrc, byte *PDest, int NbreSeg);
void litph(tablint &t, int typ, int tempo);
- void musyc(tablint &tb, int nbseg, int att);
+ void musyc(tablint &tb, int nbseg, int att);
};
} // End of namespace Mortevielle
diff --git a/engines/mortevielle/speech.cpp b/engines/mortevielle/speech.cpp
index c374d20a6d..08f773cca1 100644
--- a/engines/mortevielle/speech.cpp
+++ b/engines/mortevielle/speech.cpp
@@ -151,7 +151,7 @@ void SpeechManager::loadMusicSound() {
if (!f.open("sonmus.mor"))
error("Missing file - sonmus.mor");
-
+
f.read(&g_vm->_mem[0x7414 * 16 + 0], 273);
g_vm->_soundManager.decodeMusic(&g_vm->_mem[0x7414 * 16], &g_vm->_mem[kAdrNoise * 16], 273);
@@ -348,7 +348,7 @@ void SpeechManager::trait_car() {
}
break;
case 0:
- case 1:
+ case 1:
veracf(_queue[1]._acc);
switch (_queue[2]._code) {
case 2:
@@ -436,7 +436,7 @@ void SpeechManager::trait_car() {
entroct(d2);
entroct(_queue[1]._val);
}
-
+
break;
case 4:
veracf(_queue[1]._acc);
@@ -483,7 +483,7 @@ void SpeechManager::trait_car() {
entroct(d2);
entroct(_tabdbc[((_queue[1]._val - 26) << 1) + 1]);
}
-
+
break;
default:
break;