diff options
| author | Brandon <brandon@bremaweb.com> | 2016-07-10 00:08:26 -0500 |
|---|---|---|
| committer | paramat <mat.gregory@virginmedia.com> | 2017-05-03 03:12:45 +0100 |
| commit | bd921a7916f0fafc493b1c4d0eeb5e2bb1d6a7c2 (patch) | |
| tree | 55f92cc02fce2acc9bb041a34de3c474b894bd00 /src/script/common | |
| parent | f1d7a26b7c341b468f34325cec5c3d495f175a8f (diff) | |
| download | minetest-bd921a7916f0fafc493b1c4d0eeb5e2bb1d6a7c2.tar.gz minetest-bd921a7916f0fafc493b1c4d0eeb5e2bb1d6a7c2.tar.bz2 minetest-bd921a7916f0fafc493b1c4d0eeb5e2bb1d6a7c2.zip | |
Sound API: Add fading sounds
Diffstat (limited to 'src/script/common')
| -rw-r--r-- | src/script/common/c_content.cpp | 2 | ||||
| -rw-r--r-- | src/script/common/c_converter.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp index 5fe5af58d..8696ad7cb 100644 --- a/src/script/common/c_content.cpp +++ b/src/script/common/c_content.cpp @@ -680,6 +680,7 @@ void read_server_sound_params(lua_State *L, int index, if(lua_istable(L, index)){ getfloatfield(L, index, "gain", params.gain); getstringfield(L, index, "to_player", params.to_player); + getfloatfield(L, index, "fade", params.fade); lua_getfield(L, index, "pos"); if(!lua_isnil(L, -1)){ v3f p = read_v3f(L, -1)*BS; @@ -712,6 +713,7 @@ void read_soundspec(lua_State *L, int index, SimpleSoundSpec &spec) } else if(lua_istable(L, index)){ getstringfield(L, index, "name", spec.name); getfloatfield(L, index, "gain", spec.gain); + getfloatfield(L, index, "fade", spec.fade); } else if(lua_isstring(L, index)){ spec.name = lua_tostring(L, index); } diff --git a/src/script/common/c_converter.h b/src/script/common/c_converter.h index a5fbee765..b0f61a8ca 100644 --- a/src/script/common/c_converter.h +++ b/src/script/common/c_converter.h @@ -77,6 +77,8 @@ void setfloatfield(lua_State *L, int table, const char *fieldname, float value); void setboolfield(lua_State *L, int table, const char *fieldname, bool value); +void setstringfield(lua_State *L, int table, + const char *fieldname, const char *value); v3f checkFloatPos (lua_State *L, int index); v2f check_v2f (lua_State *L, int index); |