aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorMarisa-Chan2014-01-13 09:07:44 +0700
committerMarisa-Chan2014-01-13 09:07:44 +0700
commit9803f7e6c045d625ee41e5b2769b1b2de3ab8ee3 (patch)
tree6c685e84d3c66e27cf86b6d1cbefcce474e70f2d /engines
parent4ced9c07e0ce55fd77c7a31261a3179b5abb7a8c (diff)
downloadscummvm-rg350-9803f7e6c045d625ee41e5b2769b1b2de3ab8ee3.tar.gz
scummvm-rg350-9803f7e6c045d625ee41e5b2769b1b2de3ab8ee3.tar.bz2
scummvm-rg350-9803f7e6c045d625ee41e5b2769b1b2de3ab8ee3.zip
ZVISION: Fix code style with astyle.
Diffstat (limited to 'engines')
-rw-r--r--engines/zvision/animation_node.cpp8
-rw-r--r--engines/zvision/menu.cpp16
-rw-r--r--engines/zvision/menu.h18
-rw-r--r--engines/zvision/script_manager.h106
4 files changed, 74 insertions, 74 deletions
diff --git a/engines/zvision/animation_node.cpp b/engines/zvision/animation_node.cpp
index 74b532b2ef..27ee873f98 100644
--- a/engines/zvision/animation_node.cpp
+++ b/engines/zvision/animation_node.cpp
@@ -191,11 +191,11 @@ void AnimationNode::addPlayNode(int32 slot, int x, int y, int x2, int y2, int st
nod.start = start_frame;
nod.stop = end_frame;
if (_fileType == RLF) {
- if (nod.stop >= (int)_animation.rlf->frameCount())
- nod.stop = _animation.rlf->frameCount() - 1;
+ if (nod.stop >= (int)_animation.rlf->frameCount())
+ nod.stop = _animation.rlf->frameCount() - 1;
} else if (_fileType == AVI) {
- if (nod.stop > (int)_animation.avi->getFrameCount())
- nod.stop = _animation.avi->getFrameCount();
+ if (nod.stop > (int)_animation.avi->getFrameCount())
+ nod.stop = _animation.avi->getFrameCount();
}
nod.slot = slot;
nod._cur_frm = -1;
diff --git a/engines/zvision/menu.cpp b/engines/zvision/menu.cpp
index 4c84271c47..8e1dea183b 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) {
diff --git a/engines/zvision/menu.h b/engines/zvision/menu.h
index c5938cdc3d..35e7347a3b 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/script_manager.h b/engines/zvision/script_manager.h
index 2f585b6291..3e671aa3db 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 {