mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 19:20:49 +00:00
Merge branch 'nostring_sprintf' into 'master'
Don't pass a std::string to C's sprintf Closes #6762 See merge request OpenMW/openmw!1950
This commit is contained in:
commit
f7b9ab583e
@ -160,7 +160,7 @@ namespace MWGui
|
||||
|
||||
ESM::EpochTimeStamp currentDate = MWBase::Environment::get().getWorld()->getEpochTimeStamp();
|
||||
int daysPassed = MWBase::Environment::get().getWorld()->getTimeStamp().getDay();
|
||||
std::string formattedHour = pm ? "#{sSaveMenuHelp05}" : "#{sSaveMenuHelp04}";
|
||||
const char* formattedHour = pm ? "#{sSaveMenuHelp05}" : "#{sSaveMenuHelp04}";
|
||||
std::string dateTimeText = Misc::StringUtils::format("%i %s (#{sDay} %i) %i %s", currentDate.mDay, month, daysPassed, hour, formattedHour);
|
||||
mDateTimeText->setCaptionWithReplacing (dateTimeText);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user