From 9ac4cca1ae5c2fc93092a16cd3ad270d669b949b Mon Sep 17 00:00:00 2001 From: SuperDude88 <82904174+SuperDude88@users.noreply.github.com> Date: Sat, 18 May 2024 22:57:05 -0400 Subject: [PATCH] Add Back Static --- include/d/actor/d_a_player_main_data.h | 5 ++--- src/d/actor/d_a_player_main_data.inc | 8 ++++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/d/actor/d_a_player_main_data.h b/include/d/actor/d_a_player_main_data.h index 28c5dca77..59d4482cb 100644 --- a/include/d/actor/d_a_player_main_data.h +++ b/include/d/actor/d_a_player_main_data.h @@ -38,10 +38,9 @@ extern const Vec l_crawl_lside_front_offset; extern const Vec l_crawl_rside_front_offset; extern const Vec l_crawl_min_side_offset; -// I believe these won't link properly with the static variables -//extern dCcD_SrcCyl l_cyl_src; +extern dCcD_SrcCyl l_cyl_src; extern dCcD_SrcCyl l_wind_cyl_src; extern dCcD_SrcCyl l_at_cyl_src; -//extern dCcD_SrcCps l_at_cps_src; +extern dCcD_SrcCps l_at_cps_src; extern dCcD_SrcCps l_fan_wind_cps_src; extern dCcD_SrcSph l_fan_wind_sph_src; diff --git a/src/d/actor/d_a_player_main_data.inc b/src/d/actor/d_a_player_main_data.inc index 2f33f3219..f20650121 100644 --- a/src/d/actor/d_a_player_main_data.inc +++ b/src/d/actor/d_a_player_main_data.inc @@ -73,7 +73,7 @@ static dCcD_SrcCyl l_cyl_src = { }, }; -dCcD_SrcCyl l_wind_cyl_src = { +static dCcD_SrcCyl l_wind_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, @@ -103,7 +103,7 @@ dCcD_SrcCyl l_wind_cyl_src = { }, }; -dCcD_SrcCyl l_at_cyl_src = { +static dCcD_SrcCyl l_at_cyl_src = { // dCcD_SrcGObjInf { /* Flags */ 0, @@ -163,7 +163,7 @@ static dCcD_SrcCps l_at_cps_src = { }, }; -dCcD_SrcCps l_fan_wind_cps_src = { +static dCcD_SrcCps l_fan_wind_cps_src = { // dCcD_SrcGObjInf { /* Flags */ 0, @@ -193,7 +193,7 @@ dCcD_SrcCps l_fan_wind_cps_src = { }, }; -dCcD_SrcSph l_fan_wind_sph_src = { +static dCcD_SrcSph l_fan_wind_sph_src = { // dCcD_SrcGObjInf { /* Flags */ 0,