Build viewer/editor #13

Manually merged
williamjcm merged 128 commits from mass-viewer into master 2022-03-02 14:50:10 +01:00
Showing only changes of commit 2e1949ed5d - Show all commits

View file

@ -29,19 +29,23 @@ auto BytePropertySerialiser::deserialise(const std::string& name, const std::str
{ {
auto prop = Containers::pointer<ByteProperty>(); auto prop = Containers::pointer<ByteProperty>();
if(!reader.readUEString(prop->enumType)) { if(value_length != UnsignedLong(-1)) {
return nullptr; if(!reader.readUEString(prop->enumType)) {
} return nullptr;
}
char terminator; char terminator;
if(!reader.readChar(terminator) || terminator != '\0') { if(!reader.readChar(terminator) || terminator != '\0') {
return nullptr; return nullptr;
}
} }
if(!reader.readUEString(prop->enumValue)) { if(!reader.readUEString(prop->enumValue)) {
return nullptr; return nullptr;
} }
prop->valueLength = value_length;
//UnsignedInt count = 0; //UnsignedInt count = 0;
//if(!reader.readUnsignedInt(count)) { //if(!reader.readUnsignedInt(count)) {
// return nullptr; // return nullptr;
@ -67,8 +71,11 @@ auto BytePropertySerialiser::serialise(UnrealPropertyBase::ptr& prop, UnsignedLo
//bytes_written += writer.writeValueToArray<UnsignedInt>(byte_prop->value.size()); //bytes_written += writer.writeValueToArray<UnsignedInt>(byte_prop->value.size());
//bytes_written += writer.writeDataToArray<char>(byte_prop->value); //bytes_written += writer.writeDataToArray<char>(byte_prop->value);
writer.writeUEStringToArray(byte_prop->enumType); if(byte_prop->valueLength != UnsignedLong(-1)) {
writer.writeValueToArray<char>('\0'); writer.writeUEStringToArray(byte_prop->enumType);
writer.writeValueToArray<char>('\0');
}
bytes_written += writer.writeUEStringToArray(byte_prop->enumValue); bytes_written += writer.writeUEStringToArray(byte_prop->enumValue);
return true; return true;