summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorerorcun <erayorcunus@gmail.com>2020-10-18 18:59:11 +0200
committerGitHub <noreply@github.com>2020-10-18 18:59:11 +0200
commit10758088efca8427433fb97e26bffe0426cb680b (patch)
tree2f189c0e5df5c3640701b1450e13ade7b6c7ef76 /src/control
parentMerge pull request #763 from theR4K/miami (diff)
parentMiami Glass (diff)
downloadre3-10758088efca8427433fb97e26bffe0426cb680b.tar
re3-10758088efca8427433fb97e26bffe0426cb680b.tar.gz
re3-10758088efca8427433fb97e26bffe0426cb680b.tar.bz2
re3-10758088efca8427433fb97e26bffe0426cb680b.tar.lz
re3-10758088efca8427433fb97e26bffe0426cb680b.tar.xz
re3-10758088efca8427433fb97e26bffe0426cb680b.tar.zst
re3-10758088efca8427433fb97e26bffe0426cb680b.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Script.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp
index ba53c9cf..0df6d5a2 100644
--- a/src/control/Script.cpp
+++ b/src/control/Script.cpp
@@ -31,6 +31,7 @@
#include "GameLogic.h"
#include "Garages.h"
#include "General.h"
+#include "Glass.h"
#ifdef MISSION_REPLAY
#include "GenericGameStorage.h"
#endif
@@ -13012,12 +13013,12 @@ int8 CRunningScript::ProcessCommands1300To1399(int32 command)
case COMMAND_HAS_GLASS_BEEN_SHATTERED_NEARBY:
{
CollectParameters(&m_nIp, 3);
- static bool bShowed = false;
- if (!bShowed) {
- debug("HAS_GLASS_BEEN_SHATTERED_NEARBY not implemented, default to TRUE\n"); // TODO(MIAMI)
- bShowed = true;
- }
- UpdateCompareFlag(true);
+
+ bool shattered = false;
+ if ( CGlass::HasGlassBeenShatteredAtCoors(*(float*)&ScriptParams[0], *(float*)&ScriptParams[1], *(float*)&ScriptParams[2]) )
+ shattered = true;
+
+ UpdateCompareFlag(shattered);
return 0;
}
case COMMAND_ATTACH_CUTSCENE_OBJECT_TO_BONE: