Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 10:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Play place_failed sound if occupied or cannot attach (#9486)

Browse Source
This commit is contained in:
Wuzzy 2020-07-27 19:40:33 +02:00 committed by GitHub
parent 808fa5ecb3
commit ae83edd165
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/lua_api.txt
View File

@ -7217,10 +7217,13 @@ Used by `minetest.register_node`.
-- Node was placed. Also played after falling -- Node was placed. Also played after falling
place_failed = <SimpleSoundSpec>, place_failed = <SimpleSoundSpec>,
-- When node placement failed -- When node placement failed.
-- Note: This happens if the _built-in_ node placement failed.
-- This sound will still be played if the node is placed in the
-- `on_place` callback manually.
fall = <SimpleSoundSpec>, fall = <SimpleSoundSpec>,
-- When node starts to fall -- When node starts to fall or is detached
}, },
drop = "", drop = "",

2
src/client/game.cpp
View File

@ -3379,6 +3379,7 @@ bool Game::nodePlacement(const ItemDefinition &selected_def,
} else { } else {
node = map.getNode(p, &is_valid_position); node = map.getNode(p, &is_valid_position);
if (is_valid_position && !nodedef->get(node).buildable_to) { if (is_valid_position && !nodedef->get(node).buildable_to) {
soundmaker->m_player_rightpunch_sound = selected_def.sound_place_failed;
// Report to server // Report to server
client->interact(INTERACT_PLACE, pointed); client->interact(INTERACT_PLACE, pointed);
return false; return false;
@ -3451,6 +3452,7 @@ bool Game::nodePlacement(const ItemDefinition &selected_def,
pp = p + v3s16(0, -1, 0); pp = p + v3s16(0, -1, 0);
if (!nodedef->get(map.getNode(pp)).walkable) { if (!nodedef->get(map.getNode(pp)).walkable) {
soundmaker->m_player_rightpunch_sound = selected_def.sound_place_failed;
// Report to server // Report to server
client->interact(INTERACT_PLACE, pointed); client->interact(INTERACT_PLACE, pointed);
return false; return false;