comparison: variables.h
variables.h
- changeset 67
- 0a202714eea4
- parent 24
- 7dcc8419dbdb
equal
deleted
inserted
replaced
| 66:4fc1ec88aa41 | 67:0a202714eea4 |
|---|---|
| 44 #include "scriptreader.h" | 44 #include "scriptreader.h" |
| 45 | 45 |
| 46 struct ScriptVar { | 46 struct ScriptVar { |
| 47 str name; | 47 str name; |
| 48 str statename; | 48 str statename; |
| 49 type_e type; | |
| 49 int value; | 50 int value; |
| 50 unsigned int index; | 51 unsigned int index; |
| 51 ScriptVar* next; | |
| 52 }; | 52 }; |
| 53 | 53 |
| 54 #ifndef __VARIABLES_CXX__ | 54 extern array<ScriptVar> g_GlobalVariables; |
| 55 extern ScriptVar* g_GlobalVariables[MAX_SCRIPT_VARIABLES]; | 55 extern array<ScriptVar> g_LocalVariables; |
| 56 extern ScriptVar* g_LocalVariable; | |
| 57 #endif // __VARIABLES_CXX__ | |
| 58 | 56 |
| 59 #define ITERATE_GLOBAL_VARS(u) \ | 57 #define ITERATE_GLOBAL_VARS(u) \ |
| 60 for (u = 0; u < MAX_SCRIPT_VARIABLES; u++) | 58 for (u = 0; u < MAX_SCRIPT_VARIABLES; u++) |
| 61 #define ITERATE_SCRIPT_VARS(g) \ | 59 #define ITERATE_SCRIPT_VARS(g) \ |
| 62 for (g = g_ScriptVariable; g != NULL; g = g->next) | 60 for (g = g_ScriptVariable; g != NULL; g = g->next) |
| 63 | 61 |
| 64 ScriptVar* DeclareGlobalVariable (ScriptReader* r, str name); | 62 ScriptVar* DeclareGlobalVariable (ScriptReader* r, type_e type, str name); |
| 65 unsigned int CountGlobalVars (); | 63 deprecated unsigned int CountGlobalVars (); |
| 66 void InitVariables (); | |
| 67 ScriptVar* FindGlobalVariable (str name); | 64 ScriptVar* FindGlobalVariable (str name); |
| 68 | 65 |
| 69 #endif // __VARIABLES_H__ | 66 #endif // __VARIABLES_H__ |
