diff options
| author | Einar Johan Trøan Sømåen | 2012-06-15 00:57:58 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-06-15 00:57:58 +0200 |
| commit | 41c3b57aadbaa3030ea56f0fb9a3c57d671d151d (patch) | |
| tree | 7adaa994d1f45cfd1942a39bac48c551bfcd961e | |
| parent | 407a8818002b91f512faacb2ce9fa1f48b4c649e (diff) | |
| download | scummvm-rg350-41c3b57aadbaa3030ea56f0fb9a3c57d671d151d.tar.gz scummvm-rg350-41c3b57aadbaa3030ea56f0fb9a3c57d671d151d.tar.bz2 scummvm-rg350-41c3b57aadbaa3030ea56f0fb9a3c57d671d151d.zip | |
WINTERMUTE: Clean up the formatting in dctypes a bit
| -rw-r--r-- | engines/wintermute/Ad/AdActor.cpp | 2 | ||||
| -rw-r--r-- | engines/wintermute/dctypes.h | 103 | ||||
| -rw-r--r-- | engines/wintermute/utils/PathUtil.cpp | 2 |
3 files changed, 78 insertions, 29 deletions
diff --git a/engines/wintermute/Ad/AdActor.cpp b/engines/wintermute/Ad/AdActor.cpp index 07eac85a93..55e73ea482 100644 --- a/engines/wintermute/Ad/AdActor.cpp +++ b/engines/wintermute/Ad/AdActor.cpp @@ -25,7 +25,7 @@ * http://dead-code.org/redir.php?target=wmelite
* Copyright (c) 2011 Jan Nedoma
*/
-
+#define FORBIDDEN_SYMBOL_EXCEPTION_rand
#include "engines/wintermute/dcgf.h"
#include "engines/wintermute/dctypes.h"
#include "engines/wintermute/persistent.h"
diff --git a/engines/wintermute/dctypes.h b/engines/wintermute/dctypes.h index f295b01df1..988f865f21 100644 --- a/engines/wintermute/dctypes.h +++ b/engines/wintermute/dctypes.h @@ -29,14 +29,10 @@ #ifndef WINTERMUTE_DCTYPES_H
#define WINTERMUTE_DCTYPES_H
-#define FORBIDDEN_SYMBOL_ALLOW_ALL
#include "common/str.h"
#include "common/list.h"
#include "common/array.h"
-//#include <string>
-//#include <list>
-//#include <vector>
namespace WinterMute {
@@ -55,25 +51,45 @@ typedef Common::Array<AnsiString> AnsiStringArray; enum TGameState {
- GAME_RUNNING, GAME_FROZEN, GAME_SEMI_FROZEN
+ GAME_RUNNING,
+ GAME_FROZEN,
+ GAME_SEMI_FROZEN
};
-enum TImageType { IMG_PALETTED8, IMG_TRUECOLOR } ;
+enum TImageType {
+ IMG_PALETTED8,
+ IMG_TRUECOLOR
+};
enum TTextAlign {
- TAL_LEFT = 0, TAL_RIGHT, TAL_CENTER, NUM_TEXT_ALIGN
+ TAL_LEFT = 0,
+ TAL_RIGHT,
+ TAL_CENTER,
+ NUM_TEXT_ALIGN
};
enum TVerticalAlign {
- VAL_TOP = 0, VAL_CENTER, VAL_BOTTOM, NUM_VERTICAL_ALIGN
+ VAL_TOP = 0,
+ VAL_CENTER,
+ VAL_BOTTOM,
+ NUM_VERTICAL_ALIGN
};
enum TDirection {
- DI_UP = 0, DI_UPRIGHT = 1, DI_RIGHT = 2, DI_DOWNRIGHT = 3, DI_DOWN = 4, DI_DOWNLEFT = 5, DI_LEFT = 6, DI_UPLEFT = 7, NUM_DIRECTIONS = 8, DI_NONE = 9
+ DI_UP = 0,
+ DI_UPRIGHT = 1,
+ DI_RIGHT = 2,
+ DI_DOWNRIGHT = 3,
+ DI_DOWN = 4,
+ DI_DOWNLEFT = 5,
+ DI_LEFT = 6,
+ DI_UPLEFT = 7,
+ NUM_DIRECTIONS = 8,
+ DI_NONE = 9
};
@@ -96,12 +112,21 @@ enum TEventType { enum TUIObjectType {
- UI_UNKNOWN, UI_BUTTON, UI_WINDOW, UI_STATIC, UI_EDIT, UI_HTML, UI_CUSTOM
+ UI_UNKNOWN,
+ UI_BUTTON,
+ UI_WINDOW,
+ UI_STATIC,
+ UI_EDIT,
+ UI_HTML,
+ UI_CUSTOM
};
enum TRendererState {
- RSTATE_3D, RSTATE_2D, RSTATE_LINES, RSTATE_NONE
+ RSTATE_3D,
+ RSTATE_2D,
+ RSTATE_LINES,
+ RSTATE_NONE
};
@@ -116,28 +141,36 @@ enum TSeek { };
enum TSoundType {
- SOUND_SFX, SOUND_MUSIC, SOUND_SPEECH
+ SOUND_SFX,
+ SOUND_MUSIC,
+ SOUND_SPEECH
};
enum TVideoMode {
- VIDEO_WINDOW, VIDEO_FULLSCREEN, VIDEO_ANY
+ VIDEO_WINDOW,
+ VIDEO_FULLSCREEN,
+ VIDEO_ANY
};
enum TVideoPlayback {
- VID_PLAY_POS = 0,
- VID_PLAY_STRETCH = 1,
- VID_PLAY_CENTER = 2
+ VID_PLAY_POS = 0,
+ VID_PLAY_STRETCH = 1,
+ VID_PLAY_CENTER = 2
};
enum TMouseEvent {
- MOUSE_CLICK, MOUSE_RELEASE, MOUSE_DBLCLICK
+ MOUSE_CLICK,
+ MOUSE_RELEASE,
+ MOUSE_DBLCLICK
};
enum TMouseButton {
- MOUSE_BUTTON_LEFT, MOUSE_BUTTON_RIGHT, MOUSE_BUTTON_MIDDLE
+ MOUSE_BUTTON_LEFT,
+ MOUSE_BUTTON_RIGHT,
+ MOUSE_BUTTON_MIDDLE
};
@@ -147,40 +180,56 @@ enum TTransMgrState { enum TTransitionType {
- TRANSITION_NONE = 0,
+ TRANSITION_NONE = 0,
TRANSITION_FADE_OUT = 1,
- TRANSITION_FADE_IN = 2,
+ TRANSITION_FADE_IN = 2,
NUM_TRANSITION_TYPES
};
enum TWindowMode {
- WINDOW_NORMAL, WINDOW_EXCLUSIVE, WINDOW_SYSTEM_EXCLUSIVE
+ WINDOW_NORMAL,
+ WINDOW_EXCLUSIVE,
+ WINDOW_SYSTEM_EXCLUSIVE
};
enum TSFXType {
- SFX_NONE, SFX_ECHO, SFX_REVERB
+ SFX_NONE,
+ SFX_ECHO,
+ SFX_REVERB
};
enum TSpriteCacheType {
- CACHE_ALL, CACHE_HALF
+ CACHE_ALL,
+ CACHE_HALF
};
enum TTextEncoding {
- TEXT_ANSI = 0, TEXT_UTF8 = 1, NUM_TEXT_ENCODINGS
+ TEXT_ANSI = 0,
+ TEXT_UTF8 = 1,
+ NUM_TEXT_ENCODINGS
};
enum TSpriteBlendMode {
- BLEND_UNKNOWN = -1, BLEND_NORMAL = 0, BLEND_ADDITIVE = 1, BLEND_SUBTRACTIVE = 2, NUM_BLEND_MODES
+ BLEND_UNKNOWN = -1,
+ BLEND_NORMAL = 0,
+ BLEND_ADDITIVE = 1,
+ BLEND_SUBTRACTIVE = 2,
+ NUM_BLEND_MODES
};
enum TTTSType {
- TTS_CAPTION = 0, TTS_TALK, TTS_KEYPRESS
+ TTS_CAPTION = 0,
+ TTS_TALK,
+ TTS_KEYPRESS
};
enum TShadowType {
- SHADOW_NONE = 0, SHADOW_SIMPLE = 1, SHADOW_FLAT = 2, SHADOW_STENCIL = 3
+ SHADOW_NONE = 0,
+ SHADOW_SIMPLE = 1,
+ SHADOW_FLAT = 2,
+ SHADOW_STENCIL = 3
};
} // end of namespace WinterMute
diff --git a/engines/wintermute/utils/PathUtil.cpp b/engines/wintermute/utils/PathUtil.cpp index dc722e2389..e2e6c56b9f 100644 --- a/engines/wintermute/utils/PathUtil.cpp +++ b/engines/wintermute/utils/PathUtil.cpp @@ -25,7 +25,7 @@ * http://dead-code.org/redir.php?target=wmelite
* Copyright (c) 2011 Jan Nedoma
*/
-
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
#include "engines/wintermute/dcgf.h"
#include <algorithm>
#include <fstream>
|