summaryrefslogtreecommitdiffstats
path: root/src/control/Script.h
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-07-07 23:05:24 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2019-07-07 23:05:24 +0200
commit4f3d17a81c5be7112b9adff89bc621a770bf1ffa (patch)
tree46416a036782540ed6e0d330d082bb9a544e87a7 /src/control/Script.h
parentMerge remote-tracking branch 'upstream/master' (diff)
downloadre3-4f3d17a81c5be7112b9adff89bc621a770bf1ffa.tar
re3-4f3d17a81c5be7112b9adff89bc621a770bf1ffa.tar.gz
re3-4f3d17a81c5be7112b9adff89bc621a770bf1ffa.tar.bz2
re3-4f3d17a81c5be7112b9adff89bc621a770bf1ffa.tar.lz
re3-4f3d17a81c5be7112b9adff89bc621a770bf1ffa.tar.xz
re3-4f3d17a81c5be7112b9adff89bc621a770bf1ffa.tar.zst
re3-4f3d17a81c5be7112b9adff89bc621a770bf1ffa.zip
Diffstat (limited to 'src/control/Script.h')
-rw-r--r--src/control/Script.h18
1 files changed, 16 insertions, 2 deletions
diff --git a/src/control/Script.h b/src/control/Script.h
index 392f4b40..d4624ad4 100644
--- a/src/control/Script.h
+++ b/src/control/Script.h
@@ -8,7 +8,7 @@
struct CScriptRectangle
{
- int8 m_Type;
+ int8 m_bIsUsed;
bool m_bBeforeFade;
int16 m_nTextureId;
CRect m_sRect;
@@ -71,7 +71,7 @@ class CRunningScript
uint16 m_nStackPointer;
int32 m_anLocalVariables[NUM_LOCAL_VARS + NUM_TIMERS];
bool m_bCondResult;
- bool m_bIsMissionThread;
+ bool m_bIsMissionScript;
bool m_bSkipWakeTime;
uint32 m_nWakeTime;
uint16 m_nAndOrState;
@@ -96,6 +96,20 @@ public:
void RemoveScriptFromList(CRunningScript**);
void AddScriptToList(CRunningScript**);
void Process();
+ int8 ProcessOneCommand();
+ void DoDeatharrestCheck();
+ int8 ProcessCommandsFrom0To99(int32);
+ int8 ProcessCommandsFrom100To199(int32);
+ int8 ProcessCommandsFrom200To299(int32);
+ int8 ProcessCommandsFrom300To399(int32);
+ int8 ProcessCommandsFrom400To499(int32);
+ int8 ProcessCommandsFrom500To599(int32);
+ int8 ProcessCommandsFrom600To699(int32);
+ int8 ProcessCommandsFrom700To799(int32);
+ int8 ProcessCommandsFrom800To899(int32);
+ int8 ProcessCommandsFrom900To999(int32);
+ int8 ProcessCommandsFrom1000To1099(int32);
+ int8 ProcessCommandsFrom1100To1199(int32);
};
enum {