AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CFrontEndUI: Enclose file-local data within an anonymous namespace 

Gets rid of the need to write static, and also makes it impossible to
violate the ODR for any declared types within the namespace (e.g.
FEMovie).
This commit is contained in:
Lioncash 2019-09-14 15:45:14 -04:00
parent 2a10e547d2
commit b6ea391755
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Runtime/MP1/CFrontEndUI.cpp
View File

@ -28,28 +28,32 @@
#include "Runtime/MP1/MP1.hpp" #include "Runtime/MP1/MP1.hpp"
namespace urde::MP1 { namespace urde::MP1 {
namespace {
#define FE_USE_SECONDS_IN_ELAPSED 1 #define FE_USE_SECONDS_IN_ELAPSED 1
/* Music volume constants */ /* Music volume constants */
static const float FE1_VOL = 0.7421875f; constexpr float FE1_VOL = 0.7421875f;
static const float FE2_VOL = 0.7421875f; constexpr float FE2_VOL = 0.7421875f;
/* L/R Stereo transition cues */ /* L/R Stereo transition cues */
static const u16 FETransitionBackSFX[3][2] = {{SFXfnt_transfore_00L, SFXfnt_transfore_00R}, constexpr u16 FETransitionBackSFX[3][2] = {
{SFXfnt_transfore_00L, SFXfnt_transfore_00R},
{SFXfnt_transfore_01L, SFXfnt_transfore_01R}, {SFXfnt_transfore_01L, SFXfnt_transfore_01R},
{SFXfnt_transfore_02L, SFXfnt_transfore_02R}}; {SFXfnt_transfore_02L, SFXfnt_transfore_02R},
};
static const u16 FETransitionForwardSFX[3][2] = {{SFXfnt_transback_00L, SFXfnt_transback_00R}, constexpr u16 FETransitionForwardSFX[3][2] = {
{SFXfnt_transback_00L, SFXfnt_transback_00R},
{SFXfnt_transback_01L, SFXfnt_transback_01R}, {SFXfnt_transback_01L, SFXfnt_transback_01R},
{SFXfnt_transback_02L, SFXfnt_transback_02R}}; {SFXfnt_transback_02L, SFXfnt_transback_02R},
};
struct FEMovie { struct FEMovie {
const char* path; const char* path;
bool loop; bool loop;
}; };
static const FEMovie FEMovies[] = { constexpr FEMovie FEMovies[] = {
{"Video/00_first_start.thp", false}, {"Video/00_first_start.thp", false},
{"Video/01_startloop.thp", true}, {"Video/01_startloop.thp", true},
{"Video/02_start_fileselect_A.thp", false}, {"Video/02_start_fileselect_A.thp", false},
@ -61,7 +65,8 @@ static const FEMovie FEMovies[] = {
{"Video/08_GBA_fileselect.thp", false}, {"Video/08_GBA_fileselect.thp", false},
}; };
SObjectTag g_DefaultWorldTag = {FOURCC('MLVL'), 0x158efe17}; constexpr SObjectTag g_DefaultWorldTag = {FOURCC('MLVL'), 0x158efe17};
} // Anonymous namespace
void CFrontEndUI::PlayAdvanceSfx() { void CFrontEndUI::PlayAdvanceSfx() {
CSfxManager::SfxStart(SFXfnt_advance_L, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId); CSfxManager::SfxStart(SFXfnt_advance_L, 1.f, 0.f, false, 0x7f, false, kInvalidAreaId);