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

CSlideShow: Use emplace_back where applicable 

Same behavior, but constructs in place instead of potentially copying.
This commit is contained in:
Lioncash 2019-09-30 18:07:31 -04:00
parent b7e0dbd354
commit 2eb5e7c446
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Runtime/MP1/CSlideShow.cpp
View File

@ -28,34 +28,34 @@ CSlideShow::CSlideShow() : CIOWin("SlideShow"), x5c_slideA(*this), x90_slideB(*t
SObjectTag txtrTag(FOURCC('TXTR'), 0); SObjectTag txtrTag(FOURCC('TXTR'), 0);
for (const ITweakPlayerRes::ResId lStickId : g_tweakPlayerRes->x24_lStick) { for (const ITweakPlayerRes::ResId lStickId : g_tweakPlayerRes->x24_lStick) {
txtrTag.id = lStickId; txtrTag.id = lStickId;
xf8_stickTextures.push_back(g_SimplePool->GetObj(txtrTag)); xf8_stickTextures.emplace_back(g_SimplePool->GetObj(txtrTag));
} }
for (const ITweakPlayerRes::ResId cStickId : g_tweakPlayerRes->x4c_cStick) { for (const ITweakPlayerRes::ResId cStickId : g_tweakPlayerRes->x4c_cStick) {
txtrTag.id = cStickId; txtrTag.id = cStickId;
xf8_stickTextures.push_back(g_SimplePool->GetObj(txtrTag)); xf8_stickTextures.emplace_back(g_SimplePool->GetObj(txtrTag));
} }
for (const ITweakPlayerRes::ResId lTriggerId : g_tweakPlayerRes->x74_lTrigger) { for (const ITweakPlayerRes::ResId lTriggerId : g_tweakPlayerRes->x74_lTrigger) {
txtrTag.id = lTriggerId; txtrTag.id = lTriggerId;
xf8_stickTextures.push_back(g_SimplePool->GetObj(txtrTag)); xf8_stickTextures.emplace_back(g_SimplePool->GetObj(txtrTag));
} }
for (const ITweakPlayerRes::ResId rTriggerId : g_tweakPlayerRes->x80_rTrigger) { for (const ITweakPlayerRes::ResId rTriggerId : g_tweakPlayerRes->x80_rTrigger) {
txtrTag.id = rTriggerId; txtrTag.id = rTriggerId;
xf8_stickTextures.push_back(g_SimplePool->GetObj(txtrTag)); xf8_stickTextures.emplace_back(g_SimplePool->GetObj(txtrTag));
} }
for (const ITweakPlayerRes::ResId bButtonId : g_tweakPlayerRes->xa4_bButton) { for (const ITweakPlayerRes::ResId bButtonId : g_tweakPlayerRes->xa4_bButton) {
txtrTag.id = bButtonId; txtrTag.id = bButtonId;
xf8_stickTextures.push_back(g_SimplePool->GetObj(txtrTag)); xf8_stickTextures.emplace_back(g_SimplePool->GetObj(txtrTag));
} }
for (const ITweakPlayerRes::ResId yButtonId : g_tweakPlayerRes->xbc_yButton) { for (const ITweakPlayerRes::ResId yButtonId : g_tweakPlayerRes->xbc_yButton) {
txtrTag.id = yButtonId; txtrTag.id = yButtonId;
xf8_stickTextures.push_back(g_SimplePool->GetObj(txtrTag)); xf8_stickTextures.emplace_back(g_SimplePool->GetObj(txtrTag));
} }
} }
bool CSlideShow::LoadTXTRDep(std::string_view name) { bool CSlideShow::LoadTXTRDep(std::string_view name) {
const SObjectTag* dgrpTag = g_ResFactory->GetResourceIdByName(name); const SObjectTag* dgrpTag = g_ResFactory->GetResourceIdByName(name);
if (dgrpTag && dgrpTag->type == FOURCC('DGRP')) { if (dgrpTag && dgrpTag->type == FOURCC('DGRP')) {
x18_galleryTXTRDeps.push_back(g_SimplePool->GetObj(*dgrpTag)); x18_galleryTXTRDeps.emplace_back(g_SimplePool->GetObj(*dgrpTag));
return true; return true;
} }
return false; return false;