diff options
author | yinsimei | 2017-05-29 08:02:59 +0200 |
---|---|---|
committer | Eugene Sandulenko | 2017-07-13 18:27:45 +0200 |
commit | ca2ee02496f232a53ed6c96bd296e0941da636f6 (patch) | |
tree | d975887a6cead9e711afddb2053020db68a7914b /engines/sludge/variable.h | |
parent | 2dddb900c9b6d4356a19886cd31587a049be23d8 (diff) | |
download | scummvm-rg350-ca2ee02496f232a53ed6c96bd296e0941da636f6.tar.gz scummvm-rg350-ca2ee02496f232a53ed6c96bd296e0941da636f6.tar.bz2 scummvm-rg350-ca2ee02496f232a53ed6c96bd296e0941da636f6.zip |
SLUDGE: code formatting
Diffstat (limited to 'engines/sludge/variable.h')
-rw-r--r-- | engines/sludge/variable.h | 55 |
1 files changed, 32 insertions, 23 deletions
diff --git a/engines/sludge/variable.h b/engines/sludge/variable.h index 8f9f743fb8..295473e55c 100644 --- a/engines/sludge/variable.h +++ b/engines/sludge/variable.h @@ -27,41 +27,50 @@ namespace Sludge { struct variable;
struct variableStack;
-enum variableType {SVT_NULL, SVT_INT, SVT_FUNC, SVT_STRING,
- SVT_BUILT, SVT_FILE, SVT_STACK,
- SVT_OBJTYPE, SVT_ANIM, SVT_COSTUME,
- SVT_FASTARRAY, SVT_NUM_TYPES
- };
+enum variableType {
+ SVT_NULL,
+ SVT_INT,
+ SVT_FUNC,
+ SVT_STRING,
+ SVT_BUILT,
+ SVT_FILE,
+ SVT_STACK,
+ SVT_OBJTYPE,
+ SVT_ANIM,
+ SVT_COSTUME,
+ SVT_FASTARRAY,
+ SVT_NUM_TYPES
+};
struct fastArrayHandler {
- struct variable *fastVariables;
- int size;
- int timesUsed;
+ struct variable *fastVariables;
+ int size;
+ int timesUsed;
};
struct stackHandler {
- struct variableStack *first;
- struct variableStack *last;
- int timesUsed;
+ struct variableStack *first;
+ struct variableStack *last;
+ int timesUsed;
};
union variableData {
- signed int intValue;
- char *theString;
- stackHandler *theStack;
- struct personaAnimation *animHandler;
- struct persona *costumeHandler;
- fastArrayHandler *fastArray;
+ signed int intValue;
+ char *theString;
+ stackHandler *theStack;
+ struct personaAnimation *animHandler;
+ struct persona *costumeHandler;
+ fastArrayHandler *fastArray;
};
struct variable {
- variableType varType;
- variableData varData;
+ variableType varType;
+ variableData varData;
};
struct variableStack {
- variable thisVar;
- variableStack *next;
+ variable thisVar;
+ variableStack *next;
};
// Initialisation
@@ -94,7 +103,8 @@ bool getValueType(int &toHere, variableType vT, const variable &v); bool addVarToStack(const variable &va, variableStack *&thisStack);
bool addVarToStackQuick(variable &va, variableStack *&thisStack);
void trimStack(variableStack *&stack);
-int deleteVarFromStack(const variable &va, variableStack *&thisStack, bool allOfEm = false);
+int deleteVarFromStack(const variable &va, variableStack *&thisStack,
+ bool allOfEm = false);
variableStack *stackFindLast(variableStack *hunt);
bool copyStack(const variable &from, variable &to);
int stackSize(const stackHandler *me);
@@ -106,7 +116,6 @@ bool makeFastArrayFromStack(variable &to, const stackHandler *stacky); bool makeFastArraySize(variable &to, int size);
variable *fastArrayGetByIndex(fastArrayHandler *vS, unsigned int theIndex);
-
#define DEBUG_STACKINESS 0
#if DEBUG_STACKINESS
|