mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replay menu cleanups. Fixes #3440.

Browse Source 
Hides the summary-button in the replaymenu in case the summary wasn't
saved.
Corrects the timestamp for incompatible replays.
Remove unused UNUSED from header files.
Use string8() instead of OsString().
Mention a reported compiler warning.
Use const& instead of a copy in StartVisualReplay().

This was SVN commit r17356.
This commit is contained in:
elexis
2015-12-02 13:53:44 +00:00
parent 0553a74884
commit a1e57aaeaf
5 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/ps/VisualReplay.cpp
+11 -7
View File
@@ -46,7 +46,7 @@ OsPath VisualReplay::GetDirectoryName()
return OsPath(psLogDir() / L"sim_log");
}
void VisualReplay::StartVisualReplay(CStrW directory)
void VisualReplay::StartVisualReplay(const CStrW& directory)
{
ENSURE(!g_NetServer);
ENSURE(!g_NetClient);
@@ -142,6 +142,7 @@ inline int getReplayDuration(std::istream *replayStream, const CStr& fileName, c
return -1;
if (debugParser)
// TODO: throws a compiler warning on some systems
debug_printf("At position %i of %lu after %i lines reads.\n", currentPosition, fileSize, linesRead);
if (!replayStream->good())
@@ -293,23 +294,26 @@ void VisualReplay::SaveReplayMetadata(const CStrW& data)
const OsPath fileName = g_Game->GetReplayLogger().GetDirectory() / L"metadata.json";
CreateDirectories(fileName.Parent(), 0700);
std::ofstream stream (OsString(fileName).c_str(), std::ofstream::out | std::ofstream::trunc);
std::ofstream stream (fileName.string8().c_str(), std::ofstream::out | std::ofstream::trunc);
stream << utf8_from_wstring(data);
stream.close();
}
bool VisualReplay::HasReplayMetadata(const CStrW& directoryName)
{
return FileExists(GetDirectoryName() / directoryName / L"metadata.json");
}
JS::Value VisualReplay::GetReplayMetadata(ScriptInterface::CxPrivate* pCxPrivate, const CStrW& directoryName)
{
const OsPath filePath = GetDirectoryName() / directoryName / L"metadata.json";
if (!HasReplayMetadata(directoryName))
return JSVAL_NULL;
JSContext* cx = pCxPrivate->pScriptInterface->GetContext();
JSAutoRequest rq(cx);
JS::RootedValue metadata(cx);
if (!FileExists(filePath))
return JSVAL_NULL;
std::ifstream* stream = new std::ifstream(OsString(filePath).c_str());
std::ifstream* stream = new std::ifstream(OsPath(GetDirectoryName() / directoryName / L"metadata.json").string8());
ENSURE(stream->good());
CStr line;
std::getline(*stream, line);