From 69d30f22046dfddc79e1e169ed7d90bf3b920335 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Thu, 7 Jan 2021 15:21:35 +0300 Subject: some lcs stuff --- src/control/Script.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/control/Script.h') diff --git a/src/control/Script.h b/src/control/Script.h index 66c9914e..2690b4ff 100644 --- a/src/control/Script.h +++ b/src/control/Script.h @@ -267,7 +267,8 @@ enum { MAX_NUM_MISSION_SCRIPTS = 120, MAX_NUM_BUILDING_SWAPS = 25, MAX_NUM_INVISIBILITY_SETTINGS = 20, - MAX_NUM_STORED_LINES = 1024 + MAX_NUM_STORED_LINES = 1024, + MAX_ALLOWED_COLLISIONS = 2 }; class CTheScripts @@ -317,6 +318,8 @@ class CTheScripts #define CARDS_IN_STACK (CARDS_IN_DECK * MAX_DECKS) static int16 CardStack[CARDS_IN_STACK]; static int16 CardStackPosition; + + static int AllowedCollision[MAX_ALLOWED_COLLISIONS]; #endif public: static bool bPlayerIsInTheStatium; -- cgit v1.2.3 From 236b3b1c2b6d6480acbe50f6f3c5f16c8208a95e Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Fri, 8 Jan 2021 12:41:39 +0300 Subject: more stuff --- src/control/Script.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/control/Script.h') diff --git a/src/control/Script.h b/src/control/Script.h index f35d0261..e4196220 100644 --- a/src/control/Script.h +++ b/src/control/Script.h @@ -216,9 +216,12 @@ public: enum { ARGUMENT_END = 0, + ARGUMENT_INT_ZERO, + ARGUMENT_FLOAT_ZERO, + ARGUMENT_FLOAT_1BYTE, + ARGUMENT_FLOAT_2BYTES, + ARGUMENT_FLOAT_3BYTES, ARGUMENT_INT32, - ARGUMENT_GLOBALVAR, - ARGUMENT_LOCALVAR, ARGUMENT_INT8, ARGUMENT_INT16, ARGUMENT_FLOAT @@ -451,6 +454,8 @@ enum { NUM_TIMERS = 2 }; +extern int ScriptParams[32]; + class CRunningScript { enum { @@ -512,7 +517,7 @@ public: static const uint32 nSaveStructSize; - void CollectParameters(uint32*, int16); + void CollectParameters(uint32*, int16, int* pParams = (int*)&ScriptParams); int32 CollectNextParameterWithoutIncreasingPC(uint32); int32* GetPointerToScriptVariable(uint32*, int16); void StoreParameters(uint32*, int16); -- cgit v1.2.3