diff options
author | Einar Johan Trøan Sømåen | 2012-08-31 21:01:53 +0200 |
---|---|---|
committer | Einar Johan Trøan Sømåen | 2012-08-31 21:03:29 +0200 |
commit | e067520bb904615ed75217808ba27235eb244336 (patch) | |
tree | 4c2d0965609a9ef0d8e33fd977ee3f5b15191008 | |
parent | 59b1bbfa158b308d2674ca07efa77dbc7dbefaea (diff) | |
download | scummvm-rg350-e067520bb904615ed75217808ba27235eb244336.tar.gz scummvm-rg350-e067520bb904615ed75217808ba27235eb244336.tar.bz2 scummvm-rg350-e067520bb904615ed75217808ba27235eb244336.zip |
WINTERMUTE: Use tabs in enums
-rw-r--r-- | engines/wintermute/ad/ad_response_box.h | 6 | ||||
-rw-r--r-- | engines/wintermute/base/base_file_manager.h | 4 | ||||
-rw-r--r-- | engines/wintermute/base/scriptables/dcscript.h | 152 | ||||
-rw-r--r-- | engines/wintermute/utils/convert_utf.h | 12 | ||||
-rw-r--r-- | engines/wintermute/video/video_theora_player.h | 8 | ||||
-rw-r--r-- | engines/wintermute/wintermute.h | 10 |
6 files changed, 96 insertions, 96 deletions
diff --git a/engines/wintermute/ad/ad_response_box.h b/engines/wintermute/ad/ad_response_box.h index 99522f00f6..8c76b561c6 100644 --- a/engines/wintermute/ad/ad_response_box.h +++ b/engines/wintermute/ad/ad_response_box.h @@ -52,9 +52,9 @@ public: ScScript *_waitingScript;
virtual bool listen(BaseScriptHolder *param1, uint32 param2);
typedef enum {
- EVENT_PREV,
- EVENT_NEXT,
- EVENT_RESPONSE
+ EVENT_PREV,
+ EVENT_NEXT,
+ EVENT_RESPONSE
} TResponseEvent;
bool weedResponses();
diff --git a/engines/wintermute/base/base_file_manager.h b/engines/wintermute/base/base_file_manager.h index 1b93f7dee4..3fb4434e9c 100644 --- a/engines/wintermute/base/base_file_manager.h +++ b/engines/wintermute/base/base_file_manager.h @@ -52,8 +52,8 @@ public: static BaseFileManager *getEngineInstance();
private:
typedef enum {
- PATH_PACKAGE,
- PATH_SINGLE
+ PATH_PACKAGE,
+ PATH_SINGLE
} TPathType;
bool reloadPaths();
bool initPaths();
diff --git a/engines/wintermute/base/scriptables/dcscript.h b/engines/wintermute/base/scriptables/dcscript.h index db63ad2b87..6810fdf665 100644 --- a/engines/wintermute/base/scriptables/dcscript.h +++ b/engines/wintermute/base/scriptables/dcscript.h @@ -36,104 +36,104 @@ namespace Wintermute { // value types
typedef enum {
- VAL_NULL,
- VAL_STRING,
- VAL_INT,
- VAL_BOOL,
- VAL_FLOAT,
- VAL_OBJECT,
- VAL_NATIVE,
- VAL_VARIABLE_REF
+ VAL_NULL,
+ VAL_STRING,
+ VAL_INT,
+ VAL_BOOL,
+ VAL_FLOAT,
+ VAL_OBJECT,
+ VAL_NATIVE,
+ VAL_VARIABLE_REF
} TValType;
// script states
typedef enum {
- SCRIPT_RUNNING,
- SCRIPT_WAITING,
- SCRIPT_SLEEPING,
- SCRIPT_FINISHED,
- SCRIPT_PERSISTENT,
- SCRIPT_ERROR,
- SCRIPT_PAUSED,
- SCRIPT_WAITING_SCRIPT,
- SCRIPT_THREAD_FINISHED
+ SCRIPT_RUNNING,
+ SCRIPT_WAITING,
+ SCRIPT_SLEEPING,
+ SCRIPT_FINISHED,
+ SCRIPT_PERSISTENT,
+ SCRIPT_ERROR,
+ SCRIPT_PAUSED,
+ SCRIPT_WAITING_SCRIPT,
+ SCRIPT_THREAD_FINISHED
} TScriptState;
// opcodes
typedef enum {
- II_DEF_VAR = 0,
- II_DEF_GLOB_VAR,
- II_RET,
- II_RET_EVENT,
- II_CALL,
- II_CALL_BY_EXP,
- II_EXTERNAL_CALL,
- II_SCOPE,
- II_CORRECT_STACK,
- II_CREATE_OBJECT,
- II_POP_EMPTY,
- II_PUSH_VAR,
- II_PUSH_VAR_REF,
- II_POP_VAR,
- II_PUSH_VAR_THIS, // push current this on stack
- II_PUSH_INT,
- II_PUSH_BOOL,
- II_PUSH_FLOAT,
- II_PUSH_STRING,
- II_PUSH_NULL,
- II_PUSH_THIS_FROM_STACK,
- II_PUSH_THIS,
- II_POP_THIS,
- II_PUSH_BY_EXP,
- II_POP_BY_EXP,
- II_JMP,
- II_JMP_FALSE,
- II_ADD,
- II_SUB,
- II_MUL,
- II_DIV,
- II_MODULO,
- II_NOT,
- II_AND,
- II_OR,
- II_CMP_EQ,
- II_CMP_NE,
- II_CMP_L,
- II_CMP_G,
- II_CMP_LE,
- II_CMP_GE,
- II_CMP_STRICT_EQ,
- II_CMP_STRICT_NE,
- II_DBG_LINE,
- II_POP_REG1,
- II_PUSH_REG1,
- II_DEF_CONST_VAR
+ II_DEF_VAR = 0,
+ II_DEF_GLOB_VAR,
+ II_RET,
+ II_RET_EVENT,
+ II_CALL,
+ II_CALL_BY_EXP,
+ II_EXTERNAL_CALL,
+ II_SCOPE,
+ II_CORRECT_STACK,
+ II_CREATE_OBJECT,
+ II_POP_EMPTY,
+ II_PUSH_VAR,
+ II_PUSH_VAR_REF,
+ II_POP_VAR,
+ II_PUSH_VAR_THIS, // push current this on stack
+ II_PUSH_INT,
+ II_PUSH_BOOL,
+ II_PUSH_FLOAT,
+ II_PUSH_STRING,
+ II_PUSH_NULL,
+ II_PUSH_THIS_FROM_STACK,
+ II_PUSH_THIS,
+ II_POP_THIS,
+ II_PUSH_BY_EXP,
+ II_POP_BY_EXP,
+ II_JMP,
+ II_JMP_FALSE,
+ II_ADD,
+ II_SUB,
+ II_MUL,
+ II_DIV,
+ II_MODULO,
+ II_NOT,
+ II_AND,
+ II_OR,
+ II_CMP_EQ,
+ II_CMP_NE,
+ II_CMP_L,
+ II_CMP_G,
+ II_CMP_LE,
+ II_CMP_GE,
+ II_CMP_STRICT_EQ,
+ II_CMP_STRICT_NE,
+ II_DBG_LINE,
+ II_POP_REG1,
+ II_PUSH_REG1,
+ II_DEF_CONST_VAR
} TInstruction;
// external data types
typedef enum {
- TYPE_VOID = 0,
- TYPE_BOOL,
- TYPE_LONG,
- TYPE_BYTE,
- TYPE_STRING,
- TYPE_FLOAT,
- TYPE_DOUBLE,
- TYPE_MEMBUFFER
+ TYPE_VOID = 0,
+ TYPE_BOOL,
+ TYPE_LONG,
+ TYPE_BYTE,
+ TYPE_STRING,
+ TYPE_FLOAT,
+ TYPE_DOUBLE,
+ TYPE_MEMBUFFER
} TExternalType;
// call types
typedef enum {
- CALL_STDCALL = 0,
- CALL_CDECL,
- CALL_THISCALL
+ CALL_STDCALL = 0,
+ CALL_CDECL,
+ CALL_THISCALL
} TCallType;
// element types
typedef enum {
- ELEMENT_STRING = 0
+ ELEMENT_STRING = 0
} TElementType;
} // end of namespace Wintermute
diff --git a/engines/wintermute/utils/convert_utf.h b/engines/wintermute/utils/convert_utf.h index 171d86343a..a5f34456f5 100644 --- a/engines/wintermute/utils/convert_utf.h +++ b/engines/wintermute/utils/convert_utf.h @@ -106,15 +106,15 @@ typedef uint8 Boolean; /* 0 or 1 */ #define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF typedef enum { - conversionOK, /* conversion successful */ - sourceExhausted, /* partial character in source, but hit end */ - targetExhausted, /* insuff. room in target for conversion */ - sourceIllegal /* source sequence is illegal/malformed */ + conversionOK, /* conversion successful */ + sourceExhausted, /* partial character in source, but hit end */ + targetExhausted, /* insuff. room in target for conversion */ + sourceIllegal /* source sequence is illegal/malformed */ } ConversionResult; typedef enum { - strictConversion = 0, - lenientConversion + strictConversion = 0, + lenientConversion } ConversionFlags; ConversionResult ConvertUTF8toUTF16( diff --git a/engines/wintermute/video/video_theora_player.h b/engines/wintermute/video/video_theora_player.h index fd1b7b94b3..593c1b9666 100644 --- a/engines/wintermute/video/video_theora_player.h +++ b/engines/wintermute/video/video_theora_player.h @@ -41,10 +41,10 @@ class BaseImage; class VideoTheoraPlayer : public BaseClass { private: enum { - THEORA_STATE_NONE = 0, - THEORA_STATE_PLAYING = 1, - THEORA_STATE_PAUSED = 2, - THEORA_STATE_FINISHED = 3 + THEORA_STATE_NONE = 0, + THEORA_STATE_PLAYING = 1, + THEORA_STATE_PAUSED = 2, + THEORA_STATE_FINISHED = 3 }; Video::VideoDecoder *_theoraDecoder; Graphics::Surface _surface; diff --git a/engines/wintermute/wintermute.h b/engines/wintermute/wintermute.h index 730a4e8358..d24b120658 100644 --- a/engines/wintermute/wintermute.h +++ b/engines/wintermute/wintermute.h @@ -34,11 +34,11 @@ class BaseGame; class SystemClassRegistry; // our engine debug channels enum { - kWintermuteDebugLog = 1 << 0, // The debug-logs from the original engine - kWintermuteDebugSaveGame = 1 << 1, - kWintermuteDebugFont = 1 << 2, // next new channel must be 1 << 2 (4) - kWintermuteDebugFileAccess = 1 << 3, // the current limitation is 32 debug channels (1 << 31 is the last one) - kWintermuteDebugAudio = 1 << 4, + kWintermuteDebugLog = 1 << 0, // The debug-logs from the original engine + kWintermuteDebugSaveGame = 1 << 1, + kWintermuteDebugFont = 1 << 2, // next new channel must be 1 << 2 (4) + kWintermuteDebugFileAccess = 1 << 3, // the current limitation is 32 debug channels (1 << 31 is the last one) + kWintermuteDebugAudio = 1 << 4, kWintermuteDebugGeneral = 1 << 5 }; |