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

Merge pull request #173 from lioncash/c_str 

Runtime: Remove unnecessary c_str() calls
This commit is contained in:
Luke S 2020-02-28 11:16:57 -05:00 committed by GitHub
parent e0b84df5de f1256faeb7
commit 58a2f6aeb2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Audio/CStreamAudioManager.cpp
View File

@ -654,7 +654,7 @@ public:
if (stream.x70_26_headerReadState != 0 || stream.x70_24_unclaimed) if (stream.x70_26_headerReadState != 0 || stream.x70_24_unclaimed)
return false; return false;
CDvdFile file(stream.x60_fileName.c_str()); CDvdFile file(stream.x60_fileName);
if (!file) if (!file)
return false; return false;
@ -668,11 +668,11 @@ public:
rstream.x70_24_unclaimed) rstream.x70_24_unclaimed)
return false; return false;
CDvdFile lfile(lstream.x60_fileName.c_str()); CDvdFile lfile(lstream.x60_fileName);
if (!lfile) if (!lfile)
return false; return false;
CDvdFile rfile(rstream.x60_fileName.c_str()); CDvdFile rfile(rstream.x60_fileName);
if (!rfile) if (!rfile)
return false; return false;

2
Runtime/GuiSys/CHudBallInterface.cpp
View File

