LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-17 23:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: nuke all widestrings and widechars everywhere

Browse Source
This commit is contained in:
Tropical
2026-04-07 23:20:09 -05:00
parent f1f1d116b3
commit 2912e9ae2e
1323 changed files with 23207 additions and 23399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
targets/app/common/UI/All Platforms/ArchiveFile.cpp
View File

@@ -30,7 +30,7 @@ void ArchiveFile::_readHeader(DataInputStream* dis) {
meta->isCompressed = false;
m_index.insert(
std::pair<std::wstring, PMetaData>(meta->filename, meta));
std::pair<std::string, PMetaData>(meta->filename, meta));
}
}
@@ -39,9 +39,7 @@ ArchiveFile::ArchiveFile(File file) {
m_sourcefile = file;
app.DebugPrintf("Loading archive file...\n");
#if !defined(_CONTENT_PACKAGE)
char buf[256];
wcstombs(buf, file.getPath().c_str(), 256);
app.DebugPrintf("archive file - %s\n", buf);
app.DebugPrintf("archive file - %s\n", file.getPath().c_str());
#endif
if (!file.exists()) {
@@ -75,8 +73,8 @@ ArchiveFile::ArchiveFile(File file) {
ArchiveFile::~ArchiveFile() { delete m_cachedData; }
std::vector<std::wstring>* ArchiveFile::getFileList() {
std::vector<std::wstring>* out = new std::vector<std::wstring>();
std::vector<std::string>* ArchiveFile::getFileList() {
std::vector<std::string>* out = new std::vector<std::string>();
for (auto it = m_index.begin(); it != m_index.end(); it++)
@@ -85,21 +83,21 @@ std::vector<std::wstring>* ArchiveFile::getFileList() {
return out;
}
bool ArchiveFile::hasFile(const std::wstring& filename) {
bool ArchiveFile::hasFile(const std::string& filename) {
return m_index.find(filename) != m_index.end();
}
int ArchiveFile::getFileSize(const std::wstring& filename) {
int ArchiveFile::getFileSize(const std::string& filename) {
return hasFile(filename) ? m_index.at(filename)->filesize : -1;
}
std::vector<uint8_t> ArchiveFile::getFile(const std::wstring& filename) {
std::vector<uint8_t> ArchiveFile::getFile(const std::string& filename) {
std::vector<uint8_t> out;
auto it = m_index.find(filename);
if (it == m_index.end()) {
app.DebugPrintf("Couldn't find file in archive\n");
app.DebugPrintf("Failed to find file '%ls' in archive\n",
app.DebugPrintf("Failed to find file '%s' in archive\n",
filename.c_str());
#if !defined(_CONTENT_PACKAGE)
assert(0);