mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-19 15:11:33 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2573 from akortunov/encoding

Browse source 
Attempt to fix a regression - crash on ARM
This commit is contained in:
Alexei Dobrohotov 2019-10-29 02:00:02 +03:00 committed by GitHub
commit 8752523de3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/esm/loadregn.hpp
View file

@ -33,14 +33,14 @@ struct Region
// the engine uses mA as "snow" and mB as "blizard" // the engine uses mA as "snow" and mB as "blizard"
mA, mB; mA, mB;
}; // 10 bytes }; // 10 bytes
#pragma pack(pop)
// Reference to a sound that is played randomly in this region // Reference to a sound that is played randomly in this region
struct SoundRef struct SoundRef
{ {
std::string mSound; std::string mSound;
unsigned char mChance; unsigned char mChance;
}; // 33 bytes };
#pragma pack(pop)
WEATstruct mData; WEATstruct mData;
int mMapColor; // RGBA int mMapColor; // RGBA

2
components/esm/loadscpt.hpp
View file

@ -33,7 +33,7 @@ public:
{ {
std::string mName; std::string mName;
Script::SCHDstruct mData; Script::SCHDstruct mData;
}; // 52 bytes };
std::string mId; std::string mId;