mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-07-11 01:25:07 +02:00
Buildfix, remove some .c_str()
This commit is contained in:
+1
-1
@@ -385,7 +385,7 @@ void GetCurrentTimeFormatted(char formattedTime[13]) {
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void FormatUnixTime(double unixTimeSeconds, char *formatted, size_t bufSize, bool includeDate) {
|
void FormatUnixTime(double unixTimeSeconds, char *formatted, int bufSize, bool includeDate) {
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
ULARGE_INTEGER uli;
|
ULARGE_INTEGER uli;
|
||||||
uli.QuadPart = (ULONGLONG)(unixTimeSeconds * TICKS_PER_SECOND) + UNIX_TIME_START; // Convert seconds to ticks and add the offset to get FILETIME ticks.
|
uli.QuadPart = (ULONGLONG)(unixTimeSeconds * TICKS_PER_SECOND) + UNIX_TIME_START; // Convert seconds to ticks and add the offset to get FILETIME ticks.
|
||||||
|
|||||||
+1
-1
@@ -34,7 +34,7 @@ void sleep_random(double minSeconds, double maxSeconds, const char *reason);
|
|||||||
void yield();
|
void yield();
|
||||||
|
|
||||||
void GetCurrentTimeFormatted(char formattedTime[13]);
|
void GetCurrentTimeFormatted(char formattedTime[13]);
|
||||||
void FormatUnixTime(double unixTimeSeconds, char *formatted, size_t bufSize, bool includeDate = true);
|
void FormatUnixTime(double unixTimeSeconds, char *formatted, int bufSize, bool includeDate = true);
|
||||||
|
|
||||||
// Most accurate timer possible - no extra double conversions. Only for spans.
|
// Most accurate timer possible - no extra double conversions. Only for spans.
|
||||||
class Instant {
|
class Instant {
|
||||||
|
|||||||
+2
-2
@@ -832,7 +832,7 @@ int g_screenshotFailures;
|
|||||||
if (result == CChunkFileReader::ERROR_NONE) {
|
if (result == CChunkFileReader::ERROR_NONE) {
|
||||||
callbackMessage = op.slot != LOAD_UNDO_SLOT ? sc->T("Loaded State") : sc->T("State load undone");
|
callbackMessage = op.slot != LOAD_UNDO_SLOT ? sc->T("Loaded State") : sc->T("State load undone");
|
||||||
callbackResult = TriggerLoadWarnings(callbackMessage);
|
callbackResult = TriggerLoadWarnings(callbackMessage);
|
||||||
callbackMetadata = SaveState::GetSaveFileDateAsString(op.path.GetFilename().c_str());
|
callbackMetadata = SaveState::GetSaveFileDateAsString(op.path.GetFilename());
|
||||||
|
|
||||||
hasLoadedState = true;
|
hasLoadedState = true;
|
||||||
Core_ResetException();
|
Core_ResetException();
|
||||||
@@ -858,7 +858,7 @@ int g_screenshotFailures;
|
|||||||
ERROR_LOG(Log::SaveState, "Load state failure: %s", errorString.c_str());
|
ERROR_LOG(Log::SaveState, "Load state failure: %s", errorString.c_str());
|
||||||
callbackResult = Status::FAILURE;
|
callbackResult = Status::FAILURE;
|
||||||
} else {
|
} else {
|
||||||
callbackMessage = sc->T(errorString.c_str(), i18nLoadFailure);
|
callbackMessage = sc->T(errorString, i18nLoadFailure);
|
||||||
callbackResult = Status::FAILURE;
|
callbackResult = Status::FAILURE;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user