HUGO: Cleanup based on Fingolfin comments

svn-id: r55887

20 files changed, 73 insertions, 85 deletions

diff --git a/engines/hugo/detection.cpp b/engines/hugo/detection.cpp
index d567275981..c99db2433f 100644
--- a/engines/hugo/detection.cpp
+++ b/engines/hugo/detection.cpp
@@ -317,9 +317,6 @@ void HugoEngine::initGame(const HugoGameDescription *gd) {
 	_platform = gd->desc.platform;
 	_packedFl = (getFeatures() & GF_PACKED);
 	_gameVariant = _gameType - 1 + ((_platform == Common::kPlatformWindows) ? 0 : 3);
-
-	// Generate filename
-	_saveFilename = _targetName + "-%02d.SAV";
 }
 
 } // End of namespace Hugo
diff --git a/engines/hugo/file.cpp b/engines/hugo/file.cpp
index bfc39346d5..5535f24bac 100644
--- a/engines/hugo/file.cpp
+++ b/engines/hugo/file.cpp
@@ -288,17 +288,9 @@ sound_pt FileManager::getSound(const int16 sound, uint16 *size) {
 }
 
 /**
- * Return whether file exists or not
- */
-bool FileManager::fileExists(const Common::String filename) const {
-	Common::File f;
-	return(f.exists(filename));
-}
-
-/**
  * Save game to supplied slot
  */
