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
+3 -2
View File
@@ -14,6 +14,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "f_op/f_op_kankyo_mng.h"
#include <cstring>
class daFr_HIO_c : public JORReflexible {
public:
@@ -148,7 +149,7 @@ static void fr_normal(fr_class* i_this) {
cXyz sp0c;
switch (i_this->field_0x5d4) {
case 0:
i_this->field_0x5d4 += (s16)1;
S16_ADD(i_this->field_0x5d4, 1);
anm_init(i_this, 11, 5.0f, 2, cM_rndF(0.3f) + 0.8f);
i_this->field_0x5dc[0] = cM_rndF(50.0f) + 20.0f;
i_this->speedF = 0.0f;
@@ -200,7 +201,7 @@ static void fr_away(fr_class* i_this) {
cXyz sp08;
switch (i_this->field_0x5d4) {
case 0:
i_this->field_0x5d4 += (s16)1;
S16_ADD(i_this->field_0x5d4, 1);
i_this->speedF = 0.0f;
anm_init(i_this, 7, 3.0f, 0, 4.0f);
break;