mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-02 16:36:41 +00:00
Code Issues Releases Wiki Activity

Merge branch 'but-lore-i-have-no-data' into 'master'

Browse source 
Fix #7887, use actual instead of reported size for script data

Closes #7887

See merge request OpenMW/openmw!3958
This commit is contained in:
psi29a 2024-03-18 19:46:15 +00:00
commit 4ec04486f7
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -158,6 +158,7 @@
Bug #7841: Editor: "Dirty" water heights are saved in modified CELLs Bug #7841: Editor: "Dirty" water heights are saved in modified CELLs
Bug #7859: AutoCalc flag is not used to calculate potion value Bug #7859: AutoCalc flag is not used to calculate potion value
Bug #7872: Region sounds use wrong odds Bug #7872: Region sounds use wrong odds
Bug #7887: Editor: Mismatched reported script data size and actual data size causes a crash during save
Feature #2566: Handle NAM9 records for manual cell references Feature #2566: Handle NAM9 records for manual cell references
Feature #3537: Shader-based water ripples Feature #3537: Shader-based water ripples
Feature #5173: Support for NiFogProperty Feature #5173: Support for NiFogProperty

2
components/esm3/loadscpt.cpp
View file

@ -149,6 +149,8 @@ namespace ESM
if (!hasHeader) if (!hasHeader)
esm.fail("Missing SCHD subrecord"); esm.fail("Missing SCHD subrecord");
// Reported script data size is not always trustworthy, so override it with actual data size
mData.mScriptDataSize = mScriptData.size();
} }
void Script::save(ESMWriter& esm, bool isDeleted) const void Script::save(ESMWriter& esm, bool isDeleted) const