summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/util')
-rw-r--r--src/util/container.h4
-rw-r--r--src/util/directiontables.cpp4
-rw-r--r--src/util/directiontables.h4
-rw-r--r--src/util/numeric.cpp4
-rw-r--r--src/util/numeric.h4
-rw-r--r--src/util/pointedthing.cpp4
-rw-r--r--src/util/pointedthing.h4
-rw-r--r--src/util/pointer.h4
-rw-r--r--src/util/serialize.cpp4
-rw-r--r--src/util/serialize.h15
-rw-r--r--src/util/string.cpp4
-rw-r--r--src/util/string.h4
-rw-r--r--src/util/thread.h4
-rw-r--r--src/util/timetaker.cpp4
-rw-r--r--src/util/timetaker.h4
15 files changed, 36 insertions, 35 deletions
diff --git a/src/util/container.h b/src/util/container.h
index 8c1ae02fb..775372649 100644
--- a/src/util/container.h
+++ b/src/util/container.h
@@ -1,6 +1,6 @@
/*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/util/directiontables.cpp b/src/util/directiontables.cpp
index a5d2faa7c..d6c154842 100644
--- a/src/util/directiontables.cpp
+++ b/src/util/directiontables.cpp
@@ -1,6 +1,6 @@
/*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/util/directiontables.h b/src/util/directiontables.h
index 5bebd2fdb..0dd3aab09 100644
--- a/src/util/directiontables.h
+++ b/src/util/directiontables.h
@@ -1,6 +1,6 @@
/*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/util/numeric.cpp b/src/util/numeric.cpp
index 0ac812eb7..a79454628 100644
--- a/src/util/numeric.cpp
+++ b/src/util/numeric.cpp
@@ -1,6 +1,6 @@
/*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/util/numeric.h b/src/util/numeric.h
index a028f1ff2..450a98e40 100644
--- a/src/util/numeric.h
+++ b/src/util/numeric.h
@@ -1,6 +1,6 @@
/*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/util/pointedthing.cpp b/src/util/pointedthing.cpp
index d1be2d6b6..dc39e313a 100644
--- a/src/util/pointedthing.cpp
+++ b/src/util/pointedthing.cpp
@@ -1,6 +1,6 @@
/*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/util/pointedthing.h b/src/util/pointedthing.h
index e61e2f4f3..2b2703e98 100644
--- a/src/util/pointedthing.h
+++ b/src/util/pointedthing.h
@@ -1,6 +1,6 @@
/*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/util/pointer.h b/src/util/pointer.h
index 775f0a336..f65683332 100644
--- a/src/util/pointer.h
+++ b/src/util/pointer.h
@@ -1,6 +1,6 @@
/*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/util/serialize.cpp b/src/util/serialize.cpp
index 16825b677..f32813551 100644
--- a/src/util/serialize.cpp
+++ b/src/util/serialize.cpp
@@ -1,6 +1,6 @@
/*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/util/serialize.h b/src/util/serialize.h
index b356c484e..bb44c7f96 100644
--- a/src/util/serialize.h
+++ b/src/util/serialize.h
@@ -1,6 +1,6 @@
/*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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
@@ -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;
}
diff --git a/src/util/string.cpp b/src/util/string.cpp
index 61b307c60..3bd8b7364 100644
--- a/src/util/string.cpp
+++ b/src/util/string.cpp
@@ -1,6 +1,6 @@
/*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/util/string.h b/src/util/string.h
index a469a074a..2f0264bd4 100644
--- a/src/util/string.h
+++ b/src/util/string.h
@@ -1,6 +1,6 @@
/*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/util/thread.h b/src/util/thread.h
index 8e8c74ac5..949bb4204 100644
--- a/src/util/thread.h
+++ b/src/util/thread.h
@@ -1,6 +1,6 @@
/*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/util/timetaker.cpp b/src/util/timetaker.cpp
index 52c618931..910fea822 100644
--- a/src/util/timetaker.cpp
+++ b/src/util/timetaker.cpp
@@ -1,6 +1,6 @@
/*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/util/timetaker.h b/src/util/timetaker.h
index 8aad97d0f..0b9d9ca04 100644
--- a/src/util/timetaker.h
+++ b/src/util/timetaker.h
@@ -1,6 +1,6 @@
/*
-Minetest-c55
-Copyright (C) 2010-2012 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2010-2013 celeron55, Perttu Ahola <celeron55@gmail.com>
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-20 07:45:16 +0000