summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-01-21 03:40:56 +0100
committerwithmorten <morten.with@gmail.com>2021-01-21 19:42:51 +0100
commit034df61f3c2757b28c082101fd0f38054263c0ed (patch)
tree24c3362300297f399149e903f29ba47b24b65303 /src/control
parentMerge remote-tracking branch 'upstream/master' into cw (diff)
downloadre3-034df61f3c2757b28c082101fd0f38054263c0ed.tar
re3-034df61f3c2757b28c082101fd0f38054263c0ed.tar.gz
re3-034df61f3c2757b28c082101fd0f38054263c0ed.tar.bz2
re3-034df61f3c2757b28c082101fd0f38054263c0ed.tar.lz
re3-034df61f3c2757b28c082101fd0f38054263c0ed.tar.xz
re3-034df61f3c2757b28c082101fd0f38054263c0ed.tar.zst
re3-034df61f3c2757b28c082101fd0f38054263c0ed.zip
Diffstat (limited to '')
-rw-r--r--src/control/SceneEdit.cpp2
-rw-r--r--src/control/Script.cpp2
-rw-r--r--src/control/Script5.cpp10
3 files changed, 7 insertions, 7 deletions
diff --git a/src/control/SceneEdit.cpp b/src/control/SceneEdit.cpp
index 0a679ab5..42dadee0 100644
--- a/src/control/SceneEdit.cpp
+++ b/src/control/SceneEdit.cpp
@@ -69,7 +69,7 @@ static const char* pCommandStrings[] = {
};
#ifdef CHECK_STRUCT_SIZES
-re3_static_assert(ARRAY_SIZE(pCommandStrings) == CSceneEdit::MOVIE_TOTAL_COMMANDS, "Scene edit: not all commands have names");
+static_assert(ARRAY_SIZE(pCommandStrings) == CSceneEdit::MOVIE_TOTAL_COMMANDS, "Scene edit: not all commands have names");
#endif
static int32 NextValidModelId(int32 mi, int32 step)
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index fe8bbdfe..09a696cf 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -1282,7 +1282,7 @@ const tScriptCommandData commands[] = {
#undef INPUT_ARGUMENTS
#undef OUTPUT_ARGUMENTS
-re3_static_assert(ARRAY_SIZE(commands) == LAST_SCRIPT_COMMAND, "commands array not filled");
+static_assert(ARRAY_SIZE(commands) == LAST_SCRIPT_COMMAND, "commands array not filled");
#if SCRIPT_LOG_FILE_LEVEL == 1 || SCRIPT_LOG_FILE_LEVEL == 2
static FILE* dbg_log;
diff --git a/src/control/Script5.cpp b/src/control/Script5.cpp
index 56164075..b54d425c 100644
--- a/src/control/Script5.cpp
+++ b/src/control/Script5.cpp
@@ -1924,7 +1924,7 @@ INITSAVEBUF
for (uint32 i = 0; i < varSpace; i++)
WriteSaveBuf(buf, ScriptSpace[i]);
#ifdef CHECK_STRUCT_SIZES
- re3_static_assert(SCRIPT_DATA_SIZE == 968, "CTheScripts::SaveAllScripts");
+ static_assert(SCRIPT_DATA_SIZE == 968, "CTheScripts::SaveAllScripts");
#endif
uint32 script_data_size = SCRIPT_DATA_SIZE;
WriteSaveBuf(buf, script_data_size);
@@ -2083,14 +2083,14 @@ void CRunningScript::Save(uint8*& buf)
WriteSaveBuf<char>(buf, m_abScriptName[i]);
WriteSaveBuf<uint32>(buf, m_nIp);
#ifdef CHECK_STRUCT_SIZES
- re3_static_assert(MAX_STACK_DEPTH == 6, "Compatibility loss: MAX_STACK_DEPTH != 6");
+ static_assert(MAX_STACK_DEPTH == 6, "Compatibility loss: MAX_STACK_DEPTH != 6");
#endif
for (int i = 0; i < MAX_STACK_DEPTH; i++)
WriteSaveBuf<uint32>(buf, m_anStack[i]);
WriteSaveBuf<uint16>(buf, m_nStackPointer);
SkipSaveBuf(buf, 2);
#ifdef CHECK_STRUCT_SIZES
- re3_static_assert(NUM_LOCAL_VARS + NUM_TIMERS == 18, "Compatibility loss: NUM_LOCAL_VARS + NUM_TIMERS != 18");
+ static_assert(NUM_LOCAL_VARS + NUM_TIMERS == 18, "Compatibility loss: NUM_LOCAL_VARS + NUM_TIMERS != 18");
#endif
for (int i = 0; i < NUM_LOCAL_VARS + NUM_TIMERS; i++)
WriteSaveBuf<int32>(buf, m_anLocalVariables[i]);
@@ -2118,14 +2118,14 @@ void CRunningScript::Load(uint8*& buf)
m_abScriptName[i] = ReadSaveBuf<char>(buf);
m_nIp = ReadSaveBuf<uint32>(buf);
#ifdef CHECK_STRUCT_SIZES
- re3_static_assert(MAX_STACK_DEPTH == 6, "Compatibility loss: MAX_STACK_DEPTH != 6");
+ static_assert(MAX_STACK_DEPTH == 6, "Compatibility loss: MAX_STACK_DEPTH != 6");
#endif
for (int i = 0; i < MAX_STACK_DEPTH; i++)
m_anStack[i] = ReadSaveBuf<uint32>(buf);
m_nStackPointer = ReadSaveBuf<uint16>(buf);
SkipSaveBuf(buf, 2);
#ifdef CHECK_STRUCT_SIZES
- re3_static_assert(NUM_LOCAL_VARS + NUM_TIMERS == 18, "Compatibility loss: NUM_LOCAL_VARS + NUM_TIMERS != 18");
+ static_assert(NUM_LOCAL_VARS + NUM_TIMERS == 18, "Compatibility loss: NUM_LOCAL_VARS + NUM_TIMERS != 18");
#endif
for (int i = 0; i < NUM_LOCAL_VARS + NUM_TIMERS; i++)
m_anLocalVariables[i] = ReadSaveBuf<int32>(buf);