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
+2 -1
View File
@@ -12,6 +12,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_menu_insect.h"
#include "f_pc/f_pc_name.h"
#include <cstring>
class daObj_BattaHIO_c : public JORReflexible {
public:
@@ -508,7 +509,7 @@ int daObjBATTA_c::execute() {
action();
mBrk->play();
mBtk->play();
mpMorf->play(NULL, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
mpMorf->play(0, dComIfGp_getReverb(fopAcM_GetRoomNo(this)));
mtx_set();
if (field_0x9f0 == 0) {
mSph.SetC(current.pos);