summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2017-08-13 13:37:37 +0200
committerGitHub <noreply@github.com>2017-08-13 13:37:37 +0200
commitfdd4b6e7c49f2ea3f06c3e095e7b4e931d88a3ec (patch)
tree31f40014e94a63bf4835db62deac3f1cdaa87cef /src
parentShortened DoIntervalsIntersect to two comparisons, made inline. (#3883) (diff)
parentcBlockInfo: Deprecate place sound (diff)
downloadcuberite-fdd4b6e7c49f2ea3f06c3e095e7b4e931d88a3ec.tar
cuberite-fdd4b6e7c49f2ea3f06c3e095e7b4e931d88a3ec.tar.gz
cuberite-fdd4b6e7c49f2ea3f06c3e095e7b4e931d88a3ec.tar.bz2
cuberite-fdd4b6e7c49f2ea3f06c3e095e7b4e931d88a3ec.tar.lz
cuberite-fdd4b6e7c49f2ea3f06c3e095e7b4e931d88a3ec.tar.xz
cuberite-fdd4b6e7c49f2ea3f06c3e095e7b4e931d88a3ec.tar.zst
cuberite-fdd4b6e7c49f2ea3f06c3e095e7b4e931d88a3ec.zip
Diffstat (limited to 'src')
-rw-r--r--src/Bindings/DeprecatedBindings.cpp61
-rw-r--r--src/BlockInfo.h5
2 files changed, 61 insertions, 5 deletions
diff --git a/src/Bindings/DeprecatedBindings.cpp b/src/Bindings/DeprecatedBindings.cpp
index bb59fca7c..e75250604 100644
--- a/src/Bindings/DeprecatedBindings.cpp
+++ b/src/Bindings/DeprecatedBindings.cpp
@@ -291,6 +291,62 @@ tolua_lerror:
+static int tolua_cBlockInfo_GetPlaceSound(lua_State * tolua_S)
+{
+ cLuaState L(tolua_S);
+ if (
+ !L.CheckParamStaticSelf("cBlockInfo") ||
+ !L.CheckParamNumber(2)
+ )
+ {
+ return 0;
+ }
+
+ L.Push("");
+ LOGWARNING("cBlockInfo:GetPlaceSound() is deprecated");
+ L.LogStackTrace(0);
+ return 1;
+}
+
+
+
+
+
+static int tolua_get_cBlockInfo_m_PlaceSound(lua_State * tolua_S)
+{
+ cLuaState L(tolua_S);
+ if (!L.CheckParamSelf("const cBlockInfo"))
+ {
+ return 0;
+ }
+
+ L.Push("");
+ LOGWARNING("cBlockInfo.m_PlaceSound is deprecated");
+ L.LogStackTrace(0);
+ return 1;
+}
+
+
+
+
+
+static int tolua_set_cBlockInfo_m_PlaceSound(lua_State * tolua_S)
+{
+ cLuaState L(tolua_S);
+ if (!L.CheckParamSelf("cBlockInfo"))
+ {
+ return 0;
+ }
+
+ LOGWARNING("cBlockInfo.m_PlaceSound is deprecated");
+ L.LogStackTrace(0);
+ return 0;
+}
+
+
+
+
+
/* method: Trace of class cTracer */
static int tolua_cTracer_Trace(lua_State * a_LuaState)
{
@@ -439,6 +495,11 @@ void DeprecatedBindings::Bind(lua_State * tolua_S)
tolua_function(tolua_S, "StringToMobType", tolua_AllToLua_StringToMobType00);
+ tolua_beginmodule(tolua_S, "cBlockInfo");
+ tolua_function(tolua_S, "GetPlaceSound", tolua_cBlockInfo_GetPlaceSound);
+ tolua_variable(tolua_S, "m_PlaceSound", tolua_get_cBlockInfo_m_PlaceSound, tolua_set_cBlockInfo_m_PlaceSound);
+ tolua_endmodule(tolua_S);
+
tolua_beginmodule(tolua_S, "cTracer");
tolua_function(tolua_S, "Trace", tolua_cTracer_Trace);
tolua_endmodule(tolua_S);
diff --git a/src/BlockInfo.h b/src/BlockInfo.h
index 569b537c1..1ba818cb3 100644
--- a/src/BlockInfo.h
+++ b/src/BlockInfo.h
@@ -55,9 +55,6 @@ public:
/** Block height */
float m_BlockHeight;
- /** Sound when placing this block */
- AString m_PlaceSound;
-
/** Block's hardness. The greater the value the longer the player needs to break the block. */
float m_Hardness;
@@ -85,7 +82,6 @@ public:
inline static bool FullyOccupiesVoxel (BLOCKTYPE a_Type) { return Get(a_Type).m_FullyOccupiesVoxel; }
inline static bool CanBeTerraformed (BLOCKTYPE a_Type) { return Get(a_Type).m_CanBeTerraformed; }
inline static float GetBlockHeight (BLOCKTYPE a_Type) { return Get(a_Type).m_BlockHeight; }
- inline static AString GetPlaceSound (BLOCKTYPE a_Type) { return Get(a_Type).m_PlaceSound; }
inline static float GetHardness (BLOCKTYPE a_Type) { return Get(a_Type).m_Hardness; }
// tolua_end
@@ -105,7 +101,6 @@ public:
, m_FullyOccupiesVoxel(false)
, m_CanBeTerraformed(false)
, m_BlockHeight(1.0)
- , m_PlaceSound()
, m_Hardness(0.0f)
, m_Handler()
{}