diff options
author | Arnaud Boutonné | 2010-11-12 18:05:23 +0000 |
---|---|---|
committer | Arnaud Boutonné | 2010-11-12 18:05:23 +0000 |
commit | fd82c3783d1e563e9c3526aeb0d75e79ebcc0d76 (patch) | |
tree | 13f836fdfe34b35086ee9f1b53d91c0fb5289c0b /engines/hugo | |
parent | 103ac9c566df104e4cacdb78e68fc775d047f658 (diff) | |
download | scummvm-rg350-fd82c3783d1e563e9c3526aeb0d75e79ebcc0d76.tar.gz scummvm-rg350-fd82c3783d1e563e9c3526aeb0d75e79ebcc0d76.tar.bz2 scummvm-rg350-fd82c3783d1e563e9c3526aeb0d75e79ebcc0d76.zip |
TOOL+HUGO: Misc modifications
- Fix H1 Dos bug (animations not showing in Hall and after)
- Get rid of _textSchedule and everything related
H1 Dos shoud now be completable (not tested yet)
svn-id: r54218
Diffstat (limited to 'engines/hugo')
-rw-r--r-- | engines/hugo/file_v1d.cpp | 1 | ||||
-rw-r--r-- | engines/hugo/hugo.cpp | 14 | ||||
-rw-r--r-- | engines/hugo/hugo.h | 3 | ||||
-rw-r--r-- | engines/hugo/schedule.cpp | 4 | ||||
-rw-r--r-- | engines/hugo/schedule.h | 5 |
5 files changed, 9 insertions, 18 deletions
diff --git a/engines/hugo/file_v1d.cpp b/engines/hugo/file_v1d.cpp index a85794b4e5..b92474ea67 100644 --- a/engines/hugo/file_v1d.cpp +++ b/engines/hugo/file_v1d.cpp @@ -66,6 +66,7 @@ void FileManager_v1d::readOverlay(int screenNum, image_pt image, ovl_t overlayTy if (!fileExists(buf)) { for (uint32 i = 0; i < OVL_SIZE; i++) image[i] = 0; + warning("File not found: %s", buf); return; } diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp index f8b3cd2e43..bf1daf1819 100644 --- a/engines/hugo/hugo.cpp +++ b/engines/hugo/hugo.cpp @@ -62,11 +62,11 @@ char _textBoxBuffer[MAX_BOX]; // Buffer for text box command_t _line; // Line of user text input HugoEngine::HugoEngine(OSystem *syst, const HugoGameDescription *gd) : Engine(syst), _gameDescription(gd), _mouseX(0), _mouseY(0), - _textData(0), _stringtData(0), _screenNames(0), _textEngine(0), _textIntro(0), _textMouse(0), _textParser(0), _textSchedule(0), - _textUtil(0), _arrayNouns(0), _arrayVerbs(0), _arrayReqs(0), _hotspots(0), _invent(0), _uses(0), _catchallList(0), - _backgroundObjects(0), _points(0), _cmdList(0), _screenActs(0), _heroImage(0), _defltTunes(0), _introX(0), - _introY(0), _maxInvent(0), _numBonuses(0), _numScreens(0), _tunesNbr(0), _soundSilence(0), _soundTest(0), _screenStates(0), - _score(0), _maxscore(0), _backgroundObjectsSize(0), _screenActsSize(0), _usesSize(0) + _textData(0), _stringtData(0), _screenNames(0), _textEngine(0), _textIntro(0), _textMouse(0), _textParser(0), _textUtil(0), + _arrayNouns(0), _arrayVerbs(0), _arrayReqs(0), _hotspots(0), _invent(0), _uses(0), _catchallList(0), _backgroundObjects(0), + _points(0), _cmdList(0), _screenActs(0), _heroImage(0), _defltTunes(0), _introX(0), _introY(0), _maxInvent(0), _numBonuses(0), + _numScreens(0), _tunesNbr(0), _soundSilence(0), _soundTest(0), _screenStates(0), _score(0), _maxscore(0), + _backgroundObjectsSize(0), _screenActsSize(0), _usesSize(0) { DebugMan.addDebugChannel(kDebugSchedule, "Schedule", "Script Schedule debug level"); @@ -106,7 +106,6 @@ HugoEngine::~HugoEngine() { free(_introY); freeTexts(_textMouse); freeTexts(_textParser); - freeTexts(_textSchedule); freeTexts(_textUtil); if (_arrayReqs) { @@ -460,9 +459,6 @@ bool HugoEngine::loadHugoDat() { // Read textParser _textParser = loadTexts(in); - // Read textSchedule - _textSchedule = loadTexts(in); - // Read textUtil _textUtil = loadTextsVariante(in, 0); diff --git a/engines/hugo/hugo.h b/engines/hugo/hugo.h index 985499896e..197fc52458 100644 --- a/engines/hugo/hugo.h +++ b/engines/hugo/hugo.h @@ -34,7 +34,7 @@ #include "hugo/game.h" #define HUGO_DAT_VER_MAJ 0 // 1 byte -#define HUGO_DAT_VER_MIN 28 // 1 byte +#define HUGO_DAT_VER_MIN 29 // 1 byte #define DATAALIGNMENT 4 #define EDGE 10 // Closest object can get to edge of screen #define EDGE2 (EDGE * 2) // Push object further back on edge collision @@ -137,7 +137,6 @@ public: char **_textIntro; char **_textMouse; char **_textParser; - char **_textSchedule; char **_textUtil; char ***_arrayNouns; char ***_arrayVerbs; diff --git a/engines/hugo/schedule.cpp b/engines/hugo/schedule.cpp index 837034a445..602f55cb0d 100644 --- a/engines/hugo/schedule.cpp +++ b/engines/hugo/schedule.cpp @@ -172,8 +172,8 @@ void Scheduler::newScreen(int screenIndex) { if (!_vm->isPacked()) { char line[32]; if (!_vm->_file->fileExists(strcat(strncat(strcpy(line, _vm->_picDir), _vm->_screenNames[screenIndex], NAME_LEN), BKGEXT)) && - !_vm->_file->fileExists(strcat(strcpy(line, _vm->_screenNames[screenIndex]), ".ART"))) { - Utils::Box(BOX_ANY, "%s", _vm->_textSchedule[kSsNoBackground]); + !_vm->_file->fileExists(strcat(strcpy(line, _vm->_screenNames[screenIndex]), ".ART"))) { + error("Unable to find background file for %s", _vm->_screenNames[screenIndex]); return; } } diff --git a/engines/hugo/schedule.h b/engines/hugo/schedule.h index d0824674c6..c0725bf3ff 100644 --- a/engines/hugo/schedule.h +++ b/engines/hugo/schedule.h @@ -72,11 +72,6 @@ public: protected: HugoEngine *_vm; - enum seqTextSchedule { - kSsNoBackground = 0, - kSsBadSaveGame = 1 - }; - uint16 _actListArrSize; uint16 _alNewscrIndex; |