[Scummvm-cvs-logs] SF.net SVN: scummvm:[54421] scummvm/trunk/engines/hugo
strangerke at users.sourceforge.net
strangerke at users.sourceforge.net
Mon Nov 22 20:50:58 CET 2010
Revision: 54421
http://scummvm.svn.sourceforge.net/scummvm/?rev=54421&view=rev
Author: strangerke
Date: 2010-11-22 19:50:57 +0000 (Mon, 22 Nov 2010)
Log Message:
-----------
HUGO: Suppress useless enums, cleanup
Modified Paths:
--------------
scummvm/trunk/engines/hugo/file.cpp
scummvm/trunk/engines/hugo/game.h
scummvm/trunk/engines/hugo/hugo.cpp
scummvm/trunk/engines/hugo/object.h
Modified: scummvm/trunk/engines/hugo/file.cpp
===================================================================
--- scummvm/trunk/engines/hugo/file.cpp 2010-11-22 18:39:06 UTC (rev 54420)
+++ scummvm/trunk/engines/hugo/file.cpp 2010-11-22 19:50:57 UTC (rev 54421)
@@ -147,6 +147,14 @@
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;
Modified: scummvm/trunk/engines/hugo/game.h
===================================================================
--- scummvm/trunk/engines/hugo/game.h 2010-11-22 18:39:06 UTC (rev 54420)
+++ scummvm/trunk/engines/hugo/game.h 2010-11-22 19:50:57 UTC (rev 54421)
@@ -130,14 +130,6 @@
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 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 @@
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 @@
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 @@
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 @@
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
Modified: scummvm/trunk/engines/hugo/hugo.cpp
===================================================================
--- scummvm/trunk/engines/hugo/hugo.cpp 2010-11-22 18:39:06 UTC (rev 54420)
+++ scummvm/trunk/engines/hugo/hugo.cpp 2010-11-22 19:50:57 UTC (rev 54421)
@@ -928,7 +928,7 @@
// 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
Modified: scummvm/trunk/engines/hugo/object.h
===================================================================
--- scummvm/trunk/engines/hugo/object.h 2010-11-22 18:39:06 UTC (rev 54420)
+++ scummvm/trunk/engines/hugo/object.h 2010-11-22 19:50:57 UTC (rev 54421)
@@ -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 {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list