AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 18:24:55 +00:00
Code Issues Projects Releases Wiki Activity

Windows fixes

Browse Source
This commit is contained in:
Jack Andersen
2016-03-08 10:29:59 -10:00
parent 9203b69647
commit 2f14331d5d
9 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
DataSpec/DNAMP1/DNAMP1.cpp
View File

@@ -89,11 +89,7 @@ void PAKBridge::build()
}
bool named;
#if HECL_UCS2
<<<<<<< HEAD
level.name = hecl::UTF8ToWide(m_pak.bestEntryName(entry, named));
=======
level.name = hecl::UTF8ToWide(m_pak.bestEntryName(entry));
>>>>>>> master
#else
level.name = m_pak.bestEntryName(entry, named);
#endif