mirror of
https://github.com/TwilitRealm/dusklight
synced 2026-08-16 12:24:45 -04:00
Add a *ton* of const and constexpr around the codebase. (#1864)
* Add a *ton* of const and constexpr around the codebase. This makes the codebase compile without strings being cast to non-const char*. I also went through and added constexpr where appropriate for tons of static data. * Make process definitions const too Might as well
This commit is contained in:
committed by
GitHub
parent
db39a9c7f3
commit
5d68762590
@@ -63,26 +63,26 @@ static const char* l_arcName = "Obj_bm";
|
||||
|
||||
static const char* l_eye_matName = "bmEye";
|
||||
|
||||
static char* l_head_joint = "head";
|
||||
static DUSK_CONSTEXPR char DUSK_CONST* l_head_joint = "head";
|
||||
|
||||
static char* l_bigGear_joint = "cogRed";
|
||||
static DUSK_CONSTEXPR char DUSK_CONST* l_bigGear_joint = "cogRed";
|
||||
|
||||
static char* l_smallGear0_joint = "cogBlue";
|
||||
static DUSK_CONSTEXPR char DUSK_CONST* l_smallGear0_joint = "cogBlue";
|
||||
|
||||
static char* l_smallGear1_joint = "cogGreen";
|
||||
static DUSK_CONSTEXPR char DUSK_CONST* l_smallGear1_joint = "cogGreen";
|
||||
|
||||
static char* l_smallGear2_joint = "cogYellow";
|
||||
static DUSK_CONSTEXPR char DUSK_CONST* l_smallGear2_joint = "cogYellow";
|
||||
|
||||
static char* l_joint_table[5] = {
|
||||
static DUSK_CONSTEXPR char DUSK_CONST* l_joint_table[5] = {
|
||||
l_head_joint, l_bigGear_joint, l_smallGear0_joint, l_smallGear1_joint, l_smallGear2_joint,
|
||||
};
|
||||
|
||||
static cull_box l_cull_box = {
|
||||
static DUSK_CONSTEXPR cull_box l_cull_box = {
|
||||
{-1200.0f, -100.0f, -1200.0f},
|
||||
{1200.0f, 400.0f, 1200.0f},
|
||||
};
|
||||
|
||||
static dCcD_SrcSph l_sph_src = {
|
||||
static DUSK_CONSTEXPR dCcD_SrcSph l_sph_src = {
|
||||
{
|
||||
{0x0, {{0x0, 0x0, 0x0}, {0x402020, 0x11}, 0x58}}, // mObj
|
||||
{dCcD_SE_NONE, 0x0, 0x0, 0x0, 0x0}, // mGObjAt
|
||||
@@ -94,7 +94,7 @@ static dCcD_SrcSph l_sph_src = {
|
||||
} // mSphAttr
|
||||
};
|
||||
|
||||
static dCcD_SrcCps l_cps_src = {
|
||||
static DUSK_CONSTEXPR dCcD_SrcCps l_cps_src = {
|
||||
{
|
||||
{0x0, {{0x100, 0x1, 0x1d}, {0x0, 0x0}, 0x0}}, // mObj
|
||||
{dCcD_SE_SWORD, 0x0, 0x0, 0x1, 0x0}, // mGObjAt
|
||||
@@ -106,7 +106,7 @@ static dCcD_SrcCps l_cps_src = {
|
||||
} // mCpsAttr
|
||||
};
|
||||
|
||||
static dCcD_SrcCyl l_cyl_src = {
|
||||
static DUSK_CONSTEXPR dCcD_SrcCyl l_cyl_src = {
|
||||
{
|
||||
{0x0, {{0x0, 0x0, 0x1f}, {0x0, 0x0}, 0x79}}, // mObj
|
||||
{dCcD_SE_NONE, 0x1, 0x0, 0x0, 0x0}, // mGObjAt
|
||||
@@ -1943,13 +1943,13 @@ static int daObjBm_MoveBGDraw(daObjBm_c* i_this) {
|
||||
return i_this->MoveBGDraw();
|
||||
}
|
||||
|
||||
static actor_method_class daObjBm_METHODS = {
|
||||
static DUSK_CONST actor_method_class daObjBm_METHODS = {
|
||||
(process_method_func)daObjBm_create1st, (process_method_func)daObjBm_MoveBGDelete,
|
||||
(process_method_func)daObjBm_MoveBGExecute, 0,
|
||||
(process_method_func)daObjBm_MoveBGDraw,
|
||||
};
|
||||
|
||||
actor_process_profile_definition g_profile_Obj_Bemos = {
|
||||
DUSK_PROFILE actor_process_profile_definition DUSK_CONST g_profile_Obj_Bemos = {
|
||||
/* Layer ID */ fpcLy_CURRENT_e,
|
||||
/* List ID */ 3,
|
||||
/* List Prio */ fpcPi_CURRENT_e,
|
||||
|
||||
Reference in New Issue
Block a user