@ -18,7 +18,7 @@ CHudBallInterface::CHudBallInterface(CGuiFrame& selHud, int pbAmount, int pbCapa
xc_model_bombicon = static_cast<CGuiModel*>(selHud.FindWidget("model_bombicon")); xc_model_bombicon = static_cast<CGuiModel*>(selHud.FindWidget("model_bombicon"));
x10_textpane_bombdigits = static_cast<CGuiTextPane*>(selHud.FindWidget("textpane_bombdigits")); x10_textpane_bombdigits = static_cast<CGuiTextPane*>(selHud.FindWidget("textpane_bombdigits"));
for (int i = 0; i < 3; ++i) { for (int i = 0; i < 3; ++i) {
CGuiGroup* grp = static_cast<CGuiGroup*>(selHud.FindWidget(fmt::format(fmt("group_bombcount{}"), i).c_str())); CGuiGroup* grp = static_cast<CGuiGroup*>(selHud.FindWidget(fmt::format(fmt("group_bombcount{}"), i)));
CGuiWidget* filled = grp->GetWorkerWidget(1); CGuiWidget* filled = grp->GetWorkerWidget(1);
CGuiWidget* empty = grp->GetWorkerWidget(0); CGuiWidget* empty = grp->GetWorkerWidget(0);
x14_group_bombfilled.push_back(filled); x14_group_bombfilled.push_back(filled);

29
Runtime/MP1/CFrontEndUI.cpp
View File

@ -647,11 +647,11 @@ void CFrontEndUI::SNewFileSelectFrame::DoFileMenuAdvance(CGuiTableGroup* caller)
CFrontEndUI::SFileMenuOption CFrontEndUI::SNewFileSelectFrame::FindFileSelectOption(CGuiFrame* frame, int idx) { CFrontEndUI::SFileMenuOption CFrontEndUI::SNewFileSelectFrame::FindFileSelectOption(CGuiFrame* frame, int idx) {
SFileMenuOption ret; SFileMenuOption ret;
ret.x0_base = frame->FindWidget(fmt::format(fmt("basewidget_file{}"), idx).c_str()); ret.x0_base = frame->FindWidget(fmt::format(fmt("basewidget_file{}"), idx));
ret.x4_textpanes[0] = FindTextPanePair(frame, fmt::format(fmt("textpane_filename{}"), idx).c_str()); ret.x4_textpanes[0] = FindTextPanePair(frame, fmt::format(fmt("textpane_filename{}"), idx));
ret.x4_textpanes[1] = FindTextPanePair(frame, fmt::format(fmt("textpane_world{}"), idx).c_str()); ret.x4_textpanes[1] = FindTextPanePair(frame, fmt::format(fmt("textpane_world{}"), idx));
ret.x4_textpanes[2] = FindTextPanePair(frame, fmt::format(fmt("textpane_playtime{}"), idx).c_str()); ret.x4_textpanes[2] = FindTextPanePair(frame, fmt::format(fmt("textpane_playtime{}"), idx));
ret.x4_textpanes[3] = FindTextPanePair(frame, fmt::format(fmt("textpane_date{}"), idx).c_str()); ret.x4_textpanes[3] = FindTextPanePair(frame, fmt::format(fmt("textpane_date{}"), idx));
return ret; return ret;
} }
@ -1108,17 +1108,17 @@ void CFrontEndUI::SGuiTextPair::SetPairText(std::u16string_view str) {
x0_panes[1]->TextSupport().SetText(str); x0_panes[1]->TextSupport().SetText(str);
} }
CFrontEndUI::SGuiTextPair CFrontEndUI::FindTextPanePair(CGuiFrame* frame, const char* name) { CFrontEndUI::SGuiTextPair CFrontEndUI::FindTextPanePair(CGuiFrame* frame, std::string_view name) {
SGuiTextPair ret; SGuiTextPair ret;
ret.x0_panes[0] = static_cast<CGuiTextPane*>(frame->FindWidget(name)); ret.x0_panes[0] = static_cast<CGuiTextPane*>(frame->FindWidget(name));
ret.x0_panes[1] = static_cast<CGuiTextPane*>(frame->FindWidget(fmt::format(fmt("{}b"), name).c_str())); ret.x0_panes[1] = static_cast<CGuiTextPane*>(frame->FindWidget(fmt::format(fmt("{}b"), name)));
return ret; return ret;
} }
void CFrontEndUI::FindAndSetPairText(CGuiFrame* frame, const char* name, std::u16string_view str) { void CFrontEndUI::FindAndSetPairText(CGuiFrame* frame, std::string_view name, std::u16string_view str) {
CGuiTextPane* w1 = static_cast<CGuiTextPane*>(frame->FindWidget(name)); CGuiTextPane* w1 = static_cast<CGuiTextPane*>(frame->FindWidget(name));
w1->TextSupport().SetText(str); w1->TextSupport().SetText(str);
CGuiTextPane* w2 = static_cast<CGuiTextPane*>(frame->FindWidget(fmt::format(fmt("{}b"), name).c_str())); CGuiTextPane* w2 = static_cast<CGuiTextPane*>(frame->FindWidget(fmt::format(fmt("{}b"), name)));
w2->TextSupport().SetText(str); w2->TextSupport().SetText(str);
} }
@ -1535,11 +1535,10 @@ void CFrontEndUI::SOptionsFrontEndFrame::SetRightUIText() {
for (int i = 0; i < 5; ++i) { for (int i = 0; i < 5; ++i) {
std::string name = fmt::format(fmt("textpane_right{}"), i); std::string name = fmt::format(fmt("textpane_right{}"), i);
if (i < static_cast<int>(options.first)) { if (i < static_cast<int>(options.first)) {
FindTextPanePair(x1c_loadedFrame, name.c_str()).SetPairText( FindTextPanePair(x1c_loadedFrame, name).SetPairText(x20_loadedPauseStrg->GetString(options.second[i].stringId));
x20_loadedPauseStrg->GetString(options.second[i].stringId));
x28_tablegroup_rightmenu->GetWorkerWidget(i)->SetIsSelectable(true); x28_tablegroup_rightmenu->GetWorkerWidget(i)->SetIsSelectable(true);
} else { } else {
FindTextPanePair(x1c_loadedFrame, name.c_str()).SetPairText(u""); FindTextPanePair(x1c_loadedFrame, name).SetPairText(u"");
x28_tablegroup_rightmenu->GetWorkerWidget(i)->SetIsSelectable(false); x28_tablegroup_rightmenu->GetWorkerWidget(i)->SetIsSelectable(false);
} }
} }
@ -1596,8 +1595,8 @@ void CFrontEndUI::SOptionsFrontEndFrame::FinishedLoading() {
// Visor, Display, Sound, Controller // Visor, Display, Sound, Controller
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
std::string name = fmt::format(fmt("textpane_filename{}"), i); const std::string name = fmt::format(fmt("textpane_filename{}"), i);
FindTextPanePair(x1c_loadedFrame, name.c_str()).SetPairText(x20_loadedPauseStrg->GetString(16 + i)); FindTextPanePair(x1c_loadedFrame, name).SetPairText(x20_loadedPauseStrg->GetString(16 + i));
} }
x2c_tablegroup_double->SetVertical(false); x2c_tablegroup_double->SetVertical(false);
@ -1756,7 +1755,7 @@ CFrontEndUI::CFrontEndUI() : CIOWin("FrontEndUI") {
g_GameState->GameOptions().ResetToDefaults(); g_GameState->GameOptions().ResetToDefaults();
g_GameState->WriteBackupBuf(); g_GameState->WriteBackupBuf();
for (int i = 0; CDvdFile::FileExists(GetAttractMovieFileName(i).c_str()); ++i) for (int i = 0; CDvdFile::FileExists(GetAttractMovieFileName(i)); ++i)
++xc0_attractCount; ++xc0_attractCount;
m_touchBar = NewFrontEndUITouchBar(); m_touchBar = NewFrontEndUITouchBar();

4
Runtime/MP1/CFrontEndUI.hpp
View File

@ -65,8 +65,8 @@ public:
std::array<CGuiTextPane*, 2> x0_panes{}; std::array<CGuiTextPane*, 2> x0_panes{};
void SetPairText(std::u16string_view str); void SetPairText(std::u16string_view str);
}; };
static SGuiTextPair FindTextPanePair(CGuiFrame* frame, const char* name); static SGuiTextPair FindTextPanePair(CGuiFrame* frame, std::string_view name);
static void FindAndSetPairText(CGuiFrame* frame, const char* name, std::u16string_view str); static void FindAndSetPairText(CGuiFrame* frame, std::string_view name, std::u16string_view str);
struct SFileMenuOption { struct SFileMenuOption {
CGuiWidget* x0_base; CGuiWidget* x0_base;

8
Runtime/MP1/MP1.cpp
View File

@ -337,8 +337,9 @@ void CMain::AddWorldPaks() {
if (i != 0) if (i != 0)
path += '0' + i; path += '0' + i;
if (CDvdFile::FileExists((path + ".upak").c_str())) if (CDvdFile::FileExists(path + ".upak")) {
loader->AddPakFileAsync(path, false, true); loader->AddPakFileAsync(path, false, true);
}
} }
loader->WaitForPakFileLoadingComplete(); loader->WaitForPakFileLoadingComplete();
} }
@ -352,9 +353,10 @@ void CMain::AddOverridePaks() {
* the higher the number the higer the priority, e.g: Override0 has less priority than Override1 etc. * the higher the number the higer the priority, e.g: Override0 has less priority than Override1 etc.
*/ */
for (size_t i = 999; i > 0; --i) { for (size_t i = 999; i > 0; --i) {
std::string path = fmt::format(fmt("Override{}"), i); const std::string path = fmt::format(fmt("Override{}"), i);
if (CDvdFile::FileExists((path + ".upak").c_str())) if (CDvdFile::FileExists(path + ".upak")) {
loader->AddPakFileAsync(path, false, false, true); loader->AddPakFileAsync(path, false, false, true);
}
} }
/* Make sure all Override paks are ready before attempting to load URDE.upak */ /* Make sure all Override paks are ready before attempting to load URDE.upak */
loader->WaitForPakFileLoadingComplete(); loader->WaitForPakFileLoadingComplete();

2
Runtime/World/CMorphBall.cpp
View File

@ -291,7 +291,7 @@ CMorphBall::CMorphBall(CPlayer& player, float radius)
} }
void CMorphBall::LoadAnimationTokens(std::string_view ancsName) { void CMorphBall::LoadAnimationTokens(std::string_view ancsName) {
TToken<CDependencyGroup> dgrp = g_SimplePool->GetObj((std::string(ancsName) + "_DGRP").c_str()); TToken<CDependencyGroup> dgrp = g_SimplePool->GetObj(std::string(ancsName).append("_DGRP"));
x1958_animationTokens.clear(); x1958_animationTokens.clear();
x1958_animationTokens.reserve(dgrp->GetObjectTagVector().size()); x1958_animationTokens.reserve(dgrp->GetObjectTagVector().size());
for (const SObjectTag& tag : dgrp->GetObjectTagVector()) { for (const SObjectTag& tag : dgrp->GetObjectTagVector()) {