Merge branch 'main' into 26-02-27-allocator-isolation

This commit is contained in:
PJB3005
2026-03-05 00:15:09 +01:00
5530 changed files with 252979 additions and 26830 deletions
+4 -3
View File
@@ -11,6 +11,7 @@
#include "d/actor/d_a_obj_fw.h"
#include "Z2AudioLib/Z2Instances.h"
#include "f_op/f_op_actor_enemy.h"
#include <cstring>
class daE_BI_HIO_c : public JORReflexible {
public:
@@ -373,13 +374,13 @@ static void e_bi_ex(e_bi_class* i_this) {
if (i_this->ignition_time != 0) {
i_this->ignition_time--;
i_this->sound.startCreatureSoundLevel(Z2SE_OBJ_BOMB_IGNITION, 0, -1);
i_this->field_0x696 += (s16) 0x1100;
ANGLE_ADD(i_this->field_0x696, 0x1100);
if (i_this->ignition_time < 45) {
i_this->field_0x696 += (s16) 0x1100;
ANGLE_ADD(i_this->field_0x696, 0x1100);
if (i_this->ignition_time < 30) {
i_this->field_0x696 += (s16) 0x1100;
ANGLE_ADD(i_this->field_0x696, 0x1100);
}
}