From 497ff1ecd64c8908f988e15ca879824f2781e3fd Mon Sep 17 00:00:00 2001 From: PilzAdam Date: Sun, 24 Feb 2013 18:40:43 +0100 Subject: Change Minetest-c55 to Minetest --- src/util/serialize.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/util/serialize.h') diff --git a/src/util/serialize.h b/src/util/serialize.h index b356c484e..b0e93ad26 100644 --- a/src/util/serialize.h +++ b/src/util/serialize.h @@ -1,5 +1,5 @@ /* -Minetest-c55 +Minetest Copyright (C) 2010-2012 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify -- cgit v1.2.3 From 6d0ea26c2d62c3774ff384cf1bfc2a3372b49a3b Mon Sep 17 00:00:00 2001 From: Sfan5 Date: Sun, 24 Feb 2013 19:38:45 +0100 Subject: Update Copyright Years --- src/util/serialize.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/util/serialize.h') diff --git a/src/util/serialize.h b/src/util/serialize.h index b0e93ad26..b297786e6 100644 --- a/src/util/serialize.h +++ b/src/util/serialize.h @@ -1,6 +1,6 @@ /* Minetest -Copyright (C) 2010-2012 celeron55, Perttu Ahola +Copyright (C) 2010-2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by -- cgit v1.2.3 From d31f07bd4b83f858cce589faac56922e12ba670f Mon Sep 17 00:00:00 2001 From: kwolekr Date: Tue, 26 Feb 2013 01:57:59 -0500 Subject: Fix most warnings, re-fix MSVC compile error --- src/util/serialize.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/util/serialize.h') 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; } -- cgit v1.2.3