aboutsummaryrefslogtreecommitdiff
path: root/engines/igor
diff options
context:
space:
mode:
authorMax Horn2008-11-06 17:05:54 +0000
committerMax Horn2008-11-06 17:05:54 +0000
commit40136f25909bd8773cac0f08740a36037395e9a7 (patch)
treebf61db949f9942c10cad667042b1e2403a9b51cd /engines/igor
parent4c8f221fb8f5735932652c3279efd6f2e941d948 (diff)
downloadscummvm-rg350-40136f25909bd8773cac0f08740a36037395e9a7.tar.gz
scummvm-rg350-40136f25909bd8773cac0f08740a36037395e9a7.tar.bz2
scummvm-rg350-40136f25909bd8773cac0f08740a36037395e9a7.zip
Switched various Engine APIs to use Common::Error
svn-id: r34916
Diffstat (limited to 'engines/igor')
-rw-r--r--engines/igor/igor.cpp8
-rw-r--r--engines/igor/igor.h8
-rw-r--r--engines/igor/saveload.cpp8
3 files changed, 12 insertions, 12 deletions
diff --git a/engines/igor/igor.cpp b/engines/igor/igor.cpp
index 4d4fb97762..d68aeb7c3e 100644
--- a/engines/igor/igor.cpp
+++ b/engines/igor/igor.cpp
@@ -88,14 +88,14 @@ IgorEngine::~IgorEngine() {
delete _midiPlayer;
}
-int IgorEngine::init() {
+Common::Error IgorEngine::init() {
_system->beginGFXTransaction();
initCommonGFX(false);
_system->initSize(320, 200);
_system->endGFXTransaction();
_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
- return 0;
+ return Common::kNoError;
}
void IgorEngine::restart() {
@@ -169,7 +169,7 @@ void IgorEngine::restart() {
_gameTicks = 0;
}
-int IgorEngine::go() {
+Common::Error IgorEngine::go() {
restart();
setupDefaultPalette();
_currentPart = ConfMan.getInt("boot_param");
@@ -192,7 +192,7 @@ int IgorEngine::go() {
PART_MAIN();
_ovlFile.close();
_sndFile.close();
- return 0;
+ return Common::kNoError;
}
void IgorEngine::readTableFile() {
diff --git a/engines/igor/igor.h b/engines/igor/igor.h
index 418a7ad6b4..4ded9d1eb3 100644
--- a/engines/igor/igor.h
+++ b/engines/igor/igor.h
@@ -312,8 +312,8 @@ public:
IgorEngine(OSystem *system, const DetectedGameVersion *dgv);
virtual ~IgorEngine();
- virtual int init();
- virtual int go();
+ virtual Common::Error init();
+ virtual Common::Error go();
void handleOptionsMenu_paintSave();
bool handleOptionsMenu_handleKeyDownSave(int key);
@@ -427,8 +427,8 @@ protected:
void dialogueReplyToQuestion(int x, int y, int r, int g, int b, int reply = 0);
void saveOrLoadGameState(TypeSerializer &typeSerializer);
- int loadGameState(int slot);
- int saveGameState(int slot);
+ Common::Error loadGameState(int slot);
+ Common::Error saveGameState(int slot);
void generateGameStateFileName(int num, char *dst, int len) const;
MidiPlayer *_midiPlayer;
diff --git a/engines/igor/saveload.cpp b/engines/igor/saveload.cpp
index a87ecc0ba5..cbae77a343 100644
--- a/engines/igor/saveload.cpp
+++ b/engines/igor/saveload.cpp
@@ -156,7 +156,7 @@ void IgorEngine::saveOrLoadGameState(TypeSerializer &typeSerializer) {
}
}
-int IgorEngine::loadGameState(int slot) {
+Common::Error IgorEngine::loadGameState(int slot) {
char name[64];
generateGameStateFileName(slot, name, 63);
Common::InSaveFile *isf = _saveFileMan->openForLoading(name);
@@ -176,10 +176,10 @@ int IgorEngine::loadGameState(int slot) {
debug(0, "Loaded state, current part %d", _currentPart);
}
- return 0; // TODO: return success/failure
+ return Common::kNoError; // TODO: return success/failure
}
-int IgorEngine::saveGameState(int slot) {
+Common::Error IgorEngine::saveGameState(int slot) {
char name[64];
generateGameStateFileName(slot, name, 63);
Common::OutSaveFile *osf = _saveFileMan->openForSaving(name);
@@ -190,7 +190,7 @@ int IgorEngine::saveGameState(int slot) {
delete osf;
}
- return 0; // TODO: return success/failure
+ return Common::kNoError; // TODO: return success/failure
}
void IgorEngine::generateGameStateFileName(int num, char *dst, int len) const {