thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MORTEVIELLE: Janitorial - Remove trailing spaces

Browse source
This commit is contained in:
Strangerke 2014-02-16 18:24:19 +01:00
parent 7c53ba31a4
commit 2bc174a3d0
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
engines/mortevielle/menu.cpp
View file

@ -141,19 +141,19 @@ void Menu::readVerbNums(Common::File &f, int dataSize) {
_actionMenu[1]._actionId = _opcodeSHide & 0xFF; _actionMenu[1]._actionId = _opcodeSHide & 0xFF;
_actionMenu[2]._menuId = _opcodeAttach >> 8; _actionMenu[2]._menuId = _opcodeAttach >> 8;
_actionMenu[2]._actionId = _opcodeAttach & 0xFF; _actionMenu[2]._actionId = _opcodeAttach & 0xFF;
_actionMenu[3]._menuId = _opcodeForce >> 8; _actionMenu[3]._menuId = _opcodeForce >> 8;
_actionMenu[3]._actionId = _opcodeForce & 0xFF; _actionMenu[3]._actionId = _opcodeForce & 0xFF;
_actionMenu[4]._menuId = _opcodeSleep >> 8; _actionMenu[4]._menuId = _opcodeSleep >> 8;
_actionMenu[4]._actionId = _opcodeSleep & 0xFF; _actionMenu[4]._actionId = _opcodeSleep & 0xFF;
_actionMenu[5]._menuId = _opcodeEnter >> 8; _actionMenu[5]._menuId = _opcodeEnter >> 8;
_actionMenu[5]._actionId = _opcodeEnter & 0xFF; _actionMenu[5]._actionId = _opcodeEnter & 0xFF;
_actionMenu[6]._menuId = _opcodeClose >> 8; _actionMenu[6]._menuId = _opcodeClose >> 8;
_actionMenu[6]._actionId = _opcodeClose & 0xFF; _actionMenu[6]._actionId = _opcodeClose & 0xFF;
_actionMenu[7]._menuId = _opcodeKnock >> 8; _actionMenu[7]._menuId = _opcodeKnock >> 8;
_actionMenu[7]._actionId = _opcodeKnock & 0xFF; _actionMenu[7]._actionId = _opcodeKnock & 0xFF;
@ -612,7 +612,7 @@ void Menu::updateMenu() {
void Menu::initMenu() { void Menu::initMenu() {
Common::File f; Common::File f;
bool menuLoaded = false; bool menuLoaded = false;
// First try to read it from mort.dat if useOriginalData() is false // First try to read it from mort.dat if useOriginalData() is false
if (!_vm->useOriginalData()) { if (!_vm->useOriginalData()) {
@ -636,7 +636,7 @@ void Menu::initMenu() {
desiredLanguageId = MORTDAT_LANG_ENGLISH; desiredLanguageId = MORTDAT_LANG_ENGLISH;
break; break;
} }
// Validate the data file header // Validate the data file header
char fileId[4]; char fileId[4];
f.read(fileId, 4); f.read(fileId, 4);
@ -654,7 +654,7 @@ void Menu::initMenu() {
// Read in the language // Read in the language
byte languageId = f.readByte(); byte languageId = f.readByte();
--dataSize; --dataSize;
// If the language isn't correct, then skip the entire block // If the language isn't correct, then skip the entire block
if (languageId != desiredLanguageId) { if (languageId != desiredLanguageId) {
f.skip(dataSize); f.skip(dataSize);

2
engines/mortevielle/module.mk
View file

@ -19,5 +19,5 @@ ifeq ($(ENABLE_MORTEVIELLE), DYNAMIC_PLUGIN)
PLUGIN := 1 PLUGIN := 1
endif endif
# Include common rules # Include common rules
include $(srcdir)/rules.mk include $(srcdir)/rules.mk

4
engines/mortevielle/outtext.cpp
View file

@ -287,8 +287,8 @@ void TextHandler::taffich() {
filename = "AXX.mor"; filename = "AXX.mor";
} else { // b == 50 } else { // b == 50
// CHECKME: the size of AZZ.mor is 1280 for the DOS version // CHECKME: the size of AZZ.mor is 1280 for the DOS version
// and 1260 for the Amiga version. Maybe the 20 bytes // and 1260 for the Amiga version. Maybe the 20 bytes
// are a filler (to get 10 blocks of 128 bytes), // are a filler (to get 10 blocks of 128 bytes),
// or the size should be variable. // or the size should be variable.
drawingSize = 1260; drawingSize = 1260;
filename = "AZZ.mor"; filename = "AZZ.mor";

2
engines/mortevielle/saveload.cpp
View file

@ -125,7 +125,7 @@ Common::Error SavegameManager::loadGame(const Common::String &filename) {
g_vm->gameLoaded(); g_vm->gameLoaded();
g_vm->_mouse->showMouse(); g_vm->_mouse->showMouse();
return Common::kNoError; return Common::kNoError;
} else } else
return Common::kUnknownError; return Common::kUnknownError;
} }

4
engines/mortevielle/sound.cpp
View file

@ -203,7 +203,7 @@ void SoundManager::litph(tablint &t, int typ, int tempo) {
} }
} else { // 2 } else { // 2
debugC(5, kMortevielleSounds, "litph - vadson"); debugC(5, kMortevielleSounds, "litph - vadson");
const static int ambiantNoiseAdr[] = {0, 14020, const static int ambiantNoiseAdr[] = {0, 14020,
14020, 18994, 14020, 18994,
18994, 19630, 18994, 19630,
19630, 22258, 19630, 22258,
@ -695,7 +695,7 @@ void SoundManager::handlePhoneme() {
uint16 startPos = _cfiphBuffer[_phonemeNumb - 1] + deca[_soundType]; uint16 startPos = _cfiphBuffer[_phonemeNumb - 1] + deca[_soundType];
uint16 endPos = _cfiphBuffer[_phonemeNumb] + deca[_soundType]; uint16 endPos = _cfiphBuffer[_phonemeNumb] + deca[_soundType];
int wordCount = endPos - startPos; int wordCount = endPos - startPos;
startPos /= 2; startPos /= 2;
endPos /= 2; endPos /= 2;
assert((endPos - startPos) < 1711); assert((endPos - startPos) < 1711);