Merge origin/wip/linkfix2 into msvc-linkfix-dev (local dev branch)

src/d/actor/d_a_b_ds.cpp

@@ -5703,7 +5703,9 @@ actor_process_profile_definition g_profile_B_DS = {
     fopAc_CULLBOX_CUSTOM_e,
 };
 
+#ifndef __MWERKS__
 cXyz daB_DS_c::getHandPosR() { return mHandPos[1]; }
 cXyz daB_DS_c::getHandPosL() { return mHandPos[0]; }
+#endif
 
 AUDIO_INSTANCES;

src/d/actor/d_a_npc_ash.cpp

@@ -57,7 +57,7 @@ void daNpcAsh_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-NPC_ASH_HIO_CLASS l_HIO;
+static NPC_ASH_HIO_CLASS l_HIO;
 
 void daNpcAsh_c::setLookMode(int i_lookMode, fopAc_ac_c* i_talkPartner) {
     if (i_lookMode != mLookMode || i_talkPartner != mTalkPartner) {

src/d/actor/d_a_npc_ashB.cpp

@@ -46,7 +46,7 @@ const daNpcAshB_HIOParam daNpcAshB_Param_c::m = {
     400.0f,   // field_0x6c
 };
 
-NPC_ASHB_HIO_CLASS l_HIO;
+static NPC_ASHB_HIO_CLASS l_HIO;
 
 static daNpc_GetParam2 l_bckGetParamList[21] = {
     {-1, 2, 0}, {13, 0, 0}, {14, 0, 0}, {11, 0, 0}, {10, 0, 0}, {9, 0, 0},  {12, 0, 0},

src/d/actor/d_a_npc_clerka.cpp

@@ -780,7 +780,7 @@ static int daNpc_clerkA_IsDelete(void* i_this) {
     return 1;
 }
 
-NPC_CLERKA_HIO_CLASS l_HIO;
+static NPC_CLERKA_HIO_CLASS l_HIO;
 
 static actor_method_class daNpc_clerkA_MethodTable = {
     (process_method_func)daNpc_clerkA_Create,  (process_method_func)daNpc_clerkA_Delete,

src/d/actor/d_a_npc_clerkb.cpp

@@ -932,7 +932,7 @@ static int daNpc_clerkB_IsDelete(void* i_this) {
     return 1;
 }
 
-NPC_CLERKB_HIO_CLASS l_HIO;
+static NPC_CLERKB_HIO_CLASS l_HIO;
 
 static actor_method_class daNpc_clerkB_MethodTable = {
     (process_method_func)daNpc_clerkB_Create,  (process_method_func)daNpc_clerkB_Delete,

src/d/actor/d_a_npc_clerkt.cpp

@@ -693,7 +693,7 @@ void daNpcClerkT_c::setCollision() {
     mCyl.ClrTgHit();
 }
 
-NPC_CLERKT_HIO_CLASS l_HIO;
+static NPC_CLERKT_HIO_CLASS l_HIO;
 
 static actor_method_class daNpcClerkt_MethodTable = {
     (process_method_func)daNpcClerkt_Create,  (process_method_func)daNpcClerkt_Delete,

src/d/actor/d_a_npc_gnd.cpp

@@ -96,7 +96,7 @@ const daNpc_Gnd_HIOParam daNpc_Gnd_Param_c::m = {
     0.0f,
 };
 
-NPC_GND_HIO_CLASS l_HIO;
+static NPC_GND_HIO_CLASS l_HIO;
 
 daNpc_Gnd_c::~daNpc_Gnd_c() {
     OS_REPORT("|%06d:%x|daNpc_Gnd_c -> デストラクト\n", g_Counter.mCounter0, this);

src/d/actor/d_a_npc_gra.cpp

@@ -129,7 +129,7 @@ daNpc_grA_HIO_c::daNpc_grA_HIO_c() {
 }
 #endif
 
-NPC_GRA_HIO_CLASS l_HIO;
+static NPC_GRA_HIO_CLASS l_HIO;
 
 static char* l_evtNames[11] = {
     NULL,

src/d/actor/d_a_npc_impal.cpp

@@ -45,7 +45,7 @@ daNpcImpal_HIOParam const daNpcImpal_Param_c::m = {
     300.0f,        // demo_start_dist
 };
 
-NPC_IMPAL_HIO_CLASS l_HIO;
+static NPC_IMPAL_HIO_CLASS l_HIO;
 
 static daNpc_GetParam2 l_bckGetParamList[18] = {
     {-1, 2, 0}, {14, 0, 0}, {8, 0, 0},  {7, 2, 0},  {11, 0, 0}, {13, 0, 0},

src/d/actor/d_a_npc_knj.cpp

@@ -130,7 +130,7 @@ daNpc_Knj_c::cutFunc daNpc_Knj_c::mCutList[1] = {
     NULL,
 };
 
-NPC_KNJ_HIO_CLASS l_HIO;
+static NPC_KNJ_HIO_CLASS l_HIO;
 
 daNpc_Knj_c::~daNpc_Knj_c() {
     if (heap != NULL) {

src/d/actor/d_a_npc_kyury.cpp

@@ -136,7 +136,7 @@ daNpc_Kyury_c::cutFunc daNpc_Kyury_c::mCutList[2] = {
     &daNpc_Kyury_c::cutConversation,
 };
 
-NPC_KYURY_HIO_CLASS l_HIO;
+static NPC_KYURY_HIO_CLASS l_HIO;
 
 #if DEBUG
 daNpc_Kyury_HIO_c::daNpc_Kyury_HIO_c() {

src/d/actor/d_a_npc_len.cpp

@@ -652,7 +652,7 @@ void daNpc_Len_c::beforeMove() {
     }
 }
 
-NPC_LEN_HIO_CLASS l_HIO;
+static NPC_LEN_HIO_CLASS l_HIO;
 
 void daNpc_Len_c::setAttnPos() {
     cXyz acStack_40(-30.0f, 15.0f, 0.0f);

src/d/actor/d_a_npc_lud.cpp

@@ -693,7 +693,7 @@ void daNpc_Lud_c::beforeMove() {
     }
 }
 
-NPC_LUD_HIO_CLASS l_HIO;
+static NPC_LUD_HIO_CLASS l_HIO;
 
 void daNpc_Lud_c::setAttnPos() {
     cXyz cStack_70(5.0f, 30.0f, 0.0f);

src/d/actor/d_a_npc_moi.cpp

@@ -244,7 +244,7 @@ enum Motion {
     /* 0x2F */ MOT_UNK_47 = 47,
 };
 
-NPC_MOI_HIO_CLASS l_HIO;
+static NPC_MOI_HIO_CLASS l_HIO;
 
 daNpc_Moi_c::~daNpc_Moi_c() {
     if (mpMorf[0] != 0) {

src/d/actor/d_a_npc_pouya.cpp

@@ -1189,7 +1189,7 @@ static bool daNpc_Pouya_IsDelete(void* i_this) {
     return 1;
 }
 
-NPC_POUYA_HIO_CLASS l_HIO;
+static NPC_POUYA_HIO_CLASS l_HIO;
 
 static actor_method_class daNpc_Pouya_MethodTable = {
     (process_method_func)daNpc_Pouya_Create,  (process_method_func)daNpc_Pouya_Delete,

src/d/actor/d_a_npc_shad.cpp

@@ -307,7 +307,7 @@ static char* l_evtArcs[14] = {
 
 static char* l_myName = "Shad";
 
-NPC_SHAD_HIO_CLASS l_HIO;
+static NPC_SHAD_HIO_CLASS l_HIO;
 
 daNpcShad_c::EventFn daNpcShad_c::mEvtSeqList[14] = {
     NULL,

src/d/actor/d_a_npc_shoe.cpp

@@ -54,7 +54,7 @@ void daNpcShoe_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-NPC_SHOE_HIO_CLASS l_HIO;
+static NPC_SHOE_HIO_CLASS l_HIO;
 
 void daNpcShoe_c::setLookMode(int i_lookMode) {
     if (mLookMode != i_lookMode) {

src/d/actor/d_a_npc_the.cpp

@@ -61,7 +61,7 @@ void daNpcThe_HIO_c::genMessage(JORMContext* ctext) {
 }
 #endif
 
-NPC_THE_HIO_CLASS l_HIO;
+static NPC_THE_HIO_CLASS l_HIO;
 
 static daNpc_GetParam1 l_bmdGetParamList[2] = {
     {23, 0},  // the

src/d/actor/d_a_npc_toby.cpp

@@ -265,7 +265,7 @@ daNpc_Toby_c::cutFunc daNpc_Toby_c::mCutList[7] = {
     &daNpc_Toby_c::cutConversationAboutZra,
 };
 
-NPC_TOBY_HIO_CLASS l_HIO;
+static NPC_TOBY_HIO_CLASS l_HIO;
 
 daNpc_Toby_c::~daNpc_Toby_c() {
     OS_REPORT("|%06d:%x|daNpc_Toby_c -> デストラクト\n", g_Counter.mCounter0, this);

src/d/actor/d_a_npc_uri.cpp

@@ -209,7 +209,7 @@ daNpc_Uri_c::cutFunc daNpc_Uri_c::mCutList[7] = {
     &daNpc_Uri_c::cutMeetingAgain,
 };
 
-NPC_URI_HIO_CLASS l_HIO;
+static NPC_URI_HIO_CLASS l_HIO;
 
 daNpc_Uri_c::~daNpc_Uri_c() {
     if (mpMorf[0] != 0) {

src/d/actor/d_a_obj_burnbox.cpp

@@ -81,7 +81,7 @@ int daObjBurnBox_c::Create() {
     return 1;
 }
 
-const char* l_arcName[3] = {
+static const char* l_arcName[3] = {
     "Kkiba_00", // crate
     "Kkiba_00",
     "J_taru00", // barrel

src/d/actor/d_a_obj_katatsumuri.cpp

@@ -157,11 +157,11 @@ static f32 dummy1() {
     return 0.4f;
 }
 
-f32 dummy2() {
+static f32 dummy2() {
     return 10.0f;
 }
 
-f32 dummy3() {
+static f32 dummy3() {
     return 0.02f;
 }
 

src/d/actor/d_a_obj_maki.cpp

@@ -176,7 +176,7 @@ static int useHeapInit(fopAc_ac_c* i_this) {
     return 1;
 }
 
-daObj_Maki_HIO_c l_HIO;
+static daObj_Maki_HIO_c l_HIO;
 
 cPhs_Step daObj_Maki_Create(fopAc_ac_c* i_this) {
     fopAcM_ct(i_this, obj_maki_class);

src/d/actor/d_a_obj_ss_base.cpp

@@ -15,7 +15,3 @@ daObj_SSBase_c::~daObj_SSBase_c() {}
 u32 daObj_SSBase_c::getProcessID() {
     return fopAcM_GetID(this);
 }
-
-void daObj_SSBase_c::setSoldOut() {
-    /* empty function */
-}

src/d/actor/d_a_obj_thashi.cpp

@@ -9,7 +9,7 @@
 #include "d/d_cc_d.h"
 #include "d/d_s_play.h"
 
-char* l_arcName = "S_thashi";
+static const char* l_arcName = "S_thashi";
 
 static void dataStripping() {
     const static u32 ccCylSrc[] = {0, 0x100000, 0,   0x13, 0x100000, 0x1f, 0x75, 0,

src/d/actor/d_a_obj_waterPillar.cpp

@@ -110,7 +110,7 @@ const dCcD_SrcGObjInf daWtPillar_c::mCcDObjCoInfo = {
     {},  // mGObjCo
 };
 
-daWtPillar_HIO_c l_HIO;
+static daWtPillar_HIO_c l_HIO;
 
 dCcD_SrcCps daWtPillar_c::mCcDCps = {
     daWtPillar_c::mCcDObjInfo,

src/d/actor/d_a_tag_CstaSw.cpp

@@ -10,7 +10,7 @@
 #include "d/d_debug_viewer.h"
 #include "d/d_procname.h"
 
-daTagCstaSw_HIO_c l_HIO;
+ static daTagCstaSw_HIO_c l_HIO;
 
 daTagCstaSw_HIO_c::daTagCstaSw_HIO_c() {
     show_range = 0;