diff options
| author | Zaba999 <qrwfw5rp> | 2012-09-29 23:53:57 +0200 |
|---|---|---|
| committer | Zaba999 <qrwfw5rp> | 2012-09-29 23:53:57 +0200 |
| commit | 95e1d101c82e43396fd93abfaa522e3651613c4c (patch) | |
| tree | 9d72f27e84a25c7a744b31eb7612698506ac5b68 /src/graphics/engine/text.h | |
| parent | aa9df8b1f0fbbad4c7be0214a19a90b8495a2067 (diff) | |
| parent | c8f39a4c96ab63f9e3edc96845e1b70c89b95d2b (diff) | |
| download | colobot-95e1d101c82e43396fd93abfaa522e3651613c4c.tar.gz colobot-95e1d101c82e43396fd93abfaa522e3651613c4c.tar.bz2 colobot-95e1d101c82e43396fd93abfaa522e3651613c4c.zip | |
Merge branch 'dev' of https://github.com/colobot/colobot into dev
Diffstat (limited to 'src/graphics/engine/text.h')
| -rw-r--r-- | src/graphics/engine/text.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/graphics/engine/text.h b/src/graphics/engine/text.h index cc18f55..7fa8768 100644 --- a/src/graphics/engine/text.h +++ b/src/graphics/engine/text.h @@ -149,9 +149,12 @@ enum FontMask struct UTF8Char { char c1, c2, c3; + // Padding for 4-byte alignment + // It also seems to fix some problems reported by valgrind + char pad; explicit UTF8Char(char ch1 = '\0', char ch2 = '\0', char ch3 = '\0') - : c1(ch1), c2(ch2), c3(ch3) {} + : c1(ch1), c2(ch2), c3(ch3), pad('\0') {} inline bool operator<(const UTF8Char &other) const { |