diff options
author | Eric Fry | 2018-06-26 18:45:29 +1000 |
---|---|---|
committer | Eugene Sandulenko | 2018-07-20 06:43:33 +0000 |
commit | 3d9f5ed20ff182ee0cbb621f2bcf0b98a44e384d (patch) | |
tree | 48664e74ab7409ce014c50d73ed731927fe822a0 /engines/illusions/bbdou | |
parent | d77dd6c14ab6c41513ed282597a6da82289061e8 (diff) | |
download | scummvm-rg350-3d9f5ed20ff182ee0cbb621f2bcf0b98a44e384d.tar.gz scummvm-rg350-3d9f5ed20ff182ee0cbb621f2bcf0b98a44e384d.tar.bz2 scummvm-rg350-3d9f5ed20ff182ee0cbb621f2bcf0b98a44e384d.zip |
ILLUSIONS: Replace spaces with tabs
Replace while(1) with do..while loop
Removed dead code
Renamed FP16 to FixedPoint16 to improve readability
Diffstat (limited to 'engines/illusions/bbdou')
-rw-r--r-- | engines/illusions/bbdou/bbdou_credits.cpp | 2 | ||||
-rw-r--r-- | engines/illusions/bbdou/bbdou_specialcode.cpp | 2 | ||||
-rw-r--r-- | engines/illusions/bbdou/illusions_bbdou.cpp | 14 | ||||
-rw-r--r-- | engines/illusions/bbdou/illusions_bbdou.h | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/engines/illusions/bbdou/bbdou_credits.cpp b/engines/illusions/bbdou/bbdou_credits.cpp index eb2377933f..393026e9f7 100644 --- a/engines/illusions/bbdou/bbdou_credits.cpp +++ b/engines/illusions/bbdou/bbdou_credits.cpp @@ -98,7 +98,7 @@ void BbdouCredits::drawTextToControl(uint32 objectId, const char *text, uint ali charToWChar(text, wtext, ARRAYSIZE(wtext)); // TODO Extract to Actor class - Control *control = _vm->getObjectControl(objectId); + Control *control = _vm->getObjectControl(objectId); FontResource *font = _vm->_dict->findFont(_currFontId); TextDrawer textDrawer; WidthHeight dimensions; diff --git a/engines/illusions/bbdou/bbdou_specialcode.cpp b/engines/illusions/bbdou/bbdou_specialcode.cpp index bc6ed0338d..95e17fad2e 100644 --- a/engines/illusions/bbdou/bbdou_specialcode.cpp +++ b/engines/illusions/bbdou/bbdou_specialcode.cpp @@ -60,7 +60,7 @@ CauseThread_BBDOU::CauseThread_BBDOU(IllusionsEngine_BBDOU *vm, uint32 threadId, _sceneId(sceneId), _verbId(verbId), _objectId2(objectId2), _objectId(objectId) { _type = kTTSpecialThread; } - + void CauseThread_BBDOU::onNotify() { _bbdou->_cursor->_data._causeThreadId1 = 0; terminate(); diff --git a/engines/illusions/bbdou/illusions_bbdou.cpp b/engines/illusions/bbdou/illusions_bbdou.cpp index f3845a69ee..06cfc2891a 100644 --- a/engines/illusions/bbdou/illusions_bbdou.cpp +++ b/engines/illusions/bbdou/illusions_bbdou.cpp @@ -168,7 +168,7 @@ Common::Error IllusionsEngine_BBDOU::run() { _screen->setColorKey1(0xF81F); - initInput(); + initInput(); initUpdateFunctions(); @@ -188,10 +188,10 @@ Common::Error IllusionsEngine_BBDOU::run() { ConfMan.registerDefault("talkspeed", 240); _subtitleDuration = (uint16)ConfMan.getInt("talkspeed"); - _globalSceneId = 0x00010003; - + _globalSceneId = 0x00010003; + setDefaultTextCoords(); - + _resSys->loadResource(0x000D0001, 0, 0); _doScriptThreadInit = false; @@ -214,7 +214,7 @@ Common::Error IllusionsEngine_BBDOU::run() { delete _stack; delete _scriptOpcodes; - delete _soundMan; + delete _soundMan; delete _updateFunctions; delete _threads; delete _triggerFunctions; @@ -230,9 +230,9 @@ Common::Error IllusionsEngine_BBDOU::run() { delete _resSys; delete _resReader; delete _dict; - + debug("Ok"); - + return Common::kNoError; } diff --git a/engines/illusions/bbdou/illusions_bbdou.h b/engines/illusions/bbdou/illusions_bbdou.h index 00ce617596..c1bd22b1fd 100644 --- a/engines/illusions/bbdou/illusions_bbdou.h +++ b/engines/illusions/bbdou/illusions_bbdou.h @@ -83,7 +83,7 @@ public: void causeDeclare(uint32 verbId, uint32 objectId2, uint32 objectId, TriggerFunctionCallback *callback); uint32 causeTrigger(uint32 sceneId, uint32 verbId, uint32 objectId2, uint32 objectId, uint32 callingThreadId); - void setDefaultTextCoords(); + void setDefaultTextCoords(); void loadSpecialCode(uint32 resId); void unloadSpecialCode(uint32 resId); |