Skip to content

Commit 77beed0

Browse files
committed
Merge branch 'bgsm' into 'master'
Don't read terrain parameters for BGSM v1/v2 See merge request OpenMW/openmw!5050
2 parents 7281f3e + 17e279c commit 77beed0

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

components/bgsm/file.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,13 +181,16 @@ namespace Bgsm
181181
if (mVersion >= 1)
182182
{
183183
stream.read(mSkewSpecularAlpha);
184-
stream.read(mTerrain);
185-
if (mTerrain)
184+
if (mVersion >= 3)
186185
{
187-
if (mVersion == 3)
188-
stream.skip(4); // Unknown
186+
stream.read(mTerrain);
187+
if (mTerrain)
188+
{
189+
if (mVersion == 3)
190+
stream.skip(4); // Unknown
189191

190-
stream.read(mTerrainParams);
192+
stream.read(mTerrainParams);
193+
}
191194
}
192195
}
193196
}

0 commit comments

Comments
 (0)