Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit2fb2aea

Browse files
committed
feat: Network - Mii Dumper
Uses utils method to retrieve Mii name
1 parentc8a2773 commit2fb2aea

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

‎src/base/entries/network/mii_dumper_menu.cpp‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
#include<base/entries.hpp>
22

33
#include<base/pointers.hpp>
4+
#include<base/utils.hpp>
45

56
#include<Net/NetworkEngine.hpp>
67
#include<Net/NetworkPlayerDataManager.hpp>
78

8-
#include<codecvt>
9-
10-
#pragma GCC diagnostic push
11-
#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
129
namespacebase
1310
{
1411
usingnamespaceCTRPluginFramework;
@@ -26,18 +23,10 @@ namespace base
2623

2724
autoconst &data = (*g_pointers->m_network_engine)->m_network_player_data_manager->m_network_player_datas_connected;
2825

29-
auto converter = std::wstring_convert<std::codecvt_utf8_utf16<char16_t>,char16_t>();
30-
autoconst get_name = [&converter](autoconst &player_data)
31-
{
32-
auto name =std::u16string(reinterpret_cast<char16_tconst *>(player_data.m_store_data.mii_data.mii_name),std::size(player_data.m_store_data.mii_data.mii_name));
33-
name.erase(std::find(name.begin(), name.end(),'\0'), name.end());
34-
return converter.to_bytes(name);
35-
};
36-
3726
auto infos = std::vector<info>();
3827
for (auto i = std::size_t{}; i <std::size(data); ++i)
3928
if (data[i].m_loaded)
40-
infos.push_back({ i,get_name(data[i]) });
29+
infos.push_back({ i,utils::mii_name(data[i].m_store_data.mii_data) });
4130

4231
auto options = std::vector<std::string>();
4332
std::for_each(infos.begin(), infos.end(), [&](autoconst &i) { options.push_back(i.name); });
@@ -56,7 +45,7 @@ namespace base
5645
autoconst &info = infos.at(choice);
5746
autoconst &player_data = data[info.index];
5847

59-
auto name =get_name(player_data);
48+
auto name =utils::mii_name(player_data.m_store_data.mii_data);
6049

6150
_open:
6251
autoconst path =std::format("{}.3dsmii", name);
@@ -85,5 +74,4 @@ namespace base
8574
break;
8675
}
8776
}
88-
}
89-
#pragma GCC diagnostic pop
77+
}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp