Max/korenkonder_ReDIVA
1
0
Fork 0
mirror of https://github.com/korenkonder/ReDIVA.git synced 2026-10-09 23:58:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed writing of Modern Object Set (and Modern files in general)

Browse Source
This commit is contained in:
korenkonder
2025-06-15 20:48:02 +03:00
parent 357fdf7386
commit 68185aa02b
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/KKdLib/f2/header.cpp
+1 -1
View File
@@ -174,7 +174,7 @@ bool f2_header::validate_crc(int32_t not_ignore_crc) {
}
void f2_header::write(stream& s) {
if (s.check_null())
if (s.check_null() && !reinterpret_cast<struct memory_stream*>(&s))
return;
s.write(this, get_length());
src/KKdLib/f2/struct.cpp
+1 -1
View File
@@ -120,7 +120,7 @@ void f2_struct::write(void** data, size_t* size, bool use_depth, bool shift_x) {
}
void f2_struct::write(stream& s, bool use_depth, bool shift_x) {
if (s.check_null())
if (s.check_null() && !reinterpret_cast<memory_stream*>(&s))
return;
f2_struct_get_length(this, shift_x);
src/KKdLib/obj.cpp
+3 -4
View File
@@ -4270,9 +4270,8 @@ static void obj_set_modern_write_inner(obj_set* set, stream& s) {
s_omdl.big_endian = big_endian;
if (obj->skin) {
st.sub_structs.push_back({});
omdl = &st.sub_structs.end()[-2];
f2_struct* oskn = &st.sub_structs.back();
omdl->sub_structs.push_back({});
f2_struct* oskn = &omdl->sub_structs.back();
memory_stream s_oskn;
s_oskn.open();
@@ -4285,7 +4284,7 @@ static void obj_set_modern_write_inner(obj_set* set, stream& s) {
s_oskn.close();
new (&oskn->header) f2_header('OSKN');
oskn->header.attrib.set_big_endian(big_endian);
omdl->header.attrib.set_big_endian(big_endian);
}
obj_modern_write_model(obj, s_omdl, 0, is_x, omdl);