diff options
Diffstat (limited to 'engines/kyra')
-rw-r--r-- | engines/kyra/detection.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/eobcommon.h | 2 | ||||
-rw-r--r-- | engines/kyra/gui.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/gui_eob.cpp | 3 | ||||
-rw-r--r-- | engines/kyra/gui_rpg.cpp | 1 | ||||
-rw-r--r-- | engines/kyra/gui_v1.cpp | 1 | ||||
-rw-r--r-- | engines/kyra/gui_v1.h | 1 | ||||
-rw-r--r-- | engines/kyra/items_eob.cpp | 1 | ||||
-rw-r--r-- | engines/kyra/items_lok.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/kyra_rpg.h | 2 | ||||
-rw-r--r-- | engines/kyra/kyra_v1.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/resource.h | 142 | ||||
-rw-r--r-- | engines/kyra/screen.cpp | 6 | ||||
-rw-r--r-- | engines/kyra/screen_eob.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/screen_eob.h | 2 | ||||
-rw-r--r-- | engines/kyra/staticres_eob.cpp | 17 | ||||
-rw-r--r-- | engines/kyra/staticres_rpg.cpp | 1 | ||||
-rw-r--r-- | engines/kyra/text_lol.h | 1 | ||||
-rw-r--r-- | engines/kyra/wsamovie.cpp | 2 |
19 files changed, 90 insertions, 102 deletions
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp index 56ad42773c..ceb3ef6728 100644 --- a/engines/kyra/detection.cpp +++ b/engines/kyra/detection.cpp @@ -84,7 +84,7 @@ bool KyraMetaEngine::hasFeature(MetaEngineFeature f) const { (f == kSupportsListSaves) || (f == kSupportsLoadingDuringStartup) || (f == kSupportsDeleteSave) || - (f == kSavesSupportMetaInfo) || + (f == kSavesSupportMetaInfo) || (f == kSavesSupportThumbnail); } diff --git a/engines/kyra/eobcommon.h b/engines/kyra/eobcommon.h index 18fe893d80..af16df7f44 100644 --- a/engines/kyra/eobcommon.h +++ b/engines/kyra/eobcommon.h @@ -1147,4 +1147,4 @@ protected: #endif // ENABLE_EOB -#endif
\ No newline at end of file +#endif diff --git a/engines/kyra/gui.cpp b/engines/kyra/gui.cpp index 9c0adf159b..e2195cad17 100644 --- a/engines/kyra/gui.cpp +++ b/engines/kyra/gui.cpp @@ -139,5 +139,3 @@ void GUI::updateSaveSlotsList() { } } // End of namespace Kyra - - diff --git a/engines/kyra/gui_eob.cpp b/engines/kyra/gui_eob.cpp index 76b4b35b08..1930ab1e59 100644 --- a/engines/kyra/gui_eob.cpp +++ b/engines/kyra/gui_eob.cpp @@ -3632,7 +3632,7 @@ void GUI_EoB::displayTextBox(int id) { _screen->updateScreen(); for (uint32 timeOut = _vm->_system->getMillis() + 1440; _vm->_system->getMillis() < timeOut && !_vm->shouldQuit(); ) { - int in = _vm->checkInput(0, false, 0); + int in = _vm->checkInput(0, false, 0); _vm->removeInputTop(); if (in && !(in & 0x800)) break; @@ -3963,4 +3963,3 @@ const EoBRect16 GUI_EoB::_updateBoxFrameHighLights[] = { } // End of namespace Kyra #endif // ENABLE_EOB - diff --git a/engines/kyra/gui_rpg.cpp b/engines/kyra/gui_rpg.cpp index 8b2a593d6b..718722f58d 100644 --- a/engines/kyra/gui_rpg.cpp +++ b/engines/kyra/gui_rpg.cpp @@ -131,4 +131,3 @@ bool KyraRpgEngine::clickedShape(int shapeIndex) { } // End of namespace Kyra #endif // defined(ENABLE_EOB) || defined(ENABLE_LOL) - diff --git a/engines/kyra/gui_v1.cpp b/engines/kyra/gui_v1.cpp index c38c828ff0..ab441878a6 100644 --- a/engines/kyra/gui_v1.cpp +++ b/engines/kyra/gui_v1.cpp @@ -627,4 +627,3 @@ void MainMenu::printString(const char *format, int x, int y, int col1, int col2, } } // End of namespace Kyra - diff --git a/engines/kyra/gui_v1.h b/engines/kyra/gui_v1.h index ec0d577982..260edae8e5 100644 --- a/engines/kyra/gui_v1.h +++ b/engines/kyra/gui_v1.h @@ -195,4 +195,3 @@ private: } // end of namesapce Kyra #endif - diff --git a/engines/kyra/items_eob.cpp b/engines/kyra/items_eob.cpp index 8ade6e1935..28764dfe20 100644 --- a/engines/kyra/items_eob.cpp +++ b/engines/kyra/items_eob.cpp @@ -729,4 +729,3 @@ void EoBCoreEngine::reloadWeaponSlot(int charIndex, int slotIndex, int itemType, } // End of namespace Kyra #endif // ENABLE_EOB - diff --git a/engines/kyra/items_lok.cpp b/engines/kyra/items_lok.cpp index d598a17cf1..7e41811441 100644 --- a/engines/kyra/items_lok.cpp +++ b/engines/kyra/items_lok.cpp @@ -575,7 +575,7 @@ void KyraEngine_LoK::dropItem(int unk1, int item, int x, int y, int unk2) { if (processItemDrop(_currentCharacter->sceneId, item, x, y, unk1, unk2)) return; snd_playSoundEffect(54); - + // Old floppy versions don't print warning messages and don't have the necessary string resources. // These versions will only play the warning sound effect. if (_flags.isOldFloppy && !_noDropList) diff --git a/engines/kyra/kyra_rpg.h b/engines/kyra/kyra_rpg.h index 5d217b6f28..13a67c6d56 100644 --- a/engines/kyra/kyra_rpg.h +++ b/engines/kyra/kyra_rpg.h @@ -353,4 +353,4 @@ protected: #endif // ENABLE_EOB || ENABLE_LOL -#endif
\ No newline at end of file +#endif diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_v1.cpp index c1b9f2a453..b818243a08 100644 --- a/engines/kyra/kyra_v1.cpp +++ b/engines/kyra/kyra_v1.cpp @@ -406,7 +406,7 @@ void KyraEngine_v1::setupKeyMap() { { KC(s), 32, 32 }, { KC(w), 18, 18 }, { KC(y), 22, 22 }, - { KC(z), 46, 46 }, + { KC(z), 46, 46 }, { KC(1), 2, 0/*unknown*/ }, { KC(2), 3, 0/*unknown*/ }, { KC(3), 4, 0/*unknown*/ }, diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h index 30cf17dc1a..45c18517a9 100644 --- a/engines/kyra/resource.h +++ b/engines/kyra/resource.h @@ -291,7 +291,7 @@ enum KyraResources { kEoBBaseItemSuffixStringsRings, kEoBBaseItemSuffixStringsPotions, kEoBBaseItemSuffixStringsWands, - + kEoBBaseRipItemStrings, kEoBBaseCursedString, kEoBBaseEnchantedString, @@ -543,83 +543,83 @@ enum KyraResources { kEoB2IntroStrings, kEoB2IntroCPSFiles, kEoB2IntroSeqData00, - kEoB2IntroSeqData01, - kEoB2IntroSeqData02, - kEoB2IntroSeqData03, - kEoB2IntroSeqData04, - kEoB2IntroSeqData05, - kEoB2IntroSeqData06, - kEoB2IntroSeqData07, - kEoB2IntroSeqData08, - kEoB2IntroSeqData09, - kEoB2IntroSeqData10, - kEoB2IntroSeqData11, - kEoB2IntroSeqData12, - kEoB2IntroSeqData13, - kEoB2IntroSeqData14, - kEoB2IntroSeqData15, - kEoB2IntroSeqData16, - kEoB2IntroSeqData17, - kEoB2IntroSeqData18, - kEoB2IntroSeqData19, - kEoB2IntroSeqData20, - kEoB2IntroSeqData21, - kEoB2IntroSeqData22, - kEoB2IntroSeqData23, - kEoB2IntroSeqData24, - kEoB2IntroSeqData25, - kEoB2IntroSeqData26, - kEoB2IntroSeqData27, - kEoB2IntroSeqData28, - kEoB2IntroSeqData29, - kEoB2IntroSeqData30, - kEoB2IntroSeqData31, - kEoB2IntroSeqData32, - kEoB2IntroSeqData33, - kEoB2IntroSeqData34, - kEoB2IntroSeqData35, - kEoB2IntroSeqData36, - kEoB2IntroSeqData37, - kEoB2IntroSeqData38, - kEoB2IntroSeqData39, - kEoB2IntroSeqData40, - kEoB2IntroSeqData41, - kEoB2IntroSeqData42, - kEoB2IntroSeqData43, + kEoB2IntroSeqData01, + kEoB2IntroSeqData02, + kEoB2IntroSeqData03, + kEoB2IntroSeqData04, + kEoB2IntroSeqData05, + kEoB2IntroSeqData06, + kEoB2IntroSeqData07, + kEoB2IntroSeqData08, + kEoB2IntroSeqData09, + kEoB2IntroSeqData10, + kEoB2IntroSeqData11, + kEoB2IntroSeqData12, + kEoB2IntroSeqData13, + kEoB2IntroSeqData14, + kEoB2IntroSeqData15, + kEoB2IntroSeqData16, + kEoB2IntroSeqData17, + kEoB2IntroSeqData18, + kEoB2IntroSeqData19, + kEoB2IntroSeqData20, + kEoB2IntroSeqData21, + kEoB2IntroSeqData22, + kEoB2IntroSeqData23, + kEoB2IntroSeqData24, + kEoB2IntroSeqData25, + kEoB2IntroSeqData26, + kEoB2IntroSeqData27, + kEoB2IntroSeqData28, + kEoB2IntroSeqData29, + kEoB2IntroSeqData30, + kEoB2IntroSeqData31, + kEoB2IntroSeqData32, + kEoB2IntroSeqData33, + kEoB2IntroSeqData34, + kEoB2IntroSeqData35, + kEoB2IntroSeqData36, + kEoB2IntroSeqData37, + kEoB2IntroSeqData38, + kEoB2IntroSeqData39, + kEoB2IntroSeqData40, + kEoB2IntroSeqData41, + kEoB2IntroSeqData42, + kEoB2IntroSeqData43, kEoB2IntroShapes00, - kEoB2IntroShapes01, - kEoB2IntroShapes04, - kEoB2IntroShapes07, + kEoB2IntroShapes01, + kEoB2IntroShapes04, + kEoB2IntroShapes07, kEoB2FinaleStrings, kEoB2CreditsData, kEoB2FinaleCPSFiles, kEoB2FinaleSeqData00, - kEoB2FinaleSeqData01, - kEoB2FinaleSeqData02, - kEoB2FinaleSeqData03, - kEoB2FinaleSeqData04, - kEoB2FinaleSeqData05, - kEoB2FinaleSeqData06, - kEoB2FinaleSeqData07, - kEoB2FinaleSeqData08, - kEoB2FinaleSeqData09, - kEoB2FinaleSeqData10, - kEoB2FinaleSeqData11, - kEoB2FinaleSeqData12, - kEoB2FinaleSeqData13, - kEoB2FinaleSeqData14, - kEoB2FinaleSeqData15, - kEoB2FinaleSeqData16, - kEoB2FinaleSeqData17, - kEoB2FinaleSeqData18, - kEoB2FinaleSeqData19, - kEoB2FinaleSeqData20, + kEoB2FinaleSeqData01, + kEoB2FinaleSeqData02, + kEoB2FinaleSeqData03, + kEoB2FinaleSeqData04, + kEoB2FinaleSeqData05, + kEoB2FinaleSeqData06, + kEoB2FinaleSeqData07, + kEoB2FinaleSeqData08, + kEoB2FinaleSeqData09, + kEoB2FinaleSeqData10, + kEoB2FinaleSeqData11, + kEoB2FinaleSeqData12, + kEoB2FinaleSeqData13, + kEoB2FinaleSeqData14, + kEoB2FinaleSeqData15, + kEoB2FinaleSeqData16, + kEoB2FinaleSeqData17, + kEoB2FinaleSeqData18, + kEoB2FinaleSeqData19, + kEoB2FinaleSeqData20, kEoB2FinaleShapes00, - kEoB2FinaleShapes03, - kEoB2FinaleShapes07, - kEoB2FinaleShapes09, - kEoB2FinaleShapes10, + kEoB2FinaleShapes03, + kEoB2FinaleShapes07, + kEoB2FinaleShapes09, + kEoB2FinaleShapes10, kEoB2NpcShapeData, kEoB2Npc1Strings, diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index e4613e2634..9a8bff6346 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -2062,7 +2062,7 @@ void Screen::decodeFrame1(const uint8 *src, uint8 *dst, uint32 size) { Pattern *patterns = new Pattern[3840]; uint16 numPatterns = 0; - uint8 nib = 0; + uint8 nib = 0; uint16 code = decodeEGAGetCode(src, nib); uint8 last = code & 0xff; @@ -2125,7 +2125,7 @@ void Screen::decodeFrame1(const uint8 *src, uint8 *dst, uint32 size) { uint16 Screen::decodeEGAGetCode(const uint8 *&pos, uint8 &nib) { uint16 res = READ_BE_UINT16(pos++); if ((++nib) & 1) { - res >>= 4; + res >>= 4; } else { pos++; res &= 0xfff; @@ -3057,7 +3057,7 @@ bool Screen::loadPalette(const char *filename, Palette &pal) { } else if (_vm->gameFlags().platform == Common::kPlatformPC98 && _use16ColorMode) { numCols = stream->size() / Palette::kPC98BytesPerColor; pal.loadPC98Palette(*stream, 0, MIN(maxCols, numCols)); - } else if (_vm->gameFlags().gameID == GI_EOB1) { + } else if (_vm->gameFlags().gameID == GI_EOB1) { numCols = stream->size() / Palette::kVGABytesPerColor; pal.loadVGAPalette7bit(*stream, 0, MIN(maxCols, numCols)); } else { diff --git a/engines/kyra/screen_eob.cpp b/engines/kyra/screen_eob.cpp index 15a9fefc37..62d8bca201 100644 --- a/engines/kyra/screen_eob.cpp +++ b/engines/kyra/screen_eob.cpp @@ -285,7 +285,7 @@ uint8 *Screen_EoB::encodeShape(uint16 x, uint16 y, uint16 w, uint16 h, bool no4b srcPage += 320; src = srcPage; } - delete [] colorMap; + delete [] colorMap; } return shp; diff --git a/engines/kyra/screen_eob.h b/engines/kyra/screen_eob.h index 2ede813cd6..2efed83c0c 100644 --- a/engines/kyra/screen_eob.h +++ b/engines/kyra/screen_eob.h @@ -101,5 +101,3 @@ private: #endif // ENABLE_EOB #endif - - diff --git a/engines/kyra/staticres_eob.cpp b/engines/kyra/staticres_eob.cpp index f3460bc9c5..c99e0a8234 100644 --- a/engines/kyra/staticres_eob.cpp +++ b/engines/kyra/staticres_eob.cpp @@ -1204,10 +1204,10 @@ void DarkMoonEngine::initStaticResource() { _shapesIntro = new const EoBShapeDef*[13]; memset(_shapesIntro, 0, sizeof(EoBShapeDef*) * 13); - _shapesIntro[0] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes00, temp); - _shapesIntro[1] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes01, temp); - _shapesIntro[4] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes04, temp); - _shapesIntro[7] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes07, temp); + _shapesIntro[0] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes00, temp); + _shapesIntro[1] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes01, temp); + _shapesIntro[4] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes04, temp); + _shapesIntro[7] = _staticres->loadEoB2ShapeData(kEoB2IntroShapes07, temp); _finaleStrings = _staticres->loadStrings(kEoB2FinaleStrings, temp); _creditsData = _staticres->loadRawData(kEoB2CreditsData, temp); @@ -1220,10 +1220,10 @@ void DarkMoonEngine::initStaticResource() { _shapesFinale = new const EoBShapeDef*[13]; memset(_shapesFinale, 0, sizeof(EoBShapeDef*) * 13); _shapesFinale[0] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes00, temp); - _shapesFinale[3] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes03, temp); - _shapesFinale[7] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes07, temp); - _shapesFinale[9] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes09, temp); - _shapesFinale[10] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes10, temp); + _shapesFinale[3] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes03, temp); + _shapesFinale[7] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes07, temp); + _shapesFinale[9] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes09, temp); + _shapesFinale[10] = _staticres->loadEoB2ShapeData(kEoB2FinaleShapes10, temp); _dscDoorType5Offs = _staticres->loadRawData(kEoBBaseDscDoorType5Offs, temp); @@ -1286,4 +1286,3 @@ const char *DarkMoonEngine::_palFilesFinale[] = { #endif // ENABLE_EOB } // End of namespace Kyra - diff --git a/engines/kyra/staticres_rpg.cpp b/engines/kyra/staticres_rpg.cpp index efee3bed78..cc75ae3442 100644 --- a/engines/kyra/staticres_rpg.cpp +++ b/engines/kyra/staticres_rpg.cpp @@ -94,4 +94,3 @@ void KyraRpgEngine::initStaticResource() { #endif // (ENABLE_EOB || ENABLE_LOL) } // End of namespace Kyra - diff --git a/engines/kyra/text_lol.h b/engines/kyra/text_lol.h index baf0f2f2c5..a5eebd67c4 100644 --- a/engines/kyra/text_lol.h +++ b/engines/kyra/text_lol.h @@ -68,4 +68,3 @@ private: #endif // ENABLE_LOL #endif - diff --git a/engines/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp index 21ff80f033..076c5861a2 100644 --- a/engines/kyra/wsamovie.cpp +++ b/engines/kyra/wsamovie.cpp @@ -95,7 +95,7 @@ int WSAMovie_v1::open(const char *filename, int offscreenDecode, Palette *palBuf for (int i = 1; i < _numFrames + 2; ++i) { _frameOffsTable[i] = READ_LE_UINT32(wsaData); - if (_frameOffsTable[i]) + if (_frameOffsTable[i]) _frameOffsTable[i] -= frameDataOffs; wsaData += 4; } |