diff options
| author | Johannes Schickel | 2007-12-24 22:27:30 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2007-12-24 22:27:30 +0000 |
| commit | 28a57c434a190fa3f40b3c428f9ee5642a3d04cc (patch) | |
| tree | 1f6f98c467b8ea49d6311af77ba70bf17af3c049 /engines/kyra/kyra_v2.cpp | |
| parent | 6b722c2f1c2dd328e02808a5a8b2eee0b58034f0 (diff) | |
| download | scummvm-rg350-28a57c434a190fa3f40b3c428f9ee5642a3d04cc.tar.gz scummvm-rg350-28a57c434a190fa3f40b3c428f9ee5642a3d04cc.tar.bz2 scummvm-rg350-28a57c434a190fa3f40b3c428f9ee5642a3d04cc.zip | |
Cleanup(/formatting).
svn-id: r29983
Diffstat (limited to 'engines/kyra/kyra_v2.cpp')
| -rw-r--r-- | engines/kyra/kyra_v2.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index ffb5caab0f..608e954307 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -179,7 +179,8 @@ int KyraEngine_v2::go() { if (_flags.platform == Common::kPlatformPC && (_flags.isTalkie || _flags.isDemo)) { _res->loadFileList("FILEDATA.FDT"); } else if (_flags.platform == Common::kPlatformPC) { - //TODO + //TODO: + //What files are needed for floppy version? } else if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) { char tmpfilename[13]; static const char * pakfiles [] = { "KYRA.DAT", "AUDIO.PAK", "CAULDRON.PAK", @@ -807,7 +808,8 @@ void KyraEngine_v2::loadChapterBuffer(int chapter) { } void KyraEngine_v2::changeFileExtension(char *buffer) { - while (*buffer != '.') ++buffer; + while (*buffer != '.') + ++buffer; ++buffer; strcpy(buffer, _languageExtension[_lang]); @@ -985,6 +987,7 @@ void KyraEngine_v2::loadZShapes(int shapes) { for (int i = 9; i <= 32; ++i) { delete [] _defaultShapeTable[i]; _defaultShapeTable[i] = _screen->makeShapeCopy(data, i-9); + assert(_defaultShapeTable[i]); } delete [] data; @@ -997,8 +1000,10 @@ void KyraEngine_v2::loadInventoryShapes() { _screen->loadBitmap("_PLAYALL.CPS", 3, 3, 0); - for (int i = 0; i < 10; ++i) + for (int i = 0; i < 10; ++i) { _defaultShapeTable[240+i] = _screen->encodeShape(_inventoryX[i], _inventoryY[i], 16, 16, 0); + assert(_defaultShapeTable[240+i]); + } _screen->_curPage = curPageBackUp; } @@ -1088,8 +1093,7 @@ void KyraEngine_v2::runTemporaryScript(const char *filename, int unk1, int unk2, #pragma mark - void KyraEngine_v2::resetScaleTable() { - for (int i = 0; i < ARRAYSIZE(_scaleTable); ++i) - _scaleTable[i] = 0x100; + Common::set_to(_scaleTable, _scaleTable + ARRAYSIZE(_scaleTable), 0x100); } void KyraEngine_v2::setScaleTableItem(int item, int data) { @@ -1308,6 +1312,7 @@ void KyraEngine_v2::updateCharAnimFrame(int charId, int *table) { Character *character = &_mainCharacter; ++character->animFrame; + int facing = character->facing; if (table) { |