diff options
-rw-r--r-- | engines/saga/displayinfo.h | 3 | ||||
-rw-r--r-- | engines/saga/interface.cpp | 4 | ||||
-rw-r--r-- | engines/saga/itedata.h | 3 | ||||
-rw-r--r-- | engines/saga/saveload.cpp | 2 | ||||
-rw-r--r-- | engines/saga/scene.cpp | 5 |
5 files changed, 4 insertions, 13 deletions
diff --git a/engines/saga/displayinfo.h b/engines/saga/displayinfo.h index 0d7bfaf554..76e647ef2a 100644 --- a/engines/saga/displayinfo.h +++ b/engines/saga/displayinfo.h @@ -280,7 +280,7 @@ static const GameDisplayInfo ITE_DisplayInfo = { }; -//TODO: ihnm +// IHNM #define IHNM_CONVERSE_MAX_TEXT_WIDTH (485 - 8) #define IHNM_CONVERSE_TEXT_HEIGHT 10 #define IHNM_CONVERSE_TEXT_LINES 11 @@ -354,7 +354,6 @@ static PanelButton IHNM_LoadPanelButtons[] = { }; static PanelButton IHNM_SavePanelButtons[] = { - // TODO {kPanelButtonSave, 25,79, 80,25, kTextSave,'s',0, 0,0,0}, {kPanelButtonSave, 155,79, 80,25, kTextCancel,'c',0, 0,0,0}, {kPanelButtonSaveEdit, 26,57, 209,17, 0,'-',0, 0,0,0}, diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp index 8733d35cb1..3d8ccc7e0f 100644 --- a/engines/saga/interface.cpp +++ b/engines/saga/interface.cpp @@ -420,8 +420,8 @@ void Interface::setMode(int mode) { switch (_panelMode) { case kPanelMain: - if (_vm->getGameType() == GType_IHNM) - warning("FIXME: Implement IHNM differences from ExecuteInventoryPanel"); + // FIXME: Implement IHNM differences from ExecuteInventoryPanel for IHNM (though I believe they're already + // implemented) _mainPanel.currentButton = NULL; break; diff --git a/engines/saga/itedata.h b/engines/saga/itedata.h index d9bd59adc4..3c594b5fec 100644 --- a/engines/saga/itedata.h +++ b/engines/saga/itedata.h @@ -41,9 +41,6 @@ enum ActorFlags { kNoScale = 0x80 // (1<<7) Actor is not scaled }; -// TODO: This doesn't quite correspond to the original Actor struct, so I'm not -// sure if I got it right. - struct ActorTableData { byte flags; byte nameIndex; diff --git a/engines/saga/saveload.cpp b/engines/saga/saveload.cpp index d04b72f7a8..a0154c0fd2 100644 --- a/engines/saga/saveload.cpp +++ b/engines/saga/saveload.cpp @@ -237,8 +237,8 @@ void SagaEngine::load(const char *fileName) { // Some older saves were not written in an endian safe fashion. // We try to detect this here by checking for extremly high version values. // If found, we retry with the data swapped. - // FIXME: Maybe display a warning/error message instead? if (_saveHeader.version > 0xFFFFFF) { + warning("This savegame is not endian safe, retrying with the data swapped"); _saveHeader.version = SWAP_BYTES_32(_saveHeader.version); } diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp index adb3f9feaa..5ab7fbb4a5 100644 --- a/engines/saga/scene.cpp +++ b/engines/saga/scene.cpp @@ -811,11 +811,6 @@ void Scene::loadScene(LoadSceneParams *loadSceneParams) { _vm->_sound->stopAll(); - // FIXME: Does IHNM use scene background music, or is all the - // music scripted? At the very least, it shouldn't try - // to start song 0 at the beginning of the game, since - // it's the end credits music. - if (_vm->getGameType() == GType_ITE) { if (_sceneDescription.musicResourceId >= 0) { event.type = kEvTOneshot; |