BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Fix LuaEntitySAO::getClientInitializationData() and bump the related version

Browse Source
This commit is contained in:
Perttu Ahola 2012-11-26 09:10:27 +02:00
parent d67004a3be
commit ab507f83e2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/content_cao.cpp
View File

@ -650,7 +650,7 @@ public:
// version // version
u8 version = readU8(is); u8 version = readU8(is);
// check version // check version
if(version != 0){ if(version != 1){
errorstream<<"GenericCAO: Unsupported init data version" errorstream<<"GenericCAO: Unsupported init data version"
<<std::endl; <<std::endl;
return; return;

6
src/content_sao.cpp
View File

@ -567,10 +567,10 @@ void LuaEntitySAO::step(float dtime, bool send_recommended)
std::string LuaEntitySAO::getClientInitializationData() std::string LuaEntitySAO::getClientInitializationData()
{ {
std::ostringstream os(std::ios::binary); std::ostringstream os(std::ios::binary);
writeU8(os, 0); // version writeU8(os, 1); // version
os<<serializeString(""); // name os<<serializeString(""); // name
writeS16(os, getId()); //id
writeU8(os, 0); // is_player writeU8(os, 0); // is_player
writeS16(os, getId()); //id
writeV3F1000(os, m_base_position); writeV3F1000(os, m_base_position);
writeF1000(os, m_yaw); writeF1000(os, m_yaw);
writeS16(os, m_hp); writeS16(os, m_hp);
@ -965,7 +965,7 @@ bool PlayerSAO::unlimitedTransferDistance() const
std::string PlayerSAO::getClientInitializationData() std::string PlayerSAO::getClientInitializationData()
{ {
std::ostringstream os(std::ios::binary); std::ostringstream os(std::ios::binary);
writeU8(os, 0); // version writeU8(os, 1); // version
os<<serializeString(m_player->getName()); // name os<<serializeString(m_player->getName()); // name
writeU8(os, 1); // is_player writeU8(os, 1); // is_player
writeS16(os, getId()); //id writeS16(os, getId()); //id