HUGO: Suppress useless enums, cleanup

svn-id: r54421

4 files changed, 16 insertions, 29 deletions

diff --git a/engines/hugo/file.cpp b/engines/hugo/file.cpp
index 1c554faca4..336d44a1d3 100644
--- a/engines/hugo/file.cpp
+++ b/engines/hugo/file.cpp
@@ -147,6 +147,14 @@ seq_t *FileManager::readPCX(Common::File &f, seq_t *seqPtr, byte *imagePtr, bool
 void FileManager::readImage(int objNum, object_t *objPtr) {
 	debugC(1, kDebugFile, "readImage(%d, object_t *objPtr)", objNum);
 
+	/**
+	* Structure of object file lookup entry
+	*/
+	struct objBlock_t {
+		uint32 objOffset;
+		uint32 objLength;
+	};
+
 	if (!objPtr->seqNumb)                           // This object has no images
 		return;
 
diff --git a/engines/hugo/game.h b/engines/hugo/game.h
index ff26940250..44831a8d30 100644
--- a/engines/hugo/game.h
+++ b/engines/hugo/game.h
@@ -130,14 +130,6 @@ enum uif_t {U_FONT5, U_FONT6, U_FONT8, UIF_IMAGES, NUM_UIF_ITEMS};
 enum ovl_t {BOUNDARY, OVERLAY, OVLBASE};
 
 /**
-* Enumerate error types
-*/
-enum {
-	GEN_ERR,   FILE_ERR, WRITE_ERR, PCCH_ERR, HEAP_ERR, EVNT_ERR,  SOUND_ERR
-	//MOUSE_ERR, VID_ERR,  FONT_ERR,  ARG_ERR,  CHK_ERR,  TIMER_ERR, VBX_ERR
-};
-
-/**
 * Enumerate ways of cycling a sequence of frames
 */
 enum cycle_t {INVISIBLE, ALMOST_INVISIBLE, NOT_CYCLING, CYCLE_FORWARD, CYCLE_BACKWARD};
@@ -194,11 +186,6 @@ enum font_t {LARGE_ROMAN, MED_ROMAN, NUM_GDI_FONTS, INIT_FONTS, DEL_FONTS};
 enum box_t {BOX_ANY, BOX_OK, BOX_PROMPT, BOX_YESNO};
 
 /**
-* Standard viewport sizes
-*/
-enum wsize_t {SIZE_DEF, SIZE_1, SIZE_2, SIZE_3};
-
-/**
 * Display list functions
 */
 enum dupdate_t {D_INIT, D_ADD, D_DISPLAY, D_RESTORE};
@@ -834,14 +821,9 @@ struct status_t {                                   // Game status (not saved)
 	bool     initSaveFl;                            // Force save of initial game
 	bool     storyModeFl;                           // Game is telling story - no commands
 	bool     gameOverFl;                            // Game is over - hero knobbled
-// Strangerke - Suppress as related to playback
-//	bool     playbackFl;                            // Game is in playback mode
-//	bool     recordFl;                              // Game is in record mode
 	bool     demoFl;                                // Game is in demo mode
 	bool     debugFl;                               // Game is in debug mode
 	bool     textBoxFl;                             // Game is (halted) in text box
-// Strangerke - Not used ?
-//	bool     mmtimeFl;                               // Multimedia timer supported
 	bool     lookFl;                                // Toolbar "look" button pressed
 	bool     recallFl;                              // Toolbar "recall" button pressed
 	bool     leftButtonFl;                          // Left mouse button pressed
@@ -852,7 +834,6 @@ struct status_t {                                   // Game status (not saved)
 	bool     helpFl;                                // Calling WinHelp (don't disable music)
 	bool     doQuitFl;
 	uint32   tick;                                  // Current time in ticks
-	uint32   saveTick;                              // Time of last save in ticks
 	vstate_t viewState;                             // View state machine
 	istate_t inventoryState;                        // Inventory icon bar state
 	int16    inventoryHeight;                       // Inventory icon bar height
@@ -866,6 +847,12 @@ struct status_t {                                   // Game status (not saved)
 	int16    screenWidth;                           // Desktop screen width
 	int16    song;                                  // Current song
 	int16    cx, cy;                                // Cursor position (dib coords)
+// Strangerke - Suppress as related to playback
+//	bool     playbackFl;                            // Game is in playback mode
+//	bool     recordFl;                              // Game is in record mode
+// Strangerke - Not used ?
+//	bool     mmtimeFl;                              // Multimedia timer supported
+//	uint32   saveTick;                              // Time of last save in ticks
 };
 
 struct config_t {                                   // User's config (saved)
@@ -910,14 +897,6 @@ struct sceneBlock_t {
 	uint32 ob_len;
 };
 
-/**
-* Structure of object file lookup entry
-*/
-struct objBlock_t {
-	uint32 objOffset;
-	uint32 objLength;
-};
-
 #include "common/pack-start.h"                      // START STRUCT PACKING
 struct sound_hdr_t {                                // Sound file lookup entry
 	uint16 size;                                    // Size of sound data in bytes
diff --git a/engines/hugo/hugo.cpp b/engines/hugo/hugo.cpp
index 142fac0f88..388c6bbf6c 100644
--- a/engines/hugo/hugo.cpp
+++ b/engines/hugo/hugo.cpp
@@ -928,7 +928,7 @@ void HugoEngine::initStatus() {
 
 	// Initialize every start of new game
 	_status.tick            = 0;                    // Tick count
-	_status.saveTick        = 0;                    // Time of last save
+//	_status.saveTick        = 0;                    // Time of last save
 	_status.viewState       = V_IDLE;               // View state
 	_status.inventoryState  = I_OFF;                // Inventory icon bar state
 	_status.inventoryHeight = 0;                    // Inventory icon bar pos
diff --git a/engines/hugo/object.h b/engines/hugo/object.h
index 3c39684b5e..c8e1be7f75 100644
--- a/engines/hugo/object.h
+++ b/engines/hugo/object.h
@@ -36,7 +36,7 @@
 #include "common/file.h"
 
 #define MAXOBJECTS      128                         // Used in Update_images()
-#define BOUND(X, Y)      ((_vm->getBoundaryOverlay()[Y * XBYTES + X / 8] & (0x80 >> X % 8)) != 0)  // Boundary bit set
+#define BOUND(X, Y)     ((_vm->getBoundaryOverlay()[Y * XBYTES + X / 8] & (0x80 >> X % 8)) != 0)  // Boundary bit set
 
 namespace Hugo {