-bool FileManager::saveGame(const int16 slot, const Common::String descrip) {
+bool FileManager::saveGame(const int16 slot, const Common::String &descrip) {
 	debugC(1, kDebugFile, "saveGame(%d, %s)", slot, descrip.c_str());
 
 	const EnginePlugin *plugin = NULL;
@@ -324,7 +316,7 @@ bool FileManager::saveGame(const int16 slot, const Common::String descrip) {
 	if (savegameId < 0)                             // dialog aborted
 		return false;
 
-	Common::String savegameFile = Common::String::format(_vm->_saveFilename.c_str(), savegameId);
+	Common::String savegameFile = _vm->getSavegameFilename(savegameId);
 	Common::SaveFileManager *saveMan = g_system->getSavefileManager();
 	Common::OutSaveFile *out = saveMan->openForSaving(savegameFile);
 
@@ -432,7 +424,7 @@ bool FileManager::restoreGame(const int16 slot) {
 	if (savegameId < 0)                             // dialog aborted
 		return false;
 
-	Common::String savegameFile = Common::String::format(_vm->_saveFilename.c_str(), savegameId);
+	Common::String savegameFile = _vm->getSavegameFilename(savegameId);
 	Common::SaveFileManager *saveMan = g_system->getSavefileManager();
 	Common::InSaveFile *in = saveMan->openForLoading(savegameFile);
 
diff --git a/engines/hugo/file.h b/engines/hugo/file.h
index 8e98ac9722..99bb2afc83 100644
--- a/engines/hugo/file.h
+++ b/engines/hugo/file.h
@@ -44,7 +44,6 @@ public:
 	FileManager(HugoEngine *vm);
 	virtual ~FileManager();
 
-	bool     fileExists(const Common::String filename) const;
 	sound_pt getSound(const int16 sound, uint16 *size);
 
 	void     readBootFile();
@@ -52,15 +51,15 @@ public:
 	void     readUIFImages();
 	void     readUIFItem(const int16 id, byte *buf);
 	bool     restoreGame(const int16 slot);
-	bool     saveGame(const int16 slot, const Common::String descrip);
+	bool     saveGame(const int16 slot, const Common::String &descrip);
 
 	// Name scenery and objects picture databases
-	const char *getBootFilename() const    { return "HUGO.BSF";    }
-	const char *getObjectFilename() const  { return "objects.dat"; }
+	const char *getBootFilename()    const { return "HUGO.BSF";    }
+	const char *getObjectFilename()  const { return "objects.dat"; }
 	const char *getSceneryFilename() const { return "scenery.dat"; }
-	const char *getSoundFilename() const   { return "sounds.dat";  }
-	const char *getStringFilename() const  { return "strings.dat"; }
-	const char *getUifFilename() const     { return "uif.dat";     }
+	const char *getSoundFilename()   const { return "sounds.dat";  }
+	const char *getStringFilename()  const { return "strings.dat"; }
+	const char *getUifFilename()     const { return "uif.dat";     }
 
 	virtual void openDatabaseFiles() = 0;
 	virtual void closeDatabaseFiles() = 0;
@@ -69,7 +68,7 @@ public:
 	virtual void readBackground(const int screenIndex) = 0;
 	virtual void readOverlay(const int screenNum, image_pt image, ovl_t overlayType) = 0;
 
-	virtual char *fetchString(const int index) = 0;
+	virtual const char *fetchString(const int index) = 0;
 
 protected:
 	HugoEngine *_vm;
@@ -138,7 +137,7 @@ public:
 	virtual void openDatabaseFiles();
 	virtual void readBackground(const int screenIndex);
 	virtual void readOverlay(const int screenNum, image_pt image, ovl_t overlayType);
-	virtual char *fetchString(const int index);
+	virtual const char *fetchString(const int index);
 };
 
 class FileManager_v2d : public FileManager_v1d {
@@ -150,7 +149,7 @@ public:
 	virtual void openDatabaseFiles();
 	virtual void readBackground(const int screenIndex);
 	virtual void readOverlay(const int screenNum, image_pt image, ovl_t overlayType);
-	char *fetchString(const int index);
+	const   char *fetchString(const int index);
 private:
 	char *_fetchStringBuf;
 };
diff --git a/engines/hugo/file_v1d.cpp b/engines/hugo/file_v1d.cpp
index 166a335c8d..be23edb7b4 100644
--- a/engines/hugo/file_v1d.cpp
+++ b/engines/hugo/file_v1d.cpp
@@ -62,7 +62,7 @@ void FileManager_v1d::readOverlay(const int screenNum, image_pt image, const ovl
 	const char *ovl_ext[] = {".b", ".o", ".ob"};
 	Common::String buf = Common::String(_vm->_text->getScreenNames(screenNum)) + Common::String(ovl_ext[overlayType]);
 
-	if (!fileExists(buf)) {
+	if (!Common::File::exists(buf)) {
 		for (int i = 0; i < kOvlSize; i++)
 			image[i] = 0;
 		warning("File not found: %s", buf.c_str());
@@ -95,7 +95,7 @@ void FileManager_v1d::readBackground(const int screenIndex) {
 	_sceneryArchive1.close();
 }
 
-char *FileManager_v1d::fetchString(const int index) {
+const char *FileManager_v1d::fetchString(const int index) {
 	debugC(1, kDebugFile, "fetchString(%d)", index);
 
 	return _vm->_text->getStringtData(index);
diff --git a/engines/hugo/file_v2d.cpp b/engines/hugo/file_v2d.cpp
index 2b227d6afc..9c66f6375f 100644
--- a/engines/hugo/file_v2d.cpp
+++ b/engines/hugo/file_v2d.cpp
@@ -163,7 +163,7 @@ void FileManager_v2d::readOverlay(const int screenNum, image_pt image, ovl_t ove
 /**
  * Fetch string from file, decode and return ptr to string in memory
  */
-char *FileManager_v2d::fetchString(const int index) {
+const char *FileManager_v2d::fetchString(const int index) {
 	debugC(1, kDebugFile, "fetchString(%d)", index);
 
 	// Get offset to string[index] (and next for length calculation)
diff --git a/engines/hugo/game.h b/engines/hugo/game.h
index 773000c1fe..bd62a4bc14 100644
--- a/engines/hugo/game.h
+++ b/engines/hugo/game.h
@@ -150,7 +150,7 @@ struct hugo_boot_t {                                // Common HUGO boot file
 	char pbswitch[8];                               // Playback switch string
 	char distrib[32];                               // Distributor branding string
 	uint16 exit_len;                                // Length of exit text (next in file)
-};
+} PACKED_STRUCT;
 
 struct uif_hdr_t {                                  // UIF font/image look up
 	uint16  size;                                   // Size of uif item
diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp
index 48500bd782..c8fb8282f8 100644
--- a/engines/hugo/hugo.cpp
+++ b/engines/hugo/hugo.cpp
@@ -864,7 +864,7 @@ void HugoEngine::readScreenFiles(const int screenNum) {
  * Search background command list for this screen for supplied object.
  * Return first associated verb (not "look") or 0 if none found.
  */
-char *HugoEngine::useBG(const char *name) {
+const char *HugoEngine::useBG(const char *name) {
 	debugC(1, kDebugEngine, "useBG(%s)", name);
 
 	objectList_t p = _backgroundObjects[*_screen_p];
@@ -943,5 +943,10 @@ void HugoEngine::syncSoundSettings() {
 	_sound->syncVolume();
 }
 
+Common::String HugoEngine::getSavegameFilename(int slot) {
+	return _targetName + Common::String::format("-%02d.SAV", slot);
+}
+
+
 
 } // End of namespace Hugo
diff --git a/engines/hugo/hugo.h b/engines/hugo/hugo.h
index 053f433357..47cb6cbe06 100644
--- a/engines/hugo/hugo.h
+++ b/engines/hugo/hugo.h
@@ -275,8 +275,6 @@ public:
 	const char *_episode;
 	Common::String _picDir;
 
-	Common::String _saveFilename;
-
 	command_t _statusLine;
 	command_t _scoreLine;
 
@@ -298,7 +296,7 @@ public:
 	virtual bool canSaveGameStateCurrently();
 	bool loadHugoDat();
 
-	char *useBG(const char *name);
+	const char *useBG(const char *name);
 
 	int8 getTPS() const;
 
@@ -347,6 +345,7 @@ public:
 
 	const char *getCopyrightString() const { return "Copyright 1989-1997 David P Gray, All Rights Reserved."; }
 
+	Common::String getSavegameFilename(int slot);
 
 	FileManager *_file;
 	Scheduler *_scheduler;
@@ -379,10 +378,6 @@ private:
 
 	HugoConsole *_console;
 
-// The following are bit plane display overlays which mark travel boundaries,
-// foreground stationary objects and baselines for those objects (used to
-// determine foreground/background wrt moving objects)
-
 	GameType _gameType;
 	Common::Platform _platform;
 	bool _packedFl;
diff --git a/engines/hugo/mouse.cpp b/engines/hugo/mouse.cpp
index b522b2cd76..73ba915192 100644
--- a/engines/hugo/mouse.cpp
+++ b/engines/hugo/mouse.cpp
@@ -267,7 +267,7 @@ void MouseHandler::mouseHandler() {
 		if (objId >= 0) {                           // Got a match
 			// Display object name next to cursor (unless CURSOR_NOCHAR)
 			// Note test for swapped hero name
-			char *name = _vm->_text->getNoun(_vm->_object->_objects[(objId == kHeroIndex) ? _vm->_heroImage : objId].nounIndex, kCursorNameIndex);
+			const char *name = _vm->_text->getNoun(_vm->_object->_objects[(objId == kHeroIndex) ? _vm->_heroImage : objId].nounIndex, kCursorNameIndex);
 			if (name[0] != kCursorNochar)
 				cursorText(name, cx, cy, U_FONT8, _TBRIGHTWHITE);
 
diff --git a/engines/hugo/object.cpp b/engines/hugo/object.cpp
index 23b88886a2..263b1d98c8 100644
--- a/engines/hugo/object.cpp
+++ b/engines/hugo/object.cpp
@@ -99,7 +99,7 @@ void ObjectHandler::restoreSeq(object_t *obj) {
 void ObjectHandler::useObject(int16 objId) {
 	debugC(1, kDebugObject, "useObject(%d)", objId);
 
-	char *verb;                                     // Background verb to use directly
+	const char *verb;                               // Background verb to use directly
 	int16 inventObjId = _vm->_inventory->getInventoryObjId();
 	object_t *obj = &_objects[objId];               // Ptr to object
 	if (inventObjId == -1) {
diff --git a/engines/hugo/parser.cpp b/engines/hugo/parser.cpp
index fcf9f9b07d..001ddac8e4 100644
--- a/engines/hugo/parser.cpp
+++ b/engines/hugo/parser.cpp
@@ -283,7 +283,7 @@ bool Parser::isWordPresent(char **wordArr) const {
 /**
  * Locate word in list of nouns and return ptr to first string in noun list
  */
-char *Parser::findNoun() const {
+const char *Parser::findNoun() const {
 	debugC(1, kDebugParser, "findNoun()");
 
 	for (int i = 0; _vm->_text->getNounArray(i); i++) {
@@ -298,7 +298,7 @@ char *Parser::findNoun() const {
 /**
  * Locate word in list of verbs and return ptr to first string in verb list
  */
-char *Parser::findVerb() const {
+const char *Parser::findVerb() const {
 	debugC(1, kDebugParser, "findVerb()");
 
 	for (int i = 0; _vm->_text->getVerbArray(i); i++) {
diff --git a/engines/hugo/parser.h b/engines/hugo/parser.h
index 948ba3bc92..2e807e543f 100644
--- a/engines/hugo/parser.h
+++ b/engines/hugo/parser.h
@@ -65,8 +65,8 @@ protected:
 	char      _cmdLineCursor;
 	command_t _cmdLine;                             // Build command line
 
-	char *findNoun() const;
-	char *findVerb() const;
+	const char *findNoun() const;
+	const char *findVerb() const;
 	void  showDosInventory() const;
 
 	bool   _checkDoubleF1Fl;                        // Flag used to display user help or instructions
@@ -90,12 +90,12 @@ protected:
 	virtual void  dropObject(object_t *obj);
 	virtual void  takeObject(object_t *obj);
 
-	char *findNextNoun(char *noun) const;
-	bool  isBackgroundWord_v1(char *noun, char *verb, objectList_t obj) const;
-	bool  isCatchallVerb_v1(bool testNounFl, char *noun, char *verb, objectList_t obj) const;
-	bool  isGenericVerb_v1(char *word, object_t *obj);
-	bool  isNear_v1(char *verb, char *noun, object_t *obj, char *comment) const;
-	bool  isObjectVerb_v1(char *word, object_t *obj);
+	const char *findNextNoun(const char *noun) const;
+	bool  isBackgroundWord_v1(const char *noun, const char *verb, objectList_t obj) const;
+	bool  isCatchallVerb_v1(bool testNounFl, const char *noun, const char *verb, objectList_t obj) const;
+	bool  isGenericVerb_v1(const char *word, object_t *obj);
+	bool  isNear_v1(const char *verb, const char *noun, object_t *obj, char *comment) const;
+	bool  isObjectVerb_v1(const char *word, object_t *obj);
 };
 
 class Parser_v2d : public Parser_v1d {
@@ -117,7 +117,7 @@ protected:
 	bool  isBackgroundWord_v3(objectList_t obj) const;
 	bool  isCatchallVerb_v3(objectList_t obj) const;
 	bool  isGenericVerb_v3(object_t *obj, char *comment);
-	bool  isNear_v3(object_t *obj, char *verb, char *comment) const;
+	bool  isNear_v3(object_t *obj, const char *verb, char *comment) const;
 	bool  isObjectVerb_v3(object_t *obj, char *comment);
 	void  takeObject(object_t *obj);
 };
diff --git a/engines/hugo/parser_v1d.cpp b/engines/hugo/parser_v1d.cpp
index 8819100ee6..1565490ce3 100644
--- a/engines/hugo/parser_v1d.cpp
+++ b/engines/hugo/parser_v1d.cpp
@@ -55,7 +55,7 @@ Parser_v1d::~Parser_v1d() {
  * Locate word in list of nouns and return ptr to string in noun list
  * If n is NULL, start at beginning of list, else with n
  */
-char *Parser_v1d::findNextNoun(char *noun) const {
+const char *Parser_v1d::findNextNoun(const char *noun) const {
 	debugC(1, kDebugParser, "findNextNoun(%s)", noun);
 
 	int currNounIndex = -1;
@@ -80,7 +80,7 @@ char *Parser_v1d::findNextNoun(char *noun) const {
  * If object not near, return suitable string; may be similar object closer
  * If radius is -1, treat radius as infinity
  */
-bool Parser_v1d::isNear_v1(char *verb, char *noun, object_t *obj, char *comment) const {
+bool Parser_v1d::isNear_v1(const char *verb, const char *noun, object_t *obj, char *comment) const {
 	debugC(1, kDebugParser, "isNear(%s, %s, obj, %s)", verb, noun, comment);
 
 	if (!noun && !obj->verbOnlyFl) {                // No noun specified & object not context senesitive
@@ -142,7 +142,7 @@ bool Parser_v1d::isNear_v1(char *verb, char *noun, object_t *obj, char *comment)
  * say_ok needed for special case of take/drop which may be handled not only
  * here but also in a cmd_list with a donestr string simultaneously
  */
-bool Parser_v1d::isGenericVerb_v1(char *word, object_t *obj) {
+bool Parser_v1d::isGenericVerb_v1(const char *word, object_t *obj) {
 	debugC(1, kDebugParser, "isGenericVerb(%s, object_t *obj)", word);
 
 	if (!obj->genericCmd)
@@ -183,7 +183,7 @@ bool Parser_v1d::isGenericVerb_v1(char *word, object_t *obj) {
  * and if it passes, perform the actions in the action list.  If the verb
  * is catered for, return TRUE
  */
-bool Parser_v1d::isObjectVerb_v1(char *word, object_t *obj) {
+bool Parser_v1d::isObjectVerb_v1(const char *word, object_t *obj) {
 	debugC(1, kDebugParser, "isObjectVerb(%s, object_t *obj)", word);
 
 	// First, find matching verb in cmd list
@@ -233,7 +233,7 @@ bool Parser_v1d::isObjectVerb_v1(char *word, object_t *obj) {
  * Print text for possible background object.  Return TRUE if match found
  * Only match if both verb and noun found.  Test_ca will match verb-only
  */
-bool Parser_v1d::isBackgroundWord_v1(char *noun, char *verb, objectList_t obj) const {
+bool Parser_v1d::isBackgroundWord_v1(const char *noun, const char *verb, objectList_t obj) const {
 	debugC(1, kDebugParser, "isBackgroundWord(%s, %s, object_list_t obj)", noun, verb);
 
 	if (!noun)
@@ -283,7 +283,7 @@ void Parser_v1d::dropObject(object_t *obj) {
  * Print text for possible background object.  Return TRUE if match found
  * If test_noun TRUE, must have a noun given
  */
-bool Parser_v1d::isCatchallVerb_v1(bool testNounFl, char *noun, char *verb, objectList_t obj) const {
+bool Parser_v1d::isCatchallVerb_v1(bool testNounFl, const char *noun, const char *verb, objectList_t obj) const {
 	debugC(1, kDebugParser, "isCatchallVerb(%d, %s, %s, object_list_t obj)", (testNounFl) ? 1 : 0, noun, verb);
 
 	if (_maze.enabledFl)
@@ -397,8 +397,8 @@ void Parser_v1d::lineHandler() {
 	}
 
 	// Find the first verb in the line
-	char *verb = findVerb();
-	char *noun = 0;                                 // Noun not found yet
+	const char *verb = findVerb();
+	const char *noun = 0;                           // Noun not found yet
 	char farComment[kCompLineSize * 5] = "";        // hold 5 line comment if object not nearby
 
 	if (verb) {                                     // OK, verb found.  Try to match with object
diff --git a/engines/hugo/parser_v1w.cpp b/engines/hugo/parser_v1w.cpp
index 5b3c48f939..2b6741d440 100644
--- a/engines/hugo/parser_v1w.cpp
+++ b/engines/hugo/parser_v1w.cpp
@@ -189,8 +189,8 @@ void Parser_v1w::lineHandler() {
 	}
 
 	// Nothing matches.  Report recognition success to user.
-	char *verb = findVerb();
-	char *noun = findNoun();
+	const char *verb = findVerb();
+	const char *noun = findNoun();
 	if (verb == _vm->_text->getVerb(_vm->_look, 0) && _maze.enabledFl) {
 		Utils::Box(kBoxAny, "%s", _vm->_text->getTextParser(kTBMaze));
 		_vm->_object->showTakeables();
diff --git a/engines/hugo/parser_v2d.cpp b/engines/hugo/parser_v2d.cpp
index 24d9a338b6..cd7928e069 100644
--- a/engines/hugo/parser_v2d.cpp
+++ b/engines/hugo/parser_v2d.cpp
@@ -149,8 +149,8 @@ void Parser_v2d::lineHandler() {
 	}
 
 	// Find the first verb in the line
-	char *verb = findVerb();
-	char *noun = 0;                                 // Noun not found yet
+	const char *verb = findVerb();
+	const char *noun = 0;                           // Noun not found yet
 	char farComment[kCompLineSize * 5] = "";        // hold 5 line comment if object not nearby
 
 	if (verb) {                                     // OK, verb found.  Try to match with object
diff --git a/engines/hugo/parser_v3d.cpp b/engines/hugo/parser_v3d.cpp
index 0925192507..532b1f92d1 100644
--- a/engines/hugo/parser_v3d.cpp
+++ b/engines/hugo/parser_v3d.cpp
@@ -191,8 +191,8 @@ void Parser_v3d::lineHandler() {
 	}
 
 	// Nothing matches.  Report recognition success to user.
-	char *verb = findVerb();
-	char *noun = findNoun();
+	const char *verb = findVerb();
+	const char *noun = findNoun();
 
 	if (verb && noun) {                             // A combination I didn't think of
 		Utils::Box(kBoxAny, "%s", _vm->_text->getTextParser(kTBNoPoint));
@@ -319,7 +319,7 @@ bool Parser_v3d::isGenericVerb_v3(object_t *obj, char *comment) {
  * If radius is -1, treat radius as infinity
  * Verb is included to determine correct comment if not near
  */
-bool Parser_v3d::isNear_v3(object_t *obj, char *verb, char *comment) const {
+bool Parser_v3d::isNear_v3(object_t *obj, const char *verb, char *comment) const {
 	debugC(1, kDebugParser, "isNear(object_t *obj, %s, %s)", verb, comment);
 
 	if (obj->carriedFl)                             // Object is being carried
diff --git a/engines/hugo/schedule.cpp b/engines/hugo/schedule.cpp
index 709f09d987..789bff7d34 100644
--- a/engines/hugo/schedule.cpp
+++ b/engines/hugo/schedule.cpp
@@ -162,8 +162,8 @@ void Scheduler::newScreen(const int screenIndex) {
 	// Make sure the background file exists!
 	if (!_vm->isPacked()) {
 		Common::String filename = Common::String(_vm->_text->getScreenNames(screenIndex));
-		if (!_vm->_file->fileExists(_vm->_picDir + filename + ".PCX") &&
-			!_vm->_file->fileExists(filename + ".ART")) {
+		if (!Common::File::exists(_vm->_picDir + filename + ".PCX") &&
+			!Common::File::exists(filename + ".ART")) {
 				error("Unable to find background file for %s", filename.c_str());
 			return;
 		}
diff --git a/engines/hugo/sound.h b/engines/hugo/sound.h
index e39f932741..f3a8a71588 100644
--- a/engines/hugo/sound.h
+++ b/engines/hugo/sound.h
@@ -100,8 +100,8 @@ public:
 	int8 pcspkrOctave;                              // Current octave 1..7
 	int8 pcspkrNoteDuration;                        // Current length of note (ticks)
 
-	char *DOSSongPtr;
-	char *DOSIntroSong;
+	const char *DOSSongPtr;
+	const char *DOSIntroSong;
 
 	void toggleMusic();
 	void toggleSound();
diff --git a/engines/hugo/text.h b/engines/hugo/text.h
index 1244b7d3f9..70a77fbe23 100644
--- a/engines/hugo/text.h
+++ b/engines/hugo/text.h
@@ -32,17 +32,17 @@ public:
 	TextHandler(HugoEngine *vm);
 	~TextHandler();
 
-	char  *getScreenNames(int screenIndex) { return _screenNames[screenIndex]; }
-	char  *getTextData(int textIndex) { return _textData[textIndex]; }
-	char  *getStringtData(int stringIndex) { return _stringtData[stringIndex]; }
-	char  *getTextEngine(int engineIndex) { return _textEngine[engineIndex]; }
-	char  *getTextIntro(int introIndex) { return _textIntro[introIndex]; }
-	char  *getTextMouse(int mouseIndex) { return _textMouse[mouseIndex]; }
-	char  *getTextParser(int parserIndex) { return _textParser[parserIndex]; }
-	char  *getTextUtil(int utilIndex) { return _textUtil[utilIndex]; }
-	char  *getNoun(int idx1, int idx2) { return _arrayNouns[idx1][idx2]; }
+	const char  *getNoun(int idx1, int idx2) const     { return _arrayNouns[idx1][idx2];   }
+	const char  *getScreenNames(int screenIndex) const { return _screenNames[screenIndex]; }
+	const char  *getStringtData(int stringIndex) const { return _stringtData[stringIndex]; }
+	const char  *getTextData(int textIndex) const      { return _textData[textIndex];      }
+	const char  *getTextEngine(int engineIndex) const  { return _textEngine[engineIndex];  }
+	const char  *getTextIntro(int introIndex) const    { return _textIntro[introIndex];    }
+	const char  *getTextMouse(int mouseIndex) const    { return _textMouse[mouseIndex];    }
+	const char  *getTextParser(int parserIndex) const  { return _textParser[parserIndex];  }
+	const char  *getTextUtil(int utilIndex) const      { return _textUtil[utilIndex];      }
+	const char  *getVerb(int idx1, int idx2) const     { return _arrayVerbs[idx1][idx2];   }
 	char **getNounArray(int idx1) { return _arrayNouns[idx1]; }
-	char  *getVerb(int idx1, int idx2) { return _arrayVerbs[idx1][idx2]; }
 	char **getVerbArray(int idx1) { return _arrayVerbs[idx1]; }
 
 	void loadAllTexts(Common::File &in);
diff --git a/engines/hugo/util.h b/engines/hugo/util.h
index 65164bbe3c..84f69858fd 100644
--- a/engines/hugo/util.h
+++ b/engines/hugo/util.h
@@ -39,17 +39,17 @@ enum seqTextUtil {
 	kGameOver = 0
 };
 
+namespace Utils {
 static const int kMaxStrLength = 1024;
 
-namespace Utils {
-int      firstBit(byte data);
-int      lastBit(byte data);
+int   firstBit(byte data);
+int   lastBit(byte data);
 
-void     gameOverMsg();
-void     reverseByte(byte *data);
+void  gameOverMsg();
+void  reverseByte(byte *data);
 
-char    *Box(box_t, const char *, ...) GCC_PRINTF(2, 3);
-char    *strlwr(char *buffer);
+char *Box(box_t, const char *, ...) GCC_PRINTF(2, 3);
+char *strlwr(char *buffer);
 }
 
 } // End of namespace Hugo