mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-05-30 08:26:24 -04:00
Merge branch 'main' into 26-02-27-allocator-isolation
This commit is contained in:
+2
-1
@@ -13,6 +13,7 @@
|
||||
#include "SSystem/SComponent/c_math.h"
|
||||
#include "d/actor/d_a_player.h"
|
||||
#include "d/d_com_inf_game.h"
|
||||
#include <cstring>
|
||||
|
||||
#if DEBUG
|
||||
void dMap_HIO_c::genMessage(JORMContext* mctx) {
|
||||
@@ -730,7 +731,7 @@ const GXColor* renderingAmap_c::getDecoLineColor(int param_0, int param_1) {
|
||||
}
|
||||
}
|
||||
|
||||
const Vec* dMap_c::getIconPosition(dTres_c::typeGroupData_c* i_data) const {
|
||||
const BE(Vec)* dMap_c::getIconPosition(dTres_c::typeGroupData_c* i_data) const {
|
||||
#if DEBUG
|
||||
if (dMap_HIO_prm_res_dst_s::m_other.field_0x8a && i_data) {
|
||||
u8 r29 = i_data->getTypeGroupNo();
|
||||
|
||||
Reference in New Issue
Block a user