Add support for audio feedback if placing node failed

BlockMen · BlockMen · commit 2a12579fab78 · 2015-11-07T13:23:38.000+01:00
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
@@ -3241,6 +3241,7 @@ Definition tables
             dig = <SimpleSoundSpec>, -- "__group" = group-based sound (default)
             dug = <SimpleSoundSpec>,
             place = <SimpleSoundSpec>,
+            place_failed = <SimpleSoundSpec>,
         },
         drop = "",  -- Name of dropped node when dug. Default is the node itself.
         -- Alternatively:
diff --git a/src/game.cpp b/src/game.cpp
@@ -3682,8 +3682,12 @@ void Game::handlePointingAtNode(GameRunData *runData,
 						SimpleSoundSpec();
 
 				if (playeritem_def.node_placement_prediction == "" ||
-						nodedef_manager->get(map.getNodeNoEx(nodepos)).rightclickable)
+						nodedef_manager->get(map.getNodeNoEx(nodepos)).rightclickable) {
 					client->interact(3, pointed); // Report to server
+				} else {
+					soundmaker->m_player_rightpunch_sound =
+						playeritem_def.sound_place_failed;
+				}
 			}
 		}
 	}
diff --git a/src/itemdef.cpp b/src/itemdef.cpp
@@ -80,6 +80,7 @@ ItemDefinition& ItemDefinition::operator=(const ItemDefinition &def)
 	groups = def.groups;
 	node_placement_prediction = def.node_placement_prediction;
 	sound_place = def.sound_place;
+	sound_place_failed = def.sound_place_failed;
 	range = def.range;
 	return *this;
 }
@@ -114,6 +115,7 @@ void ItemDefinition::reset()
 	}
 	groups.clear();
 	sound_place = SimpleSoundSpec();
+	sound_place_failed = SimpleSoundSpec();
 	range = -1;
 
 	node_placement_prediction = "";
@@ -155,8 +157,10 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const
 		os<<serializeString(sound_place.name);
 		writeF1000(os, sound_place.gain);
 	}
-	if(protocol_version > 20){
+	if (protocol_version > 20) {
 		writeF1000(os, range);
+		os << serializeString(sound_place_failed.name);
+		writeF1000(os, sound_place_failed.gain);
 	}
 }
 
@@ -211,8 +215,10 @@ void ItemDefinition::deSerialize(std::istream &is)
 	}
 	// If you add anything here, insert it primarily inside the try-catch
 	// block to not need to increase the version.
-	try{
-	}catch(SerializationError &e) {};
+	try {
+		sound_place_failed.name = deSerializeString(is);
+		sound_place_failed.gain = readF1000(is);
+	} catch(SerializationError &e) {};
 }
 
 /*
diff --git a/src/itemdef.h b/src/itemdef.h
@@ -68,6 +68,7 @@ struct ItemDefinition
 	ToolCapabilities *tool_capabilities;
 	ItemGroupList groups;
 	SimpleSoundSpec sound_place;
+	SimpleSoundSpec sound_place_failed;
 	f32 range;
 
 	// Client shall immediately place this node when player places the item.
diff --git a/src/script/common/c_content.cpp b/src/script/common/c_content.cpp
@@ -100,6 +100,9 @@ ItemDefinition read_item_definition(lua_State* L,int index,
 		lua_getfield(L, -1, "place");
 		read_soundspec(L, -1, def.sound_place);
 		lua_pop(L, 1);
+		lua_getfield(L, -1, "place_failed");
+		read_soundspec(L, -1, def.sound_place_failed);
+		lua_pop(L, 1);
 	}
 	lua_pop(L, 1);
 

Original file line number	Diff line number	Diff line change
`@@ -3682,8 +3682,12 @@ void Game::handlePointingAtNode(GameRunData *runData,`
`3682`	`3682`	`SimpleSoundSpec();`
`3683`	`3683`
`3684`	`3684`	`if (playeritem_def.node_placement_prediction == "" \|\|`
`3685`		`- nodedef_manager->get(map.getNodeNoEx(nodepos)).rightclickable)`
	`3685`	`+ nodedef_manager->get(map.getNodeNoEx(nodepos)).rightclickable) {`
`3686`	`3686`	`client->interact(3, pointed); // Report to server`
	`3687`	`+ } else {`
	`3688`	`+ soundmaker->m_player_rightpunch_sound =`
	`3689`	`+ playeritem_def.sound_place_failed;`
	`3690`	`+ }`
`3687`	`3691`	`}`
`3688`	`3692`	`}`
`3689`	`3693`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ ItemDefinition& ItemDefinition::operator=(const ItemDefinition &def)`
`80`	`80`	`groups = def.groups;`
`81`	`81`	`node_placement_prediction = def.node_placement_prediction;`
`82`	`82`	`sound_place = def.sound_place;`
	`83`	`+ sound_place_failed = def.sound_place_failed;`
`83`	`84`	`range = def.range;`
`84`	`85`	`return *this;`
`85`	`86`	`}`
`@@ -114,6 +115,7 @@ void ItemDefinition::reset()`
`114`	`115`	`}`
`115`	`116`	`groups.clear();`
`116`	`117`	`sound_place = SimpleSoundSpec();`
	`118`	`+ sound_place_failed = SimpleSoundSpec();`
`117`	`119`	`range = -1;`
`118`	`120`
`119`	`121`	`node_placement_prediction = "";`
`@@ -155,8 +157,10 @@ void ItemDefinition::serialize(std::ostream &os, u16 protocol_version) const`
`155`	`157`	`os<<serializeString(sound_place.name);`
`156`	`158`	`writeF1000(os, sound_place.gain);`
`157`	`159`	`}`
`158`		`- if(protocol_version > 20){`
	`160`	`+ if (protocol_version > 20) {`
`159`	`161`	`writeF1000(os, range);`
	`162`	`+ os << serializeString(sound_place_failed.name);`
	`163`	`+ writeF1000(os, sound_place_failed.gain);`
`160`	`164`	`}`
`161`	`165`	`}`
`162`	`166`
`@@ -211,8 +215,10 @@ void ItemDefinition::deSerialize(std::istream &is)`
`211`	`215`	`}`
`212`	`216`	`// If you add anything here, insert it primarily inside the try-catch`
`213`	`217`	`// block to not need to increase the version.`
`214`		`- try{`
`215`		`- }catch(SerializationError &e) {};`
	`218`	`+ try {`
	`219`	`+ sound_place_failed.name = deSerializeString(is);`
	`220`	`+ sound_place_failed.gain = readF1000(is);`
	`221`	`+ } catch(SerializationError &e) {};`
`216`	`222`	`}`
`217`	`223`
`218`	`224`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,9 @@ ItemDefinition read_item_definition(lua_State* L,int index,`
`100`	`100`	`lua_getfield(L, -1, "place");`
`101`	`101`	`read_soundspec(L, -1, def.sound_place);`
`102`	`102`	`lua_pop(L, 1);`
	`103`	`+ lua_getfield(L, -1, "place_failed");`
	`104`	`+ read_soundspec(L, -1, def.sound_place_failed);`
	`105`	`+ lua_pop(L, 1);`
`103`	`106`	`}`
`104`	`107`	`lua_pop(L, 1);`
`105`	`108`