summaryrefslogtreecommitdiff
path: root/src/util/serialize.h
diff options
context:
space:
mode:
authorkwolekr <mirrorisim@gmail.com>2013-02-26 01:57:59 -0500
committerkwolekr <mirrorisim@gmail.com>2013-02-26 01:57:59 -0500
commitd31f07bd4b83f858cce589faac56922e12ba670f (patch)
treed4044aa4aa782dc1cb9f57adfacb3b2fd8ecc4b2 /src/util/serialize.h
parent979ca23f1eae1adeb8b0083dffe7203c54d87395 (diff)
downloadminetest-d31f07bd4b83f858cce589faac56922e12ba670f.tar.gz
minetest-d31f07bd4b83f858cce589faac56922e12ba670f.tar.bz2
minetest-d31f07bd4b83f858cce589faac56922e12ba670f.zip
Fix most warnings, re-fix MSVC compile error
Diffstat (limited to 'src/util/serialize.h')
-rw-r--r--src/util/serialize.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/util/serialize.h b/src/util/serialize.h
index b297786e6..bb44c7f96 100644
--- a/src/util/serialize.h
+++ b/src/util/serialize.h
@@ -208,11 +208,12 @@ inline void writeARGB8(u8 *data, video::SColor p)
inline video::SColor readARGB8(const u8 *data)
{
- video::SColor p;
- p.setAlpha(readU8(&data[0]));
- p.setRed(readU8(&data[1]));
- p.setGreen(readU8(&data[2]));
- p.setBlue(readU8(&data[3]));
+ video::SColor p(
+ readU8(&data[0]),
+ readU8(&data[1]),
+ readU8(&data[2]),
+ readU8(&data[3])
+ );
return p;
}