diff --git a/demboyz/base/jsonfile.cpp b/demboyz/base/jsonfile.cpp index afb6711..6c69417 100644 --- a/demboyz/base/jsonfile.cpp +++ b/demboyz/base/jsonfile.cpp @@ -156,13 +156,20 @@ namespace base writer.String(value); } - void JsonWriterFile::WriteString(const char* name, const char* value, std::int32_t length) + void JsonWriterFile::WriteString(const char* name, const char* value, std::size_t length) { auto& writer = m_writer; writer.String(name); writer.String(value, length); } + void JsonWriterFile::WriteString(const char* name, const std::string& value) + { + auto& writer = m_writer; + writer.String(name); + writer.String(value.c_str(), value.length()); + } + void JsonWriterFile::WriteFloat(const char* name, const double value) { auto& writer = m_writer; diff --git a/demboyz/base/jsonfile.h b/demboyz/base/jsonfile.h index 684dab0..76485ab 100644 --- a/demboyz/base/jsonfile.h +++ b/demboyz/base/jsonfile.h @@ -6,6 +6,7 @@ #include #include #include +#include namespace base { @@ -36,7 +37,8 @@ namespace base void WriteUInt32(const char* name, std::uint32_t value, bool writeCondition); void WriteUint64(const char* name, std::uint64_t value); void WriteString(const char* name, const char* value); - void WriteString(const char* name, const char* value, std::int32_t length); + void WriteString(const char* name, const char* value, std::size_t length); + void WriteString(const char* name, const std::string& value); void WriteFloat(const char* name, const double value); void WriteBits(const char* name, const unsigned char* data, std::size_t numBits); diff --git a/demboyz/demmessages/dem_consolecmd.cpp b/demboyz/demmessages/dem_consolecmd.cpp index 4d21cfe..fb8ac0f 100644 --- a/demboyz/demmessages/dem_consolecmd.cpp +++ b/demboyz/demmessages/dem_consolecmd.cpp @@ -27,7 +27,7 @@ namespace DemHandlers bool Dem_ConsoleCmd_JsonWrite_Internal(JsonWrite& jsonbuf, DemMsg::Dem_ConsoleCmd* data) { - jsonbuf.WriteString("command", data->command.c_str(), data->command.length()); + jsonbuf.WriteString("command", data->command); return true; } }