[Scummvm-cvs-logs] SF.net SVN: scummvm:[40717] scummvm/trunk/engines/kyra
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Tue May 19 03:39:21 CEST 2009
Revision: 40717
http://scummvm.svn.sourceforge.net/scummvm/?rev=40717&view=rev
Author: lordhoto
Date: 2009-05-19 01:39:18 +0000 (Tue, 19 May 2009)
Log Message:
-----------
Formatting.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/animator_lok.cpp
scummvm/trunk/engines/kyra/animator_mr.cpp
scummvm/trunk/engines/kyra/gui_lok.cpp
scummvm/trunk/engines/kyra/gui_mr.cpp
scummvm/trunk/engines/kyra/items_mr.cpp
scummvm/trunk/engines/kyra/kyra_hof.cpp
scummvm/trunk/engines/kyra/kyra_lok.cpp
scummvm/trunk/engines/kyra/kyra_mr.cpp
scummvm/trunk/engines/kyra/kyra_v2.cpp
scummvm/trunk/engines/kyra/lol.cpp
scummvm/trunk/engines/kyra/saveload.cpp
scummvm/trunk/engines/kyra/saveload_hof.cpp
scummvm/trunk/engines/kyra/saveload_lok.cpp
scummvm/trunk/engines/kyra/saveload_lol.cpp
scummvm/trunk/engines/kyra/saveload_mr.cpp
scummvm/trunk/engines/kyra/scene_lok.cpp
scummvm/trunk/engines/kyra/scene_v2.cpp
scummvm/trunk/engines/kyra/screen.cpp
scummvm/trunk/engines/kyra/screen_lok.cpp
scummvm/trunk/engines/kyra/screen_lol.cpp
scummvm/trunk/engines/kyra/screen_mr.cpp
scummvm/trunk/engines/kyra/screen_v2.cpp
scummvm/trunk/engines/kyra/sequences_hof.cpp
scummvm/trunk/engines/kyra/sequences_lok.cpp
scummvm/trunk/engines/kyra/sequences_lol.cpp
scummvm/trunk/engines/kyra/sequences_mr.cpp
scummvm/trunk/engines/kyra/text_hof.cpp
scummvm/trunk/engines/kyra/text_mr.cpp
scummvm/trunk/engines/kyra/timer.cpp
scummvm/trunk/engines/kyra/timer_hof.cpp
scummvm/trunk/engines/kyra/timer_lok.cpp
scummvm/trunk/engines/kyra/timer_lol.cpp
scummvm/trunk/engines/kyra/timer_mr.cpp
Modified: scummvm/trunk/engines/kyra/animator_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator_lok.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/animator_lok.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -355,7 +355,6 @@
}
void Animator_LoK::copyChangedObjectsForward(int refreshFlag) {
-
for (AnimObject *curObject = _objectQueue; curObject; curObject = curObject->nextAnimObject) {
if (curObject->active) {
if (curObject->refreshFlag || refreshFlag) {
Modified: scummvm/trunk/engines/kyra/animator_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/animator_mr.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/animator_mr.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -34,7 +34,6 @@
}
void KyraEngine_MR::clearAnimObjects() {
-
for (int i = 0; i < 67; ++i)
_animObjects[i].enabled = false;
@@ -238,7 +237,6 @@
}
void KyraEngine_MR::updateCharacterAnim(int charId) {
-
AnimObj *obj = &_animObjects[0];
obj->needRefresh = true;
obj->flags &= ~1;
@@ -439,7 +437,6 @@
}
void KyraEngine_MR::showIdleAnim() {
-
if (_mainCharacter.sceneId == 20 || _mainCharacter.sceneId == 21
|| _mainCharacter.sceneId == 12 || _mainCharacter.sceneId == 11)
return;
Modified: scummvm/trunk/engines/kyra/gui_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lok.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/gui_lok.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -762,7 +762,6 @@
}
bool GUI_LoK::quitConfirm(const char *str) {
-
_screen->loadPageFromDisk("SEENPAGE.TMP", 0);
_screen->savePageToDisk("SEENPAGE.TMP", 0);
@@ -801,7 +800,6 @@
}
int GUI_LoK::gameControlsMenu(Button *button) {
-
_vm->readSettings();
_screen->loadPageFromDisk("SEENPAGE.TMP", 0);
@@ -850,7 +848,6 @@
}
void GUI_LoK::setupControls(Menu &menu) {
-
switch (_vm->_configMusic) {
case 0:
menu.item[0].itemString = _offString; //"Off"
Modified: scummvm/trunk/engines/kyra/gui_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_mr.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/gui_mr.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -721,7 +721,6 @@
}
void KyraEngine_MR::loadAlbumPage() {
-
char filename[16];
int num = _album.curPage / 2;
@@ -764,7 +763,6 @@
}
void KyraEngine_MR::printAlbumPageText() {
-
static const uint8 posY[] = {
0x41, 0x55, 0x55, 0x55, 0x55, 0x55, 0x5A, 0x5A,
0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x5A, 0x3C
@@ -936,7 +934,6 @@
}
void KyraEngine_MR::albumAnim1() {
-
for (int i = 6; i >= 3; --i) {
albumRestoreRect();
_album.wsa->displayFrame(i, 2, -100, 90, 0x4000);
@@ -951,7 +948,6 @@
}
void KyraEngine_MR::albumAnim2() {
-
for (int i = 3; i <= 6; ++i) {
albumRestoreRect();
_album.wsa->displayFrame(i, 2, -100, 90, 0x4000);
Modified: scummvm/trunk/engines/kyra/items_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/items_mr.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/items_mr.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -100,7 +100,6 @@
}
bool KyraEngine_MR::dropItem(int unk1, uint16 item, int x, int y, int unk2) {
-
if (_mouseState <= -1)
return false;
@@ -124,7 +123,6 @@
}
bool KyraEngine_MR::processItemDrop(uint16 sceneId, uint16 item, int x, int y, int unk1, int unk2) {
-
int itemPos = checkItemCollision(x, y);
if (unk1)
@@ -313,7 +311,6 @@
}
void KyraEngine_MR::exchangeMouseItem(int itemPos, int runScript) {
-
if (itemListMagic(_itemInHand, itemPos))
return;
@@ -390,7 +387,6 @@
}
bool KyraEngine_MR::itemListMagic(int handItem, int itemSlot) {
-
uint16 item = _itemList[itemSlot].id;
if (_currentChapter == 1 && handItem == 3 && item == 3 && queryGameFlag(0x76)) {
eelScript();
@@ -469,7 +465,6 @@
}
bool KyraEngine_MR::itemInventoryMagic(int handItem, int invSlot) {
-
uint16 item = _mainCharacter.inventory[invSlot];
if (_currentChapter == 1 && handItem == 3 && item == 3 && queryGameFlag(0x76)) {
eelScript();
Modified: scummvm/trunk/engines/kyra/kyra_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/kyra_hof.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -1514,7 +1514,6 @@
}
void KyraEngine_HoF::snd_playSoundEffect(int track, int volume) {
-
if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) {
if (track == 10)
track = _lastSfxTrack;
Modified: scummvm/trunk/engines/kyra/kyra_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_lok.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/kyra_lok.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -398,7 +398,6 @@
}
void KyraEngine_LoK::mainLoop() {
-
_eventList.clear();
while (!shouldQuit()) {
@@ -530,7 +529,6 @@
#pragma mark -
void KyraEngine_LoK::setupShapes123(const Shape *shapeTable, int endShape, int flags) {
-
for (int i = 123; i <= 172; ++i)
_shapes[i] = 0;
@@ -558,7 +556,6 @@
}
void KyraEngine_LoK::freeShapes123() {
-
for (int i = 123; i <= 172; ++i) {
delete[] _shapes[i];
_shapes[i] = 0;
@@ -604,7 +601,6 @@
#pragma mark -
void KyraEngine_LoK::processInput(int xpos, int ypos) {
-
if (processInputHelper(xpos, ypos))
return;
@@ -820,7 +816,6 @@
}
void KyraEngine_LoK::clickEventHandler2() {
-
Common::Point mouse = getMousePos();
_emc->init(&_scriptClick, &_scriptClickData);
@@ -894,7 +889,6 @@
}
void KyraEngine_LoK::checkAmuletAnimFlags() {
-
if (_brandonStatusBit & 2) {
seq_makeBrandonNormal2();
_timer->setCountdown(19, 300);
Modified: scummvm/trunk/engines/kyra/kyra_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_mr.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/kyra_mr.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -365,7 +365,6 @@
}
void KyraEngine_MR::playVQA(const char *name) {
-
VQAMovie vqa(this, _system);
char filename[20];
@@ -412,7 +411,6 @@
}
void KyraEngine_MR::snd_playWanderScoreViaMap(int track, int force) {
-
if (_musicSoundChannel != -1 && !_soundDigital->isPlaying(_musicSoundChannel))
force = 1;
else if (_musicSoundChannel == -1)
@@ -435,7 +433,6 @@
}
void KyraEngine_MR::stopMusicTrack() {
-
if (_musicSoundChannel != -1 && _soundDigital->isPlaying(_musicSoundChannel))
_soundDigital->stopSound(_musicSoundChannel);
@@ -444,7 +441,6 @@
}
int KyraEngine_MR::musicUpdate(int forceRestart) {
-
static uint32 mTimer = 0;
static uint16 lock = 0;
@@ -529,7 +525,6 @@
#pragma mark -
void KyraEngine_MR::preinit() {
-
_itemBuffer1 = new int8[72];
_itemBuffer2 = new int8[144];
initMouseShapes();
@@ -547,7 +542,6 @@
}
void KyraEngine_MR::startup() {
-
_album.wsa = new WSAMovie_v2(this, _screen);
assert(_album.wsa);
_album.leftPage.wsa = new WSAMovie_v2(this, _screen);
@@ -719,7 +713,6 @@
}
void KyraEngine_MR::initItems() {
-
_screen->loadBitmap("ITEMS.CSH", 3, 3, 0);
for (int i = 248; i <= 319; ++i)
@@ -950,7 +943,6 @@
}
bool KyraEngine_MR::checkCharCollision(int x, int y) {
-
int scale = getScale(_mainCharacter.x1, _mainCharacter.y1);
int width = (scale * 37) >> 8;
int height = (scale * 76) >> 8;
@@ -968,7 +960,6 @@
#pragma mark -
void KyraEngine_MR::runLoop() {
-
_eventList.clear();
_runFlag = true;
@@ -1339,7 +1330,6 @@
}
int KyraEngine_MR::loadLanguageFile(const char *file, uint8 *&buffer) {
-
delete[] buffer;
buffer = 0;
@@ -1384,7 +1374,6 @@
#pragma mark -
bool KyraEngine_MR::talkObjectsInCurScene() {
-
for (int i = 0; i < 88; ++i) {
if (_talkObjectList[i].sceneId == _mainCharacter.sceneId)
return true;
@@ -1396,7 +1385,6 @@
#pragma mark -
bool KyraEngine_MR::updateScore(int scoreId, int strId) {
-
int scoreIndex = (scoreId >> 3);
int scoreBit = scoreId & 7;
if ((_scoreFlagTable[scoreIndex] & (1 << scoreBit)) != 0)
Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -144,7 +144,6 @@
}
void KyraEngine_v2::delay(uint32 amount, bool updateGame, bool isMainLoop) {
-
uint32 start = _system->getMillis();
do {
if (updateGame) {
Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/lol.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -598,7 +598,6 @@
#pragma mark - Initialization
void LoLEngine::preInit() {
-
_res->loadPakFile("GENERAL.PAK");
if (_flags.isTalkie)
_res->loadPakFile("STARTUP.PAK");
@@ -618,7 +617,6 @@
}
void LoLEngine::loadItemIconShapes() {
-
if (_itemIconShapes) {
for (int i = 0; i < _numItemIconShapes; i++)
delete[] _itemIconShapes[i];
@@ -685,7 +683,6 @@
}
int LoLEngine::mainMenu() {
-
bool hasSave = saveFileLoadable(0);
MainMenu::StaticData data[] = {
@@ -922,7 +919,6 @@
#pragma mark - Localization
char *LoLEngine::getLangString(uint16 id) {
-
if (id == 0xFFFF)
return 0;
@@ -1798,7 +1794,6 @@
}
void LoLEngine::snd_playSoundEffect(int track, int volume) {
-
if (track == 1 && (_lastSfxTrack == -1 || _lastSfxTrack == 1))
return;
@@ -2440,19 +2435,15 @@
}
void LoLEngine::processMagicFireball(int charNum, int spellLevel) {
-
}
void LoLEngine::processMagicHandOfFate(int charNum, int spellLevel) {
-
}
void LoLEngine::processMagicMistOfDoom(int charNum, int spellLevel) {
-
}
void LoLEngine::processMagicLightning(int charNum, int spellLevel) {
-
}
void LoLEngine::processMagicFog() {
@@ -2555,7 +2546,6 @@
}
void LoLEngine::processMagicGuardian(int charNum, int spellLevel) {
-
}
void LoLEngine::callbackProcessMagicSwarm(WSAMovie_v2 *mov, int x, int y) {
@@ -3020,7 +3010,6 @@
}
void LoLEngine::checkForPartyDeath() {
-
}
void LoLEngine::applyMonsterAttackSkill(MonsterInPlay *monster, int16 target, int16 damage) {
@@ -3233,15 +3222,12 @@
}
void LoLEngine::level11specialUnk() {
-
}
void LoLEngine::launchMagicViper() {
-
}
void LoLEngine::attackWall(int a, int b) {
-
}
uint16 LoLEngine::getNearestMonsterFromCharacter(int charNum) {
Modified: scummvm/trunk/engines/kyra/saveload.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/saveload.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -127,7 +127,6 @@
}
Common::SeekableReadStream *KyraEngine_v1::openSaveForReading(const char *filename, SaveHeader &header) {
-
Common::SeekableReadStream *in = 0;
if (!(in = _saveFileMan->openForLoading(filename)))
return 0;
Modified: scummvm/trunk/engines/kyra/saveload_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_hof.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/saveload_hof.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -36,7 +36,6 @@
namespace Kyra {
Common::Error KyraEngine_HoF::saveGameState(int slot, const char *saveName, const Graphics::Surface *thumb) {
-
const char *fileName = getSavegameFilename(slot);
Common::OutSaveFile *out = openSaveForWriting(fileName, saveName, thumb);
@@ -129,7 +128,6 @@
}
Common::Error KyraEngine_HoF::loadGameState(int slot) {
-
const char *fileName = getSavegameFilename(slot);
SaveHeader header;
Modified: scummvm/trunk/engines/kyra/saveload_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_lok.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/saveload_lok.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -37,7 +37,6 @@
namespace Kyra {
Common::Error KyraEngine_LoK::loadGameState(int slot) {
-
const char *fileName = getSavegameFilename(slot);
SaveHeader header;
@@ -219,7 +218,6 @@
}
Common::Error KyraEngine_LoK::saveGameState(int slot, const char *saveName, const Graphics::Surface *thumb) {
-
const char *fileName = getSavegameFilename(slot);
if (shouldQuit())
Modified: scummvm/trunk/engines/kyra/saveload_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_lol.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/saveload_lol.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -36,7 +36,6 @@
namespace Kyra {
Common::Error LoLEngine::loadGameState(int slot) {
-
const uint16 *cdf[] = { _charDefsMan, _charDefsWoman, _charDefsKieran, _charDefsMan, _charDefsAkshel };
const char *fileName = getSavegameFilename(slot);
@@ -250,7 +249,6 @@
}
Common::Error LoLEngine::saveGameState(int slot, const char *saveName, const Graphics::Surface *thumbnail) {
-
const char *fileName = getSavegameFilename(slot);
Common::OutSaveFile *out = openSaveForWriting(fileName, saveName, thumbnail);
Modified: scummvm/trunk/engines/kyra/saveload_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_mr.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/saveload_mr.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -33,7 +33,6 @@
namespace Kyra {
Common::Error KyraEngine_MR::saveGameState(int slot, const char *saveName, const Graphics::Surface *thumb) {
-
const char *fileName = getSavegameFilename(slot);
Common::OutSaveFile *out = openSaveForWriting(fileName, saveName, thumb);
@@ -123,7 +122,6 @@
}
Common::Error KyraEngine_MR::loadGameState(int slot) {
-
const char *fileName = getSavegameFilename(slot);
SaveHeader header;
Modified: scummvm/trunk/engines/kyra/scene_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lok.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/scene_lok.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -287,7 +287,6 @@
}
int KyraEngine_LoK::setCharacterPosition(int character, int *facingTable) {
-
if (character == 0) {
_currentCharacter->x1 += _charAddXPosTable[_currentCharacter->facing];
_currentCharacter->y1 += _charAddYPosTable[_currentCharacter->facing];
@@ -431,7 +430,6 @@
}
void KyraEngine_LoK::initSceneData(int facing, int unk1, int brandonAlive) {
-
int16 xpos2 = 0;
int setFacing = 1;
Modified: scummvm/trunk/engines/kyra/scene_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_v2.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/scene_v2.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -29,7 +29,6 @@
namespace Kyra {
void KyraEngine_v2::freeSceneAnims() {
-
for (int i = 0; i < ARRAYSIZE(_sceneAnims); ++i)
_sceneAnims[i].flags = 0;
Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/screen.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -418,7 +418,6 @@
}
int Screen::fadePalStep(const uint8 *palette, int diff) {
-
const int colors = (_vm->gameFlags().platform == Common::kPlatformAmiga ? 32 : (_use16ColorMode ? 16 : 256)) * 3;
uint8 fadePal[768];
@@ -479,7 +478,6 @@
}
void Screen::setScreenPalette(const uint8 *palData) {
-
const int colors = (_vm->gameFlags().platform == Common::kPlatformAmiga ? 32 : 256);
uint8 screenPal[256 * 4];
@@ -538,7 +536,6 @@
}
void Screen::copyRegion(int x1, int y1, int x2, int y2, int w, int h, int srcPage, int dstPage, int flags) {
-
if (x2 < 0) {
if (x2 <= -w)
return;
@@ -616,7 +613,6 @@
}
void Screen::copyPage(uint8 srcPage, uint8 dstPage) {
-
uint8 *src = getPagePtr(srcPage);
uint8 *dst = getPagePtr(dstPage);
memcpy(dst, src, SCREEN_W * SCREEN_H);
@@ -800,7 +796,6 @@
}
void Screen::drawBox(int x1, int y1, int x2, int y2, int color) {
-
drawClippedLine(x1, y1, x2, y1, color);
drawClippedLine(x1, y1, x1, y2, color);
drawClippedLine(x2, y1, x2, y2, color);
@@ -823,7 +818,6 @@
}
void Screen::drawClippedLine(int x1, int y1, int x2, int y2, int color) {
-
if (x1 < 0)
x1 = 0;
else if (x1 > 319)
@@ -857,7 +851,6 @@
}
void Screen::drawLine(bool vertical, int x, int y, int length, int color) {
-
uint8 *ptr = getPagePtr(_curPage) + y * SCREEN_W + x;
if (vertical) {
@@ -1991,7 +1984,6 @@
}
void Screen::decodeFrameDeltaPage(uint8 *dst, const uint8 *src, int pitch, bool noXor) {
-
if (noXor)
wrapped_decodeFrameDeltaPage<true>(dst, src, pitch);
else
@@ -2501,7 +2493,6 @@
}
void Screen::showMouse() {
-
if (_mouseLockCount == 1)
CursorMan.showMouse(true);
@@ -2710,7 +2701,6 @@
}
void Screen::shakeScreen(int times) {
-
while (times--) {
// seems to be 1 line (320 pixels) offset in the original
// 4 looks more like dosbox though, maybe check this again
@@ -3005,7 +2995,6 @@
} // end of anonymous namespace
void Screen::drawCharSJIS(uint16 c, int x, int y) {
-
int color1 = _textColorsMap[1];
int color2 = _textColorsMap[0];
Modified: scummvm/trunk/engines/kyra/screen_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_lok.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/screen_lok.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -79,7 +79,6 @@
}
void Screen_LoK::fadeSpecialPalette(int palIndex, int startIndex, int size, int fadeTime) {
-
assert(_vm->palTable1()[palIndex]);
assert(_currentPalette);
uint8 tempPal[768];
@@ -177,7 +176,6 @@
}
void Screen_LoK::copyBackgroundBlock(int x, int page, int flag) {
-
if (x < 1)
return;
Modified: scummvm/trunk/engines/kyra/screen_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_lol.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/screen_lol.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -844,7 +844,6 @@
}
uint8 Screen_LoL::getShapePaletteSize(const uint8 *shp) {
-
return shp[10];
}
Modified: scummvm/trunk/engines/kyra/screen_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_mr.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/screen_mr.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -129,7 +129,6 @@
}
void Screen_MR::drawFilledBox(int x1, int y1, int x2, int y2, uint8 c1, uint8 c2, uint8 c3) {
-
fillRect(x1, y1, x2, y2, c1);
fillRect(x1, y1, x2, y1+1, c2);
Modified: scummvm/trunk/engines/kyra/screen_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen_v2.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/screen_v2.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -115,7 +115,6 @@
}
void Screen_v2::getFadeParams(const uint8 *palette, int delay, int &delayInc, int &diff) {
-
int maxDiff = 0;
diff = 0;
int len = _use16ColorMode ? 48 : 768;
@@ -313,12 +312,10 @@
}
uint16 Screen_v2::getShapeSize(const uint8 *shp) {
-
return READ_LE_UINT16(shp+6);
}
uint8 *Screen_v2::makeShapeCopy(const uint8 *src, int index) {
-
const uint8 *shape = getPtrToShape(src, index);
if (!shape)
return 0;
@@ -480,7 +477,6 @@
}
void Screen_v2::checkedPageUpdate(int srcPage, int dstPage) {
-
const uint32 *src = (const uint32 *)getPagePtr(srcPage);
uint32 *dst = (uint32 *)getPagePtr(dstPage);
uint32 *page0 = (uint32 *)getPagePtr(0);
Modified: scummvm/trunk/engines/kyra/sequences_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_hof.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/sequences_hof.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -330,7 +330,6 @@
}
int KyraEngine_HoF::seq_introWestwood(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
-
if (frm == -2) {
if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98)
delay(300 * _tickLength);
@@ -342,7 +341,6 @@
}
int KyraEngine_HoF::seq_introTitle(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
-
if (frm == 1) {
_sound->playTrack(3);
} else if (frm == 25) {
@@ -363,7 +361,6 @@
}
int KyraEngine_HoF::seq_introOverview(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
-
uint8 *tmpPal = &(_screen->getPalette(3)[0x101]);
memset(tmpPal, 0, 256);
_seqSubFrameEndTimeInternal = 0;
@@ -463,7 +460,6 @@
}
int KyraEngine_HoF::seq_introLibrary(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
-
switch (_seqFrameCounter) {
case 0:
_seqSubframePlaying = true;
@@ -538,7 +534,6 @@
int KyraEngine_HoF::seq_introHand(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
-
switch (_seqFrameCounter) {
case 0:
_seqSubframePlaying = true;
@@ -2149,7 +2144,6 @@
}
void KyraEngine_HoF::seq_playTalkText(uint8 chatNum) {
-
assert(chatNum < _sequenceSoundListSize);
if (chatNum < 12 && !_flags.isDemo && textEnabled())
@@ -2160,7 +2154,6 @@
}
void KyraEngine_HoF::seq_waitForTextsTimeout() {
-
uint32 longest = seq_activeTextsTimeLeft() + _system->getMillis();
uint32 now = _system->getMillis();
@@ -2181,7 +2174,6 @@
}
int KyraEngine_HoF::seq_setTextEntry(uint16 strIndex, uint16 posX, uint16 posY, int duration, uint16 width) {
-
for (int i = 0; i < 10; i++) {
if (_activeText[i].duration != -1) {
if (i < 9)
@@ -2204,7 +2196,6 @@
}
void KyraEngine_HoF::seq_loadNestedSequence(int wsaNum, int seqNum) {
-
if (_activeWSA[wsaNum].flags != -1)
return;
@@ -2520,7 +2511,6 @@
void KyraEngine_HoF::seq_displayScrollText(uint8 *data, const ScreenDim *d, int tempPage1, int tempPage2, int speed,
int step, Screen::FontId fid1, Screen::FontId fid2, const uint8 *shapeData, const char *const *specialData) {
-
if (!data)
return;
Modified: scummvm/trunk/engines/kyra/sequences_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lok.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/sequences_lok.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -40,7 +40,6 @@
namespace Kyra {
void KyraEngine_LoK::seq_demo() {
-
snd_playTheme(0, 2);
_screen->loadBitmap("START.CPS", 7, 7, _screen->_currentPalette);
@@ -89,7 +88,6 @@
}
void KyraEngine_LoK::seq_intro() {
-
if (_flags.isTalkie)
_res->loadPakFile("INTRO.VRM");
@@ -129,7 +127,6 @@
}
void KyraEngine_LoK::seq_introLogos() {
-
if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) {
_screen->loadBitmap("LOGO.CPS", 3, 3, _screen->_currentPalette);
_screen->copyRegion(0, 0, 0, 0, 320, 200, 2, 0);
Modified: scummvm/trunk/engines/kyra/sequences_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_lol.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/sequences_lol.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -36,7 +36,6 @@
#pragma mark - Intro
int LoLEngine::processPrologue() {
-
setupPrologueData(true);
if (!saveFileLoadable(0) || _flags.isDemo)
@@ -117,7 +116,6 @@
}
void LoLEngine::setupPrologueData(bool load) {
-
static const char * const fileListCD[] = {
"GENERAL.PAK", "INTROVOC.PAK", "STARTUP.PAK", "INTRO1.PAK",
"INTRO2.PAK", "INTRO3.PAK", "INTRO4.PAK", "INTRO5.PAK",
@@ -198,7 +196,6 @@
}
void LoLEngine::showIntro() {
-
_tim = new TIMInterpreter(this, _screen, _system);
assert(_tim);
@@ -266,7 +263,6 @@
}
int LoLEngine::chooseCharacter() {
-
_tim = new TIMInterpreter(this, _screen, _system);
assert(_tim);
@@ -362,7 +358,6 @@
}
void LoLEngine::kingSelectionIntro() {
-
_screen->copyRegion(0, 0, 0, 0, 112, 120, 4, 0, Screen::CR_NO_P_CHECK);
int y = 38;
@@ -405,7 +400,6 @@
}
void LoLEngine::kingSelectionReminder() {
-
_screen->copyRegion(0, 0, 0, 0, 112, 120, 4, 0, Screen::CR_NO_P_CHECK);
int y = 48;
@@ -439,7 +433,6 @@
}
void LoLEngine::kingSelectionOutro() {
-
_sound->voicePlay("KING03");
int index = 0;
@@ -469,7 +462,6 @@
}
void LoLEngine::processCharacterSelection() {
-
_charSelection = -1;
while (!shouldQuit() && _charSelection == -1) {
uint32 nextKingMessage = _system->getMillis() + 900 * _tickLength;
@@ -486,7 +478,6 @@
}
void LoLEngine::updateSelectionAnims() {
-
for (int i = 0; i < 4; ++i) {
if (_system->getMillis() < _selectionAnimTimers[i])
continue;
Modified: scummvm/trunk/engines/kyra/sequences_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sequences_mr.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/sequences_mr.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -108,7 +108,6 @@
}
void KyraEngine_MR::showGoodConscience() {
-
if (_goodConscienceShown)
return;
Modified: scummvm/trunk/engines/kyra/text_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_hof.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/text_hof.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -87,7 +87,6 @@
}
char *TextDisplayer_HoF::preprocessString(const char *str) {
-
if (str != _talkBuffer) {
assert(strlen(str) < sizeof(_talkBuffer) - 1);
strcpy(_talkBuffer, str);
Modified: scummvm/trunk/engines/kyra/text_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_mr.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/text_mr.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -82,7 +82,6 @@
}
int TextDisplayer_MR::dropCRIntoString(char *str, int minOffs, int maxOffs) {
-
int offset = 0;
char *proc = str + minOffs;
@@ -196,7 +195,6 @@
}
void KyraEngine_MR::objectChat(const char *str, int object, int vocHigh, int vocLow) {
-
if (_mainCharacter.animFrame == 87 || _mainCharacter.animFrame == 0xFFFF || _mainCharacter.x1 <= 0 || _mainCharacter.y1 <= 0)
return;
@@ -304,7 +302,6 @@
}
void KyraEngine_MR::objectChatProcess(const char *script) {
-
memset(&_chatScriptData, 0, sizeof(_chatScriptData));
memset(&_chatScriptState, 0, sizeof(_chatScriptState));
@@ -488,7 +485,6 @@
}
void KyraEngine_MR::albumChat(const char *str, int vocHigh, int vocLow) {
-
_talkObjectList[1].x = 190;
_talkObjectList[1].y = 188;
@@ -609,7 +605,6 @@
}
void KyraEngine_MR::malcolmSceneStartupChat() {
-
if (_noStartupChat)
return;
@@ -794,7 +789,6 @@
}
void KyraEngine_MR::dialogEndScript(int object) {
-
_emc->init(&_dialogScriptState, &_dialogScriptData);
_emc->start(&_dialogScriptState, _dialogScriptFuncEnd);
@@ -810,7 +804,6 @@
}
void KyraEngine_MR::npcChatSequence(const char *str, int object, int vocHigh, int vocLow) {
-
_chatText = str;
_chatObject = object;
_chatVocHigh = _chatVocLow = -1;
@@ -867,7 +860,6 @@
}
void KyraEngine_MR::runDialog(int dlgIndex, int funcNum) {
-
switch (_currentChapter-2) {
case 0:
dlgIndex -= 34;
Modified: scummvm/trunk/engines/kyra/timer.cpp
===================================================================
--- scummvm/trunk/engines/kyra/timer.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/timer.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -93,7 +93,6 @@
}
void TimerManager::addTimer(uint8 id, TimerFunc *func, int countdown, bool enabled) {
-
Iterator timer = Common::find_if(_timers.begin(), _timers.end(), TimerEqual(id));
if (timer != _timers.end()) {
warning("Adding allready existing timer %d", id);
@@ -113,7 +112,6 @@
}
void TimerManager::update() {
-
if (_system->getMillis() < _nextRun || _isPaused)
return;
@@ -137,7 +135,6 @@
}
void TimerManager::resync() {
-
const uint32 curTime = _isPaused ? _pauseStart : _system->getMillis();
_nextRun = 0; // force rerun
@@ -149,7 +146,6 @@
}
void TimerManager::setCountdown(uint8 id, int32 countdown) {
-
Iterator timer = Common::find_if(_timers.begin(), _timers.end(), TimerEqual(id));
if (timer != _timers.end()) {
timer->countdown = countdown;
@@ -167,7 +163,6 @@
}
void TimerManager::setDelay(uint8 id, int32 countdown) {
-
Iterator timer = Common::find_if(_timers.begin(), _timers.end(), TimerEqual(id));
if (timer != _timers.end())
timer->countdown = countdown;
@@ -176,7 +171,6 @@
}
int32 TimerManager::getDelay(uint8 id) const {
-
CIterator timer = Common::find_if(_timers.begin(), _timers.end(), TimerEqual(id));
if (timer != _timers.end())
return timer->countdown;
@@ -186,7 +180,6 @@
}
void TimerManager::setNextRun(uint8 id, uint32 nextRun) {
-
Iterator timer = Common::find_if(_timers.begin(), _timers.end(), TimerEqual(id));
if (timer != _timers.end()) {
timer->nextRun = nextRun;
@@ -197,7 +190,6 @@
}
uint32 TimerManager::getNextRun(uint8 id) const {
-
CIterator timer = Common::find_if(_timers.begin(), _timers.end(), TimerEqual(id));
if (timer != _timers.end())
return timer->nextRun;
@@ -228,7 +220,6 @@
}
bool TimerManager::isEnabled(uint8 id) const {
-
CIterator timer = Common::find_if(_timers.begin(), _timers.end(), TimerEqual(id));
if (timer != _timers.end())
return (timer->enabled == 1);
@@ -238,7 +229,6 @@
}
void TimerManager::enable(uint8 id) {
-
Iterator timer = Common::find_if(_timers.begin(), _timers.end(), TimerEqual(id));
if (timer != _timers.end())
timer->enabled |= 1;
@@ -247,7 +237,6 @@
}
void TimerManager::disable(uint8 id) {
-
Iterator timer = Common::find_if(_timers.begin(), _timers.end(), TimerEqual(id));
if (timer != _timers.end())
timer->enabled &= (~1);
@@ -256,7 +245,6 @@
}
void TimerManager::loadDataFromFile(Common::SeekableReadStream &file, int version) {
-
const uint32 loadTime = _isPaused ? _pauseStart : _system->getMillis();
if (version <= 7) {
@@ -303,7 +291,6 @@
}
void TimerManager::saveDataToFile(Common::WriteStream &file) const {
-
const uint32 saveTime = _isPaused ? _pauseStart : _system->getMillis();
file.writeByte(count());
Modified: scummvm/trunk/engines/kyra/timer_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/timer_hof.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/timer_hof.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -31,7 +31,6 @@
#define TimerV2(x) new Common::Functor1Mem<int, void, KyraEngine_HoF>(this, &KyraEngine_HoF::x)
void KyraEngine_HoF::setupTimers() {
-
_timer->addTimer(0, 0, 5, 1);
_timer->addTimer(1, TimerV2(timerFadeOutMessage), -1, 1);
_timer->addTimer(2, TimerV2(timerCauldronAnimation), 1, 1);
@@ -91,7 +90,6 @@
}
void KyraEngine_HoF::setTimer1DelaySecs(int secs) {
-
if (secs == -1)
secs = 32000;
@@ -99,7 +97,6 @@
}
void KyraEngine_HoF::setWalkspeed(uint8 newSpeed) {
-
if (newSpeed < 5)
newSpeed = 3;
else
Modified: scummvm/trunk/engines/kyra/timer_lok.cpp
===================================================================
--- scummvm/trunk/engines/kyra/timer_lok.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/timer_lok.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -36,7 +36,6 @@
#define TimerV1(x) new Common::Functor1Mem<int, void, KyraEngine_LoK>(this, &KyraEngine_LoK::x)
void KyraEngine_LoK::setupTimers() {
-
for (int i = 0; i <= 4; ++i)
_timer->addTimer(i, 0, -1, 1);
Modified: scummvm/trunk/engines/kyra/timer_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/timer_lol.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/timer_lol.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -34,7 +34,6 @@
#define TimerV2(x) new Common::Functor1Mem<int, void, LoLEngine>(this, &LoLEngine::x)
void LoLEngine::setupTimers() {
-
_timer->addTimer(0, TimerV2(timerProcessDoors), 15, true);
_timer->addTimer(0x10, TimerV2(timerProcessMonsters), 6, true);
_timer->addTimer(0x11, TimerV2(timerProcessMonsters), 6, true);
Modified: scummvm/trunk/engines/kyra/timer_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/timer_mr.cpp 2009-05-19 01:20:54 UTC (rev 40716)
+++ scummvm/trunk/engines/kyra/timer_mr.cpp 2009-05-19 01:39:18 UTC (rev 40717)
@@ -31,7 +31,6 @@
#define TimerV3(x) new Common::Functor1Mem<int, void, KyraEngine_MR>(this, &KyraEngine_MR::x)
void KyraEngine_MR::setupTimers() {
-
_timer->addTimer(0, TimerV3(timerRestoreCommandLine), -1, 1);
for (int i = 1; i <= 3; ++i)
_timer->addTimer(i, TimerV3(timerRunSceneScript7), -1, 0);
@@ -82,7 +81,6 @@
}
void KyraEngine_MR::setWalkspeed(uint8 speed) {
-
if (speed < 5)
speed = 3;
else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list