Windows fixes

This commit is contained in:
Jack Andersen 2015-09-26 18:36:15 -10:00
parent 525c8a0254
commit 5b70865e4f
6 changed files with 11 additions and 8 deletions

View File

@ -120,8 +120,8 @@ void PAKBridge::build()
auto search = dupeTracker.find(areaDeps.name); auto search = dupeTracker.find(areaDeps.name);
if (search != dupeTracker.end() && search->second.first > 1) if (search != dupeTracker.end() && search->second.first > 1)
{ {
char num[16]; HECL::SystemChar num[16];
snprintf(num, 16, " (%d)", search->second.second++); HECL::SNPrintf(num, 16, _S(" (%d)"), search->second.second++);
areaDeps.name += num; areaDeps.name += num;
} }

View File

@ -1,6 +1,9 @@
#include "MREA.hpp" #include "MREA.hpp"
#include "DeafBabe.hpp" #include "DeafBabe.hpp"
#define _USE_MATH_DEFINES
#include <math.h>
namespace Retro namespace Retro
{ {
namespace DNAMP1 namespace DNAMP1

View File

@ -117,8 +117,8 @@ void PAKBridge::build()
auto search = dupeTracker.find(areaDeps.name); auto search = dupeTracker.find(areaDeps.name);
if (search != dupeTracker.end() && search->second.first > 1) if (search != dupeTracker.end() && search->second.first > 1)
{ {
char num[16]; HECL::SystemChar num[16];
snprintf(num, 16, " (%d)", search->second.second++); HECL::SNPrintf(num, 16, _S(" (%d)"), search->second.second++);
areaDeps.name += num; areaDeps.name += num;
} }

View File

@ -127,8 +127,8 @@ void PAKBridge::build()
auto search = dupeTracker.find(areaDeps.name); auto search = dupeTracker.find(areaDeps.name);
if (search != dupeTracker.end() && search->second.first > 1) if (search != dupeTracker.end() && search->second.first > 1)
{ {
char num[16]; HECL::SystemChar num[16];
snprintf(num, 16, " (%d)", search->second.second++); HECL::SNPrintf(num, 16, _S(" (%d)"), search->second.second++);
areaDeps.name += num; areaDeps.name += num;
} }

2
NODLib

@ -1 +1 @@
Subproject commit a7afead6ab96592c70ea3d91e6d559a15b825a56 Subproject commit dfdfdb274917439e7a069d24a045277896cff433

2
hecl

@ -1 +1 @@
Subproject commit f4d17c323d2801ec76d1126c8fe1931b5e88c12c Subproject commit 25f7079269179643f04afa31ff7ac8a4fdef48c6