Fix d_a_ks weak func order with pragmas

This commit is contained in:
LagoLunatic
2025-05-14 16:12:56 -04:00
parent db2f66125d
commit 32d9614d63
2 changed files with 7 additions and 1 deletions
+1 -1
View File
@@ -1468,7 +1468,7 @@ config.libs = [
ActorRel(NonMatching, "d_a_kantera"),
ActorRel(NonMatching, "d_a_kn"),
ActorRel(NonMatching, "d_a_kokiie"),
ActorRel(Equivalent, "d_a_ks", extra_cflags=["-sym off"]), # weak func order
ActorRel(Matching, "d_a_ks", extra_cflags=["-sym off"]),
ActorRel(NonMatching, "d_a_kt"), # regalloc, weak func order
ActorRel(NonMatching, "d_a_mflft"),
ActorRel(NonMatching, "d_a_npc_cb1"),
+6
View File
@@ -3,12 +3,18 @@
// Translation Unit: d_a_ks.cpp
//
// Fakematch? Having sym off before d_a_ks.h but then turning it on before
// d_a_player_main.h fixes the weak function ordering of
// `daPy_py_c::getSwordTopPos() const` and `daPy_py_c::getHeadTopPos() const`
// in this TU.
#pragma sym off
#include "d/actor/d_a_ks.h"
#include "d/d_procname.h"
#include "d/d_com_inf_game.h"
#include "d/d_s_play.h"
#include "f_op/f_op_camera.h"
#include "d/d_snap.h"
#pragma sym on
#include "d/actor/d_a_player_main.h"
#include "d/actor/d_a_gm.h"
#include "d/res/res_ks.h"