diff options
33 files changed, 0 insertions, 133 deletions
diff --git a/engines/kyra/animator_lok.cpp b/engines/kyra/animator_lok.cpp index a250ed3eb9..a05eabe3e1 100644 --- a/engines/kyra/animator_lok.cpp +++ b/engines/kyra/animator_lok.cpp @@ -355,7 +355,6 @@ void Animator_LoK::prepDrawAllObjects() { } void Animator_LoK::copyChangedObjectsForward(int refreshFlag) { - for (AnimObject *curObject = _objectQueue; curObject; curObject = curObject->nextAnimObject) { if (curObject->active) { if (curObject->refreshFlag || refreshFlag) { diff --git a/engines/kyra/animator_mr.cpp b/engines/kyra/animator_mr.cpp index 9b0c451b78..d7139a9e70 100644 --- a/engines/kyra/animator_mr.cpp +++ b/engines/kyra/animator_mr.cpp @@ -34,7 +34,6 @@ void KyraEngine_MR::restorePage3() { } void KyraEngine_MR::clearAnimObjects() { - for (int i = 0; i < 67; ++i) _animObjects[i].enabled = false; @@ -238,7 +237,6 @@ void KyraEngine_MR::updateItemAnimations() { } void KyraEngine_MR::updateCharacterAnim(int charId) { - AnimObj *obj = &_animObjects[0]; obj->needRefresh = true; obj->flags &= ~1; @@ -439,7 +437,6 @@ void KyraEngine_MR::resetCharacterAnimDim() { } void KyraEngine_MR::showIdleAnim() { - if (_mainCharacter.sceneId == 20 || _mainCharacter.sceneId == 21 || _mainCharacter.sceneId == 12 || _mainCharacter.sceneId == 11) return; diff --git a/engines/kyra/gui_lok.cpp b/engines/kyra/gui_lok.cpp index 9ca496bf1a..0f3d398355 100644 --- a/engines/kyra/gui_lok.cpp +++ b/engines/kyra/gui_lok.cpp @@ -762,7 +762,6 @@ int GUI_LoK::quitPlaying(Button *button) { } bool GUI_LoK::quitConfirm(const char *str) { - _screen->loadPageFromDisk("SEENPAGE.TMP", 0); _screen->savePageToDisk("SEENPAGE.TMP", 0); @@ -801,7 +800,6 @@ int GUI_LoK::quitConfirmNo(Button *button) { } int GUI_LoK::gameControlsMenu(Button *button) { - _vm->readSettings(); _screen->loadPageFromDisk("SEENPAGE.TMP", 0); @@ -850,7 +848,6 @@ int GUI_LoK::gameControlsMenu(Button *button) { } void GUI_LoK::setupControls(Menu &menu) { - switch (_vm->_configMusic) { case 0: menu.item[0].itemString = _offString; //"Off" diff --git a/engines/kyra/gui_mr.cpp b/engines/kyra/gui_mr.cpp index 926f2c702f..a1de26897d 100644 --- a/engines/kyra/gui_mr.cpp +++ b/engines/kyra/gui_mr.cpp @@ -721,7 +721,6 @@ void KyraEngine_MR::showAlbum() { } void KyraEngine_MR::loadAlbumPage() { - char filename[16]; int num = _album.curPage / 2; @@ -764,7 +763,6 @@ void KyraEngine_MR::loadAlbumPageWSA() { } 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::albumUpdateAnims() { } 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::albumAnim1() { } void KyraEngine_MR::albumAnim2() { - for (int i = 3; i <= 6; ++i) { albumRestoreRect(); _album.wsa->displayFrame(i, 2, -100, 90, 0x4000); diff --git a/engines/kyra/items_mr.cpp b/engines/kyra/items_mr.cpp index 8c7c25291a..5397651e97 100644 --- a/engines/kyra/items_mr.cpp +++ b/engines/kyra/items_mr.cpp @@ -100,7 +100,6 @@ void KyraEngine_MR::setItemMouseCursor() { } 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::dropItem(int unk1, uint16 item, int x, int y, int unk2) { } 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::itemDropDown(int startX, int startY, int dstX, int dstY, int } void KyraEngine_MR::exchangeMouseItem(int itemPos, int runScript) { - if (itemListMagic(_itemInHand, itemPos)) return; @@ -390,7 +387,6 @@ bool KyraEngine_MR::isDropable(int x, int y) { } 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::itemListMagic(int handItem, int itemSlot) { } bool KyraEngine_MR::itemInventoryMagic(int handItem, int invSlot) { - uint16 item = _mainCharacter.inventory[invSlot]; if (_currentChapter == 1 && handItem == 3 && item == 3 && queryGameFlag(0x76)) { eelScript(); diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp index 84b16401fe..40d4fb62f9 100644 --- a/engines/kyra/kyra_hof.cpp +++ b/engines/kyra/kyra_hof.cpp @@ -1514,7 +1514,6 @@ void KyraEngine_HoF::playVoice(int high, int low) { } void KyraEngine_HoF::snd_playSoundEffect(int track, int volume) { - if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) { if (track == 10) track = _lastSfxTrack; diff --git a/engines/kyra/kyra_lok.cpp b/engines/kyra/kyra_lok.cpp index 42a6ce0fc5..e08eceecea 100644 --- a/engines/kyra/kyra_lok.cpp +++ b/engines/kyra/kyra_lok.cpp @@ -398,7 +398,6 @@ void KyraEngine_LoK::startup() { } void KyraEngine_LoK::mainLoop() { - _eventList.clear(); while (!shouldQuit()) { @@ -530,7 +529,6 @@ void KyraEngine_LoK::delayWithTicks(int ticks) { #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::setupShapes123(const Shape *shapeTable, int endShape, int f } void KyraEngine_LoK::freeShapes123() { - for (int i = 123; i <= 172; ++i) { delete[] _shapes[i]; _shapes[i] = 0; @@ -604,7 +601,6 @@ void KyraEngine_LoK::resetBrandonPoisonFlags() { #pragma mark - void KyraEngine_LoK::processInput(int xpos, int ypos) { - if (processInputHelper(xpos, ypos)) return; @@ -820,7 +816,6 @@ bool KyraEngine_LoK::hasClickedOnExit(int xpos, int ypos) { } void KyraEngine_LoK::clickEventHandler2() { - Common::Point mouse = getMousePos(); _emc->init(&_scriptClick, &_scriptClickData); @@ -894,7 +889,6 @@ void KyraEngine_LoK::runNpcScript(int func) { } void KyraEngine_LoK::checkAmuletAnimFlags() { - if (_brandonStatusBit & 2) { seq_makeBrandonNormal2(); _timer->setCountdown(19, 300); diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp index 5a60f01aa3..c7a4d57e90 100644 --- a/engines/kyra/kyra_mr.cpp +++ b/engines/kyra/kyra_mr.cpp @@ -365,7 +365,6 @@ void KyraEngine_MR::uninitMainMenu() { } void KyraEngine_MR::playVQA(const char *name) { - VQAMovie vqa(this, _system); char filename[20]; @@ -412,7 +411,6 @@ void KyraEngine_MR::playMenuAudioFile() { } 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::snd_playWanderScoreViaMap(int track, int force) { } void KyraEngine_MR::stopMusicTrack() { - if (_musicSoundChannel != -1 && _soundDigital->isPlaying(_musicSoundChannel)) _soundDigital->stopSound(_musicSoundChannel); @@ -444,7 +441,6 @@ void KyraEngine_MR::stopMusicTrack() { } int KyraEngine_MR::musicUpdate(int forceRestart) { - static uint32 mTimer = 0; static uint16 lock = 0; @@ -529,7 +525,6 @@ void KyraEngine_MR::playStudioSFX(const char *str) { #pragma mark - void KyraEngine_MR::preinit() { - _itemBuffer1 = new int8[72]; _itemBuffer2 = new int8[144]; initMouseShapes(); @@ -547,7 +542,6 @@ void KyraEngine_MR::initMouseShapes() { } 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::loadInterface() { } void KyraEngine_MR::initItems() { - _screen->loadBitmap("ITEMS.CSH", 3, 3, 0); for (int i = 248; i <= 319; ++i) @@ -950,7 +943,6 @@ void KyraEngine_MR::updateCharPal(int unk1) { } 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 @@ bool KyraEngine_MR::checkCharCollision(int x, int y) { #pragma mark - void KyraEngine_MR::runLoop() { - _eventList.clear(); _runFlag = true; @@ -1339,7 +1330,6 @@ char *KyraEngine_MR::appendLanguage(char *buf, int lang, int bufSize) { } int KyraEngine_MR::loadLanguageFile(const char *file, uint8 *&buffer) { - delete[] buffer; buffer = 0; @@ -1384,7 +1374,6 @@ void KyraEngine_MR::getTableEntry(Common::SeekableReadStream *stream, int id, ch #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 @@ bool KyraEngine_MR::talkObjectsInCurScene() { #pragma mark - bool KyraEngine_MR::updateScore(int scoreId, int strId) { - int scoreIndex = (scoreId >> 3); int scoreBit = scoreId & 7; if ((_scoreFlagTable[scoreIndex] & (1 << scoreBit)) != 0) diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index 433aeb64d4..b1e3a5a5de 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -144,7 +144,6 @@ void KyraEngine_v2::pauseEngineIntern(bool pause) { } void KyraEngine_v2::delay(uint32 amount, bool updateGame, bool isMainLoop) { - uint32 start = _system->getMillis(); do { if (updateGame) { diff --git a/engines/kyra/lol.cpp b/engines/kyra/lol.cpp index 029018ae39..b7c0fca889 100644 --- a/engines/kyra/lol.cpp +++ b/engines/kyra/lol.cpp @@ -598,7 +598,6 @@ Common::Error LoLEngine::go() { #pragma mark - Initialization void LoLEngine::preInit() { - _res->loadPakFile("GENERAL.PAK"); if (_flags.isTalkie) _res->loadPakFile("STARTUP.PAK"); @@ -618,7 +617,6 @@ void LoLEngine::preInit() { } void LoLEngine::loadItemIconShapes() { - if (_itemIconShapes) { for (int i = 0; i < _numItemIconShapes; i++) delete[] _itemIconShapes[i]; @@ -685,7 +683,6 @@ uint8 *LoLEngine::getItemIconShapePtr(int index) { } int LoLEngine::mainMenu() { - bool hasSave = saveFileLoadable(0); MainMenu::StaticData data[] = { @@ -922,7 +919,6 @@ void LoLEngine::update() { #pragma mark - Localization char *LoLEngine::getLangString(uint16 id) { - if (id == 0xFFFF) return 0; @@ -1798,7 +1794,6 @@ void LoLEngine::snd_stopSpeech(bool setFlag) { } void LoLEngine::snd_playSoundEffect(int track, int volume) { - if (track == 1 && (_lastSfxTrack == -1 || _lastSfxTrack == 1)) return; @@ -2440,19 +2435,15 @@ void LoLEngine::processMagicIce(int charNum, int spellLevel) { } 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::processMagicSwarm(int charNum, int damage) { } void LoLEngine::processMagicGuardian(int charNum, int spellLevel) { - } void LoLEngine::callbackProcessMagicSwarm(WSAMovie_v2 *mov, int x, int y) { @@ -3020,7 +3010,6 @@ int LoLEngine::calcInflictableDamagePerItem(int16 attacker, int16 target, uint16 } void LoLEngine::checkForPartyDeath() { - } void LoLEngine::applyMonsterAttackSkill(MonsterInPlay *monster, int16 target, int16 damage) { @@ -3233,15 +3222,12 @@ void LoLEngine::stunCharacter(int charNum) { } void LoLEngine::level11specialUnk() { - } void LoLEngine::launchMagicViper() { - } void LoLEngine::attackWall(int a, int b) { - } uint16 LoLEngine::getNearestMonsterFromCharacter(int charNum) { diff --git a/engines/kyra/saveload.cpp b/engines/kyra/saveload.cpp index ff4f8b82df..a7187f6c76 100644 --- a/engines/kyra/saveload.cpp +++ b/engines/kyra/saveload.cpp @@ -127,7 +127,6 @@ KyraEngine_v1::kReadSaveHeaderError KyraEngine_v1::readSaveHeader(Common::Seekab } Common::SeekableReadStream *KyraEngine_v1::openSaveForReading(const char *filename, SaveHeader &header) { - Common::SeekableReadStream *in = 0; if (!(in = _saveFileMan->openForLoading(filename))) return 0; diff --git a/engines/kyra/saveload_hof.cpp b/engines/kyra/saveload_hof.cpp index f9cf76f23d..4a42f9e065 100644 --- a/engines/kyra/saveload_hof.cpp +++ b/engines/kyra/saveload_hof.cpp @@ -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::saveGameState(int slot, const char *saveName, cons } Common::Error KyraEngine_HoF::loadGameState(int slot) { - const char *fileName = getSavegameFilename(slot); SaveHeader header; diff --git a/engines/kyra/saveload_lok.cpp b/engines/kyra/saveload_lok.cpp index bbdb3b8bee..c481794e53 100644 --- a/engines/kyra/saveload_lok.cpp +++ b/engines/kyra/saveload_lok.cpp @@ -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::loadGameState(int slot) { } Common::Error KyraEngine_LoK::saveGameState(int slot, const char *saveName, const Graphics::Surface *thumb) { - const char *fileName = getSavegameFilename(slot); if (shouldQuit()) diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/saveload_lol.cpp index ec9e5c2acc..217432ba09 100644 --- a/engines/kyra/saveload_lol.cpp +++ b/engines/kyra/saveload_lol.cpp @@ -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::loadGameState(int slot) { } 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); diff --git a/engines/kyra/saveload_mr.cpp b/engines/kyra/saveload_mr.cpp index 22a3c984c1..9981eeac25 100644 --- a/engines/kyra/saveload_mr.cpp +++ b/engines/kyra/saveload_mr.cpp @@ -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::saveGameState(int slot, const char *saveName, const } Common::Error KyraEngine_MR::loadGameState(int slot) { - const char *fileName = getSavegameFilename(slot); SaveHeader header; diff --git a/engines/kyra/scene_lok.cpp b/engines/kyra/scene_lok.cpp index e0284bbc3b..4eda28bc3c 100644 --- a/engines/kyra/scene_lok.cpp +++ b/engines/kyra/scene_lok.cpp @@ -287,7 +287,6 @@ void KyraEngine_LoK::setCharacterPositionWithUpdate(int character) { } 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::startSceneScript(int brandonAlive) { } void KyraEngine_LoK::initSceneData(int facing, int unk1, int brandonAlive) { - int16 xpos2 = 0; int setFacing = 1; diff --git a/engines/kyra/scene_v2.cpp b/engines/kyra/scene_v2.cpp index a598fd4652..9ffaf5515d 100644 --- a/engines/kyra/scene_v2.cpp +++ b/engines/kyra/scene_v2.cpp @@ -29,7 +29,6 @@ namespace Kyra { void KyraEngine_v2::freeSceneAnims() { - for (int i = 0; i < ARRAYSIZE(_sceneAnims); ++i) _sceneAnims[i].flags = 0; diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index eeaac27ebe..aec1da0460 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -418,7 +418,6 @@ void Screen::getFadeParams(const uint8 *palette, int delay, int &delayInc, int & } 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::getRealPalette(int num, uint8 *dst) { } 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::copyToPage0(int y, int h, uint8 page, uint8 *seqBuf) { } 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::copyRegionToBuffer(int pageNum, int x, int y, int w, int h, uint8 * } 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::fillRect(int x1, int y1, int x2, int y2, uint8 color, int pageNum, } 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::drawShadedBox(int x1, int y1, int x2, int y2, int color1, int color } 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::drawClippedLine(int x1, int y1, int x2, int y2, int color) { } 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::wrapped_decodeFrameDelta(uint8 *dst, const uint8 *src) { } 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::hideMouse() { } void Screen::showMouse() { - if (_mouseLockCount == 1) CursorMan.showMouse(true); @@ -2710,7 +2701,6 @@ void Screen::rectClip(int &x, int &y, int w, int h) { } 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 @@ int SJIStoFMTChunk(int f, int s) { // copied from scumm\charset.cpp } // end of anonymous namespace void Screen::drawCharSJIS(uint16 c, int x, int y) { - int color1 = _textColorsMap[1]; int color2 = _textColorsMap[0]; diff --git a/engines/kyra/screen_lok.cpp b/engines/kyra/screen_lok.cpp index c1461d34d0..6d97db2f28 100644 --- a/engines/kyra/screen_lok.cpp +++ b/engines/kyra/screen_lok.cpp @@ -79,7 +79,6 @@ const ScreenDim *Screen_LoK::getScreenDim(int dim) { } 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::deletePageFromDisk(int page) { } void Screen_LoK::copyBackgroundBlock(int x, int page, int flag) { - if (x < 1) return; diff --git a/engines/kyra/screen_lol.cpp b/engines/kyra/screen_lol.cpp index e30a68344c..d8f7a8abef 100644 --- a/engines/kyra/screen_lol.cpp +++ b/engines/kyra/screen_lol.cpp @@ -844,7 +844,6 @@ bool Screen_LoL::fadePalSpecial(uint8 *pal1, uint8 *pal2, uint32 elapsedTime, ui } uint8 Screen_LoL::getShapePaletteSize(const uint8 *shp) { - return shp[10]; } diff --git a/engines/kyra/screen_mr.cpp b/engines/kyra/screen_mr.cpp index 833437749b..a54eeacb02 100644 --- a/engines/kyra/screen_mr.cpp +++ b/engines/kyra/screen_mr.cpp @@ -129,7 +129,6 @@ int Screen_MR::getDrawLayer2(int x, int y, int height) { } 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); diff --git a/engines/kyra/screen_v2.cpp b/engines/kyra/screen_v2.cpp index f69da13dbe..e72321346f 100644 --- a/engines/kyra/screen_v2.cpp +++ b/engines/kyra/screen_v2.cpp @@ -115,7 +115,6 @@ int Screen_v2::findLeastDifferentColor(const uint8 *paletteEntry, const uint8 *p } 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 @@ int Screen_v2::getShapeScaledHeight(const uint8 *shpFile, int scale) { } 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 @@ bool Screen_v2::calcBounds(int w0, int h0, int &x1, int &y1, int &w1, int &h1, i } 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); diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp index 87879c806f..fd69a440dc 100644 --- a/engines/kyra/sequences_hof.cpp +++ b/engines/kyra/sequences_hof.cpp @@ -330,7 +330,6 @@ void KyraEngine_HoF::seq_playSequences(int startSeq, int endSeq) { } 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_introWestwood(WSAMovie_v2 *wsaObj, int x, int y, int frm } 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_introTitle(WSAMovie_v2 *wsaObj, int x, int y, int frm) { } 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_introOverview(WSAMovie_v2 *wsaObj, int x, int y, int frm } 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_introLibrary(WSAMovie_v2 *wsaObj, int x, int y, int frm) 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_cmpFadeFrame(const char *cmpFile) { } void KyraEngine_HoF::seq_playTalkText(uint8 chatNum) { - assert(chatNum < _sequenceSoundListSize); if (chatNum < 12 && !_flags.isDemo && textEnabled()) @@ -2160,7 +2154,6 @@ void KyraEngine_HoF::seq_playTalkText(uint8 chatNum) { } void KyraEngine_HoF::seq_waitForTextsTimeout() { - uint32 longest = seq_activeTextsTimeLeft() + _system->getMillis(); uint32 now = _system->getMillis(); @@ -2181,7 +2174,6 @@ void KyraEngine_HoF::seq_resetAllTextEntries() { } 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 @@ int KyraEngine_HoF::seq_setTextEntry(uint16 strIndex, uint16 posX, uint16 posY, } void KyraEngine_HoF::seq_loadNestedSequence(int wsaNum, int seqNum) { - if (_activeWSA[wsaNum].flags != -1) return; @@ -2520,7 +2511,6 @@ void KyraEngine_HoF::seq_playWsaSyncDialogue(uint16 strIndex, uint16 vocIndex, i 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; diff --git a/engines/kyra/sequences_lok.cpp b/engines/kyra/sequences_lok.cpp index cecf5aa546..2093b34ec3 100644 --- a/engines/kyra/sequences_lok.cpp +++ b/engines/kyra/sequences_lok.cpp @@ -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_demo() { } void KyraEngine_LoK::seq_intro() { - if (_flags.isTalkie) _res->loadPakFile("INTRO.VRM"); @@ -129,7 +127,6 @@ void KyraEngine_LoK::seq_intro() { } 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); diff --git a/engines/kyra/sequences_lol.cpp b/engines/kyra/sequences_lol.cpp index 6187e0c72c..846bc26def 100644 --- a/engines/kyra/sequences_lol.cpp +++ b/engines/kyra/sequences_lol.cpp @@ -36,7 +36,6 @@ namespace Kyra { #pragma mark - Intro int LoLEngine::processPrologue() { - setupPrologueData(true); if (!saveFileLoadable(0) || _flags.isDemo) @@ -117,7 +116,6 @@ int LoLEngine::processPrologue() { } 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::setupPrologueData(bool load) { } void LoLEngine::showIntro() { - _tim = new TIMInterpreter(this, _screen, _system); assert(_tim); @@ -266,7 +263,6 @@ void LoLEngine::showIntro() { } int LoLEngine::chooseCharacter() { - _tim = new TIMInterpreter(this, _screen, _system); assert(_tim); @@ -362,7 +358,6 @@ int LoLEngine::chooseCharacter() { } 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::kingSelectionIntro() { } 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::kingSelectionReminder() { } void LoLEngine::kingSelectionOutro() { - _sound->voicePlay("KING03"); int index = 0; @@ -469,7 +462,6 @@ void LoLEngine::kingSelectionOutro() { } void LoLEngine::processCharacterSelection() { - _charSelection = -1; while (!shouldQuit() && _charSelection == -1) { uint32 nextKingMessage = _system->getMillis() + 900 * _tickLength; @@ -486,7 +478,6 @@ void LoLEngine::processCharacterSelection() { } void LoLEngine::updateSelectionAnims() { - for (int i = 0; i < 4; ++i) { if (_system->getMillis() < _selectionAnimTimers[i]) continue; diff --git a/engines/kyra/sequences_mr.cpp b/engines/kyra/sequences_mr.cpp index deeade5e30..54874d26e9 100644 --- a/engines/kyra/sequences_mr.cpp +++ b/engines/kyra/sequences_mr.cpp @@ -108,7 +108,6 @@ void KyraEngine_MR::hideBadConscience() { } void KyraEngine_MR::showGoodConscience() { - if (_goodConscienceShown) return; diff --git a/engines/kyra/text_hof.cpp b/engines/kyra/text_hof.cpp index 85838502c1..4fa3ce29f4 100644 --- a/engines/kyra/text_hof.cpp +++ b/engines/kyra/text_hof.cpp @@ -87,7 +87,6 @@ void TextDisplayer_HoF::printCustomCharacterText(const char *text, int x, int y, } char *TextDisplayer_HoF::preprocessString(const char *str) { - if (str != _talkBuffer) { assert(strlen(str) < sizeof(_talkBuffer) - 1); strcpy(_talkBuffer, str); diff --git a/engines/kyra/text_mr.cpp b/engines/kyra/text_mr.cpp index 16c9439329..e28d97d154 100644 --- a/engines/kyra/text_mr.cpp +++ b/engines/kyra/text_mr.cpp @@ -82,7 +82,6 @@ char *TextDisplayer_MR::preprocessString(const char *str) { } int TextDisplayer_MR::dropCRIntoString(char *str, int minOffs, int maxOffs) { - int offset = 0; char *proc = str + minOffs; @@ -196,7 +195,6 @@ int KyraEngine_MR::chatCalcDuration(const char *str) { } 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::objectChatPrintText(const char *str, int object) { } void KyraEngine_MR::objectChatProcess(const char *script) { - memset(&_chatScriptData, 0, sizeof(_chatScriptData)); memset(&_chatScriptState, 0, sizeof(_chatScriptState)); @@ -488,7 +485,6 @@ void KyraEngine_MR::goodConscienceChatWaitToFinish() { } 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::albumChatWaitToFinish() { } void KyraEngine_MR::malcolmSceneStartupChat() { - if (_noStartupChat) return; @@ -794,7 +789,6 @@ void KyraEngine_MR::dialogStartScript(int object, int funcNum) { } void KyraEngine_MR::dialogEndScript(int object) { - _emc->init(&_dialogScriptState, &_dialogScriptData); _emc->start(&_dialogScriptState, _dialogScriptFuncEnd); @@ -810,7 +804,6 @@ void KyraEngine_MR::dialogEndScript(int object) { } 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::randomSceneChat() { } void KyraEngine_MR::runDialog(int dlgIndex, int funcNum) { - switch (_currentChapter-2) { case 0: dlgIndex -= 34; diff --git a/engines/kyra/timer.cpp b/engines/kyra/timer.cpp index 258449115a..d97ed73379 100644 --- a/engines/kyra/timer.cpp +++ b/engines/kyra/timer.cpp @@ -93,7 +93,6 @@ void TimerManager::reset() { } 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::addTimer(uint8 id, TimerFunc *func, int countdown, bool enabl } void TimerManager::update() { - if (_system->getMillis() < _nextRun || _isPaused) return; @@ -137,7 +135,6 @@ void TimerManager::update() { } void TimerManager::resync() { - const uint32 curTime = _isPaused ? _pauseStart : _system->getMillis(); _nextRun = 0; // force rerun @@ -149,7 +146,6 @@ void TimerManager::resetNextRun() { } 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::setCountdown(uint8 id, int32 countdown) { } 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 @@ void TimerManager::setDelay(uint8 id, int32 countdown) { } 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 @@ int32 TimerManager::getDelay(uint8 id) const { } 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 @@ void TimerManager::setNextRun(uint8 id, uint32 nextRun) { } 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 @@ void TimerManager::pauseSingleTimer(uint8 id, bool p) { } 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 @@ bool TimerManager::isEnabled(uint8 id) const { } 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::enable(uint8 id) { } 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::disable(uint8 id) { } void TimerManager::loadDataFromFile(Common::SeekableReadStream &file, int version) { - const uint32 loadTime = _isPaused ? _pauseStart : _system->getMillis(); if (version <= 7) { @@ -303,7 +291,6 @@ void TimerManager::loadDataFromFile(Common::SeekableReadStream &file, int versio } void TimerManager::saveDataToFile(Common::WriteStream &file) const { - const uint32 saveTime = _isPaused ? _pauseStart : _system->getMillis(); file.writeByte(count()); diff --git a/engines/kyra/timer_hof.cpp b/engines/kyra/timer_hof.cpp index 77cbee365a..9d502f0492 100644 --- a/engines/kyra/timer_hof.cpp +++ b/engines/kyra/timer_hof.cpp @@ -31,7 +31,6 @@ namespace Kyra { #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::timerBurnZanthia(int arg) { } void KyraEngine_HoF::setTimer1DelaySecs(int secs) { - if (secs == -1) secs = 32000; @@ -99,7 +97,6 @@ void KyraEngine_HoF::setTimer1DelaySecs(int secs) { } void KyraEngine_HoF::setWalkspeed(uint8 newSpeed) { - if (newSpeed < 5) newSpeed = 3; else diff --git a/engines/kyra/timer_lok.cpp b/engines/kyra/timer_lok.cpp index 576cf8da4e..0e05188fe8 100644 --- a/engines/kyra/timer_lok.cpp +++ b/engines/kyra/timer_lok.cpp @@ -36,7 +36,6 @@ namespace Kyra { #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); diff --git a/engines/kyra/timer_lol.cpp b/engines/kyra/timer_lol.cpp index f20d607d40..b17fdc7d46 100644 --- a/engines/kyra/timer_lol.cpp +++ b/engines/kyra/timer_lol.cpp @@ -34,7 +34,6 @@ namespace Kyra { #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); diff --git a/engines/kyra/timer_mr.cpp b/engines/kyra/timer_mr.cpp index 16533d226a..0b9eb221b1 100644 --- a/engines/kyra/timer_mr.cpp +++ b/engines/kyra/timer_mr.cpp @@ -31,7 +31,6 @@ namespace Kyra { #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::timerFleaDeath(int arg) { } void KyraEngine_MR::setWalkspeed(uint8 speed) { - if (speed < 5) speed = 3; else |