summaryrefslogtreecommitdiff
path: root/src/content_sao.cpp
diff options
context:
space:
mode:
authorsapier <sapier at gmx dot net>2017-01-14 19:32:10 +0100
committersapier <sapier at gmx dot net>2017-01-21 17:01:02 +0100
commitc57b4ff9b592617539aa978374c13cdd5f1603a6 (patch)
tree26174f5add5e5f1a681323459ea27e14bf316f32 /src/content_sao.cpp
parent72535d33281ed4c863013590e5fd032c39f0b781 (diff)
downloadminetest-c57b4ff9b592617539aa978374c13cdd5f1603a6.tar.gz
minetest-c57b4ff9b592617539aa978374c13cdd5f1603a6.tar.bz2
minetest-c57b4ff9b592617539aa978374c13cdd5f1603a6.zip
Add Entity get_texture_mod() to Lua API
Send texture modifier to clients connecting later too
Diffstat (limited to 'src/content_sao.cpp')
-rw-r--r--src/content_sao.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index d6581144f..f0973082d 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -257,7 +257,8 @@ LuaEntitySAO::LuaEntitySAO(ServerEnvironment *env, v3f pos,
m_last_sent_position(0,0,0),
m_last_sent_velocity(0,0,0),
m_last_sent_position_timer(0),
- m_last_sent_move_precision(0)
+ m_last_sent_move_precision(0),
+ m_current_texture_modifier("")
{
// Only register type if no environment supplied
if(env == NULL){
@@ -511,6 +512,9 @@ std::string LuaEntitySAO::getClientInitializationData(u16 protocol_version)
}
}
+ msg_os << serializeLongString(gob_cmd_set_texture_mod(m_current_texture_modifier));
+ message_count++;
+
writeU8(os, message_count);
os.write(msg_os.str().c_str(), msg_os.str().size());
}
@@ -687,11 +691,17 @@ v3f LuaEntitySAO::getAcceleration()
void LuaEntitySAO::setTextureMod(const std::string &mod)
{
std::string str = gob_cmd_set_texture_mod(mod);
+ m_current_texture_modifier = mod;
// create message and add to list
ActiveObjectMessage aom(getId(), true, str);
m_messages_out.push(aom);
}
+std::string LuaEntitySAO::getTextureMod() const
+{
+ return m_current_texture_modifier;
+}
+
void LuaEntitySAO::setSprite(v2s16 p, int num_frames, float framelength,
bool select_horiz_by_yawpitch)
{