diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-11-26 10:20:57 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-11-26 10:31:24 +0200 |
| commit | 2f5686ca4822a143cfa307ac9a01b8c1403b11fe (patch) | |
| tree | 8b5fec9803aa6f161ba96f2a3ddc2c0e043ad803 | |
| parent | 4fa4340b95165bb4cdc88ee6d7cf2d0609d6df13 (diff) | |
| download | minetest-2f5686ca4822a143cfa307ac9a01b8c1403b11fe.tar.gz minetest-2f5686ca4822a143cfa307ac9a01b8c1403b11fe.tar.bz2 minetest-2f5686ca4822a143cfa307ac9a01b8c1403b11fe.zip | |
Move a function from clientserver.h to clientserver.cpp
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/clientserver.cpp | 31 | ||||
| -rw-r--r-- | src/clientserver.h | 15 |
3 files changed, 36 insertions, 11 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8cdaa510d..eb42b7d3c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -202,6 +202,7 @@ set(common_SRCS sha1.cpp base64.cpp ban.cpp + clientserver.cpp util/serialize.cpp util/directiontables.cpp util/numeric.cpp diff --git a/src/clientserver.cpp b/src/clientserver.cpp new file mode 100644 index 000000000..bd0a8ede0 --- /dev/null +++ b/src/clientserver.cpp @@ -0,0 +1,31 @@ +/* +Minetest-c55 +Copyright (C) 2010-2012 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 +the Free Software Foundation; either version 2.1 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include "clientserver.h" +#include "util/serialize.h" + +SharedBuffer<u8> makePacket_TOCLIENT_TIME_OF_DAY(u16 time, float time_speed) +{ + SharedBuffer<u8> data(2+2+4); + writeU16(&data[0], TOCLIENT_TIME_OF_DAY); + writeU16(&data[2], time); + writeF1000(&data[4], time_speed); + return data; +} + diff --git a/src/clientserver.h b/src/clientserver.h index b7e64d295..65a14ab38 100644 --- a/src/clientserver.h +++ b/src/clientserver.h @@ -1,6 +1,6 @@ /* Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com> +Copyright (C) 2010-2012 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 @@ -20,7 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef CLIENTSERVER_HEADER #define CLIENTSERVER_HEADER -#include "util/serialize.h" +#include "util/pointer.h" + +SharedBuffer<u8> makePacket_TOCLIENT_TIME_OF_DAY(u16 time, float time_speed); /* changes by PROTOCOL_VERSION: @@ -565,14 +567,5 @@ enum ToServerCommand }; -inline SharedBuffer<u8> makePacket_TOCLIENT_TIME_OF_DAY(u16 time, float time_speed) -{ - SharedBuffer<u8> data(2+2+4); - writeU16(&data[0], TOCLIENT_TIME_OF_DAY); - writeU16(&data[2], time); - writeF1000(&data[4], time_speed); - return data; -} - #endif |