aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/zvision/actions.h2
-rw-r--r--engines/zvision/cursor_manager.h18
-rw-r--r--engines/zvision/detection.h6
-rw-r--r--engines/zvision/lever_control.h4
-rw-r--r--engines/zvision/lzss_read_stream.h2
-rw-r--r--engines/zvision/menu.cpp43
-rw-r--r--engines/zvision/menu.h18
-rw-r--r--engines/zvision/meta_animation.h4
-rw-r--r--engines/zvision/music_node.cpp3
-rw-r--r--engines/zvision/puzzle.h14
-rw-r--r--engines/zvision/render_table.h6
-rw-r--r--engines/zvision/rlf_animation.h4
-rw-r--r--engines/zvision/save_manager.h2
-rw-r--r--engines/zvision/script_manager.h106
-rw-r--r--engines/zvision/sidefx.h18
-rw-r--r--engines/zvision/single_value_container.h18
-rw-r--r--engines/zvision/string_manager.h2
-rw-r--r--engines/zvision/zork_avi_decoder.h2
-rw-r--r--engines/zvision/zvision.h20
19 files changed, 141 insertions, 151 deletions
diff --git a/engines/zvision/actions.h b/engines/zvision/actions.h
index 5c6cf6c35f..f4a2c0f387 100644
--- a/engines/zvision/actions.h
+++ b/engines/zvision/actions.h
@@ -369,7 +369,7 @@ public:
private:
enum {
- DIFFERENT_DIMENSIONS = 0x1 // 0x1 flags that the destRect dimensions are different from the original video dimensions
+ DIFFERENT_DIMENSIONS = 0x1 // 0x1 flags that the destRect dimensions are different from the original video dimensions
};
Common::String _fileName;
diff --git a/engines/zvision/cursor_manager.h b/engines/zvision/cursor_manager.h
index 7bd1c4240f..0521a17337 100644
--- a/engines/zvision/cursor_manager.h
+++ b/engines/zvision/cursor_manager.h
@@ -40,15 +40,15 @@ class ZVision;
* Mostly usable cursors
*/
enum CursorIndex {
- CursorIndex_Active = 0,
- CursorIndex_DownArr = 3,
- CursorIndex_HandPu = 6,
- CursorIndex_Idle = 11,
- CursorIndex_Left = 12,
- CursorIndex_Right = 13,
- CursorIndex_UpArr = 17,
- CursorIndex_ItemIdle = 18,
- CursorIndex_ItemAct = 19
+ CursorIndex_Active = 0,
+ CursorIndex_DownArr = 3,
+ CursorIndex_HandPu = 6,
+ CursorIndex_Idle = 11,
+ CursorIndex_Left = 12,
+ CursorIndex_Right = 13,
+ CursorIndex_UpArr = 17,
+ CursorIndex_ItemIdle = 18,
+ CursorIndex_ItemAct = 19
};
/**
diff --git a/engines/zvision/detection.h b/engines/zvision/detection.h
index 1f430dac1c..34417601e8 100644
--- a/engines/zvision/detection.h
+++ b/engines/zvision/detection.h
@@ -29,9 +29,9 @@
namespace ZVision {
enum ZVisionGameId {
- GID_NONE = 0,
- GID_NEMESIS = 1,
- GID_GRANDINQUISITOR = 2
+ GID_NONE = 0,
+ GID_NEMESIS = 1,
+ GID_GRANDINQUISITOR = 2
};
struct ZVisionGameDescription {
diff --git a/engines/zvision/lever_control.h b/engines/zvision/lever_control.h
index 591d64e949..ac7ee8b5c7 100644
--- a/engines/zvision/lever_control.h
+++ b/engines/zvision/lever_control.h
@@ -55,8 +55,8 @@ private:
};
enum {
- ANGLE_DELTA = 30, // How far off a mouse angle can be and still be considered valid. This is in both directions, so the total buffer zone is (2 * ANGLE_DELTA)
- ANIMATION_FRAME_TIME = 30 // In millis
+ ANGLE_DELTA = 30, // How far off a mouse angle can be and still be considered valid. This is in both directions, so the total buffer zone is (2 * ANGLE_DELTA)
+ ANIMATION_FRAME_TIME = 30 // In millis
};
private:
diff --git a/engines/zvision/lzss_read_stream.h b/engines/zvision/lzss_read_stream.h
index 1f7df9d4e0..73e848b9f6 100644
--- a/engines/zvision/lzss_read_stream.h
+++ b/engines/zvision/lzss_read_stream.h
@@ -45,7 +45,7 @@ public:
private:
enum {
- BLOCK_SIZE = 0x1000
+ BLOCK_SIZE = 0x1000
};
private:
diff --git a/engines/zvision/menu.cpp b/engines/zvision/menu.cpp
index 8e1dea183b..bf422b300f 100644
--- a/engines/zvision/menu.cpp
+++ b/engines/zvision/menu.cpp
@@ -30,17 +30,17 @@
namespace ZVision {
enum {
- SLOT_START_SLOT = 151,
- SLOT_SPELL_1 = 191,
- SLOT_USER_CHOSE_THIS_SPELL = 205,
- SLOT_REVERSED_SPELLBOOK = 206
+ SLOT_START_SLOT = 151,
+ SLOT_SPELL_1 = 191,
+ SLOT_USER_CHOSE_THIS_SPELL = 205,
+ SLOT_REVERSED_SPELLBOOK = 206
};
enum {
- menu_MAIN_SAVE = 0,
- menu_MAIN_REST = 1,
- menu_MAIN_PREF = 2,
- menu_MAIN_EXIT = 3
+ menu_MAIN_SAVE = 0,
+ menu_MAIN_REST = 1,
+ menu_MAIN_PREF = 2,
+ menu_MAIN_EXIT = 3
};
menuHandler::menuHandler(ZVision *engine) {
@@ -264,8 +264,7 @@ void menuZgi::onMouseMove(const Common::Point &Pos) {
}
break;
- case menu_MAIN:
- {
+ case menu_MAIN: {
int last_item = mouse_on_item;
mouse_on_item = -1;
@@ -510,29 +509,25 @@ void menuZgi::process(uint32 deltatime) {
if (redraw) {
_engine->getRenderManager()->blitSurfaceToMenu(menuback[menu_MAIN][0], 30, scrollPos[menu_MAIN]);
- if (menu_bar_flag & menuBar_Exit)
- {
+ if (menu_bar_flag & menuBar_Exit) {
if (mouse_on_item == menu_MAIN_EXIT)
_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][1], 320 + 135, scrollPos[menu_MAIN]);
else
_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_EXIT][0], 320 + 135, scrollPos[menu_MAIN]);
}
- if (menu_bar_flag & menuBar_Settings)
- {
+ if (menu_bar_flag & menuBar_Settings) {
if (mouse_on_item == menu_MAIN_PREF)
_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][1], 320, scrollPos[menu_MAIN]);
else
_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_PREF][0], 320, scrollPos[menu_MAIN]);
}
- if (menu_bar_flag & menuBar_Restore)
- {
+ if (menu_bar_flag & menuBar_Restore) {
if (mouse_on_item == menu_MAIN_REST)
_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][1], 320 - 135, scrollPos[menu_MAIN]);
else
_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_REST][0], 320 - 135, scrollPos[menu_MAIN]);
}
- if (menu_bar_flag & menuBar_Save)
- {
+ if (menu_bar_flag & menuBar_Save) {
if (mouse_on_item == menu_MAIN_SAVE)
_engine->getRenderManager()->blitSurfaceToMenu(menubar[menu_MAIN_SAVE][1], 320 - 135 * 2, scrollPos[menu_MAIN]);
else
@@ -698,8 +693,7 @@ void menuNem::onMouseMove(const Common::Point &Pos) {
void menuNem::process(uint32 deltatime) {
if (inmenu) {
- if (!scrolled)
- {
+ if (!scrolled) {
float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
if (scrl == 0)
@@ -709,8 +703,7 @@ void menuNem::process(uint32 deltatime) {
redraw = true;
}
- if (scrollPos >= 0)
- {
+ if (scrollPos >= 0) {
scrolled = true;
scrollPos = 0;
}
@@ -747,8 +740,7 @@ void menuNem::process(uint32 deltatime) {
}
} else {
scrolled = false;
- if (scrollPos > -32)
- {
+ if (scrollPos > -32) {
float scrl = 32.0 * 2.0 * (deltatime / 1000.0);
if (scrl == 0)
@@ -759,8 +751,7 @@ void menuNem::process(uint32 deltatime) {
scrollPos -= scrl;
redraw = true;
- }
- else
+ } else
scrollPos = -32;
if (redraw) {
diff --git a/engines/zvision/menu.h b/engines/zvision/menu.h
index 35e7347a3b..c5938cdc3d 100644
--- a/engines/zvision/menu.h
+++ b/engines/zvision/menu.h
@@ -32,12 +32,12 @@
namespace ZVision {
enum menuBar {
- menuBar_Exit = 0x1,
- menuBar_Settings = 0x2,
- menuBar_Restore = 0x4,
- menuBar_Save = 0x8,
- menuBar_Items = 0x100,
- menuBar_Magic = 0x200
+ menuBar_Exit = 0x1,
+ menuBar_Settings = 0x2,
+ menuBar_Restore = 0x4,
+ menuBar_Save = 0x8,
+ menuBar_Items = 0x100,
+ menuBar_Magic = 0x200
};
class menuHandler {
@@ -80,9 +80,9 @@ private:
float scrollPos[3];
enum {
- menu_ITEM = 0,
- menu_MAGIC = 1,
- menu_MAIN = 2
+ menu_ITEM = 0,
+ menu_MAGIC = 1,
+ menu_MAIN = 2
};
bool clean;
diff --git a/engines/zvision/meta_animation.h b/engines/zvision/meta_animation.h
index e259955891..3754aae058 100644
--- a/engines/zvision/meta_animation.h
+++ b/engines/zvision/meta_animation.h
@@ -64,8 +64,8 @@ public:
private:
enum FileType {
- RLF = 1,
- AVI = 2
+ RLF = 1,
+ AVI = 2
};
private:
diff --git a/engines/zvision/music_node.cpp b/engines/zvision/music_node.cpp
index d47a796382..31d222aead 100644
--- a/engines/zvision/music_node.cpp
+++ b/engines/zvision/music_node.cpp
@@ -109,8 +109,7 @@ bool MusicNode::process(uint32 deltaTimeInMillis) {
deltaTimeInMillis = _crossfade_time;
_newvol += floor(((float)(_crossfade_target - _newvol) / (float)_crossfade_time)) * (float)deltaTimeInMillis;
_crossfade_time -= deltaTimeInMillis;
- }
- else {
+ } else {
_crossfade = false;
_newvol = _crossfade_target;
}
diff --git a/engines/zvision/puzzle.h b/engines/zvision/puzzle.h
index c02f60c8f0..e06b087aca 100644
--- a/engines/zvision/puzzle.h
+++ b/engines/zvision/puzzle.h
@@ -42,10 +42,10 @@ struct Puzzle {
/** How criteria should be decided */
enum CriteriaOperator {
- EQUAL_TO,
- NOT_EQUAL_TO,
- GREATER_THAN,
- LESS_THAN
+ EQUAL_TO,
+ NOT_EQUAL_TO,
+ GREATER_THAN,
+ LESS_THAN
};
/** Criteria for a Puzzle result to be fired */
@@ -64,9 +64,9 @@ struct Puzzle {
};
enum StateFlags {
- ONCE_PER_INST = 0x01,
- DO_ME_NOW = 0x02, // Somewhat useless flag since anything that needs to be done immediately has no criteria
- DISABLED = 0x04
+ ONCE_PER_INST = 0x01,
+ DO_ME_NOW = 0x02, // Somewhat useless flag since anything that needs to be done immediately has no criteria
+ DISABLED = 0x04
};
uint32 key;
diff --git a/engines/zvision/render_table.h b/engines/zvision/render_table.h
index db9ab08f7c..86afd1fff9 100644
--- a/engines/zvision/render_table.h
+++ b/engines/zvision/render_table.h
@@ -36,9 +36,9 @@ public:
public:
enum RenderState {
- PANORAMA,
- TILT,
- FLAT
+ PANORAMA,
+ TILT,
+ FLAT
};
private:
diff --git a/engines/zvision/rlf_animation.h b/engines/zvision/rlf_animation.h
index 3764465786..bc5fdc5d90 100644
--- a/engines/zvision/rlf_animation.h
+++ b/engines/zvision/rlf_animation.h
@@ -42,8 +42,8 @@ public:
private:
enum EncodingType {
- Masked,
- Simple
+ Masked,
+ Simple
};
struct Frame {
diff --git a/engines/zvision/save_manager.h b/engines/zvision/save_manager.h
index 9de1c51900..ec80b37e20 100644
--- a/engines/zvision/save_manager.h
+++ b/engines/zvision/save_manager.h
@@ -54,7 +54,7 @@ private:
static const uint32 SAVEGAME_ID;
enum {
- SAVE_VERSION = 1
+ SAVE_VERSION = 1
};
public:
diff --git a/engines/zvision/script_manager.h b/engines/zvision/script_manager.h
index 3e671aa3db..2f585b6291 100644
--- a/engines/zvision/script_manager.h
+++ b/engines/zvision/script_manager.h
@@ -41,59 +41,59 @@ namespace ZVision {
class ZVision;
enum StateKey {
- StateKey_World = 3,
- StateKey_Room = 4,
- StateKey_Node = 5,
- StateKey_View = 6,
- StateKey_ViewPos = 7,
- StateKey_KeyPress = 8,
- StateKey_InventoryItem = 9,
- StateKey_LMouse = 10,
- StateKey_NotSet = 11, // This key doesn't set
- StateKey_Rounds = 12,
- StateKey_Venus = 13,
- StateKey_RMouse = 18,
- StateKey_MenuState = 19,
- StateKey_RestoreFlag = 20,
- StateKey_Quitting = 39,
- StateKey_LastWorld = 40,
- StateKey_LastRoom = 41,
- StateKey_LastNode = 42,
- StateKey_LastView = 43,
- StateKey_LastViewPos = 44,
- StateKey_Menu_LastWorld = 45,
- StateKey_Menu_LastRoom = 46,
- StateKey_Menu_LastNode = 47,
- StateKey_Menu_LastView = 48,
- StateKey_Menu_LastViewPos = 49,
- StateKey_KbdRotateSpeed = 50,
- StateKey_Subtitles = 51,
- StateKey_StreamSkipKey = 52,
- StateKey_RotateSpeed = 53,
- StateKey_Volume = 56,
- StateKey_Qsound = 57,
- StateKey_VenusEnable = 58,
- StateKey_HighQuality = 59,
- StateKey_VideoLineSkip = 65,
- StateKey_Platform = 66,
- StateKey_InstallLevel = 67,
- StateKey_CountryCode = 68,
- StateKey_CPU = 69,
- StateKey_MovieCursor = 70,
- StateKey_NoTurnAnim = 71,
- StateKey_WIN958 = 72,
- StateKey_ShowErrorDlg = 73,
- StateKey_DebugCheats = 74,
- StateKey_JapanFonts = 75,
- StateKey_Brightness = 77,
- StateKey_EF9_B = 91,
- StateKey_EF9_G = 92,
- StateKey_EF9_R = 93,
- StateKey_EF9_Speed = 94,
- StateKey_Inv_Cnt_Slot = 100,
- StateKey_Inv_1_Slot = 101,
- StateKey_Inv_49_Slot = 149,
- StateKey_Inv_TotalSlots = 150
+ StateKey_World = 3,
+ StateKey_Room = 4,
+ StateKey_Node = 5,
+ StateKey_View = 6,
+ StateKey_ViewPos = 7,
+ StateKey_KeyPress = 8,
+ StateKey_InventoryItem = 9,
+ StateKey_LMouse = 10,
+ StateKey_NotSet = 11, // This key doesn't set
+ StateKey_Rounds = 12,
+ StateKey_Venus = 13,
+ StateKey_RMouse = 18,
+ StateKey_MenuState = 19,
+ StateKey_RestoreFlag = 20,
+ StateKey_Quitting = 39,
+ StateKey_LastWorld = 40,
+ StateKey_LastRoom = 41,
+ StateKey_LastNode = 42,
+ StateKey_LastView = 43,
+ StateKey_LastViewPos = 44,
+ StateKey_Menu_LastWorld = 45,
+ StateKey_Menu_LastRoom = 46,
+ StateKey_Menu_LastNode = 47,
+ StateKey_Menu_LastView = 48,
+ StateKey_Menu_LastViewPos = 49,
+ StateKey_KbdRotateSpeed = 50,
+ StateKey_Subtitles = 51,
+ StateKey_StreamSkipKey = 52,
+ StateKey_RotateSpeed = 53,
+ StateKey_Volume = 56,
+ StateKey_Qsound = 57,
+ StateKey_VenusEnable = 58,
+ StateKey_HighQuality = 59,
+ StateKey_VideoLineSkip = 65,
+ StateKey_Platform = 66,
+ StateKey_InstallLevel = 67,
+ StateKey_CountryCode = 68,
+ StateKey_CPU = 69,
+ StateKey_MovieCursor = 70,
+ StateKey_NoTurnAnim = 71,
+ StateKey_WIN958 = 72,
+ StateKey_ShowErrorDlg = 73,
+ StateKey_DebugCheats = 74,
+ StateKey_JapanFonts = 75,
+ StateKey_Brightness = 77,
+ StateKey_EF9_B = 91,
+ StateKey_EF9_G = 92,
+ StateKey_EF9_R = 93,
+ StateKey_EF9_Speed = 94,
+ StateKey_Inv_Cnt_Slot = 100,
+ StateKey_Inv_1_Slot = 101,
+ StateKey_Inv_49_Slot = 149,
+ StateKey_Inv_TotalSlots = 150
};
struct Location {
diff --git a/engines/zvision/sidefx.h b/engines/zvision/sidefx.h
index 210d98effb..2c53467559 100644
--- a/engines/zvision/sidefx.h
+++ b/engines/zvision/sidefx.h
@@ -37,15 +37,15 @@ class SideFX {
public:
enum SideFXType {
- SIDEFX_ANIM = 1,
- SIDEFX_AUDIO = 2,
- SIDEFX_DISTORT = 4,
- SIDEFX_PANTRACK = 8,
- SIDEFX_REGION = 16,
- SIDEFX_TIMER = 32,
- SIDEFX_TTYTXT = 64,
- SIDEFX_UNK = 128,
- SIDEFX_ALL = 255
+ SIDEFX_ANIM = 1,
+ SIDEFX_AUDIO = 2,
+ SIDEFX_DISTORT = 4,
+ SIDEFX_PANTRACK = 8,
+ SIDEFX_REGION = 16,
+ SIDEFX_TIMER = 32,
+ SIDEFX_TTYTXT = 64,
+ SIDEFX_UNK = 128,
+ SIDEFX_ALL = 255
};
SideFX() : _engine(0), _key(0), _type(SIDEFX_UNK) {}
diff --git a/engines/zvision/single_value_container.h b/engines/zvision/single_value_container.h
index 33fe69d760..32b4d6c6dc 100644
--- a/engines/zvision/single_value_container.h
+++ b/engines/zvision/single_value_container.h
@@ -36,15 +36,15 @@ namespace ZVision {
class SingleValueContainer {
public:
enum ValueType {
- BOOL,
- BYTE,
- INT16,
- UINT16,
- INT32,
- UINT32,
- FLOAT,
- DOUBLE,
- STRING
+ BOOL,
+ BYTE,
+ INT16,
+ UINT16,
+ INT32,
+ UINT32,
+ FLOAT,
+ DOUBLE,
+ STRING
};
// Constructors
diff --git a/engines/zvision/string_manager.h b/engines/zvision/string_manager.h
index a6ae6d20d6..9cfed5261b 100644
--- a/engines/zvision/string_manager.h
+++ b/engines/zvision/string_manager.h
@@ -59,7 +59,7 @@ private:
};
enum {
- NUM_TEXT_LINES = 56 // Max number of lines in a .str file. We hardcode this number because we know ZNem uses 42 strings and ZGI uses 56
+ NUM_TEXT_LINES = 56 // Max number of lines in a .str file. We hardcode this number because we know ZNem uses 42 strings and ZGI uses 56
};
private:
diff --git a/engines/zvision/zork_avi_decoder.h b/engines/zvision/zork_avi_decoder.h
index 7ddecce694..d8937ac057 100644
--- a/engines/zvision/zork_avi_decoder.h
+++ b/engines/zvision/zork_avi_decoder.h
@@ -61,7 +61,7 @@ private:
private:
// Audio Codecs
enum {
- kWaveFormatZorkPCM = 17 // special Zork PCM audio format (clashes with MS IMA ADPCM)
+ kWaveFormatZorkPCM = 17 // special Zork PCM audio format (clashes with MS IMA ADPCM)
};
};
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index c9e14e8651..983d5a56eb 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -70,19 +70,19 @@ public:
private:
enum {
- WINDOW_WIDTH = 640,
- WINDOW_HEIGHT = 480,
+ WINDOW_WIDTH = 640,
+ WINDOW_HEIGHT = 480,
- //Zork nemesis working window sizes
- ZNM_WORKING_WINDOW_WIDTH = 512,
- ZNM_WORKING_WINDOW_HEIGHT = 320,
+ //Zork nemesis working window sizes
+ ZNM_WORKING_WINDOW_WIDTH = 512,
+ ZNM_WORKING_WINDOW_HEIGHT = 320,
- //ZGI(and default) working window sizes
- WORKING_WINDOW_WIDTH = 640,
- WORKING_WINDOW_HEIGHT = 344,
+ //ZGI(and default) working window sizes
+ WORKING_WINDOW_WIDTH = 640,
+ WORKING_WINDOW_HEIGHT = 344,
- ROTATION_SCREEN_EDGE_OFFSET = 60,
- MAX_ROTATION_SPEED = 400 // Pixels per second
+ ROTATION_SCREEN_EDGE_OFFSET = 60,
+ MAX_ROTATION_SPEED = 400 // Pixels per second
};
Console *_console;
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 05:32:20 +0000