jordan4ibanez
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Play placing sound only if place prediction was successful

master
PilzAdam 2013-06-19 21:09:18 +00:00
parent 9b6f1d647c
commit 81c8b404e7
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/game.cpp
View File

@ -834,7 +834,7 @@ public:
} }
}; };
void nodePlacementPrediction(Client &client, bool nodePlacementPrediction(Client &client,
const ItemDefinition &playeritem_def, const ItemDefinition &playeritem_def,
v3s16 nodepos, v3s16 neighbourpos) v3s16 nodepos, v3s16 neighbourpos)
{ {
@ -854,7 +854,7 @@ void nodePlacementPrediction(Client &client,
if(nodedef->get(n_under).buildable_to) if(nodedef->get(n_under).buildable_to)
p = nodepos; p = nodepos;
else if (!nodedef->get(map.getNode(p)).buildable_to) else if (!nodedef->get(map.getNode(p)).buildable_to)
return; return false;
}catch(InvalidPositionException &e){} }catch(InvalidPositionException &e){}
// Find id of predicted node // Find id of predicted node
content_t id; content_t id;
@ -864,7 +864,7 @@ void nodePlacementPrediction(Client &client,
<<playeritem_def.name<<" (places " <<playeritem_def.name<<" (places "
<<prediction <<prediction
<<") - Name not known"<<std::endl; <<") - Name not known"<<std::endl;
return; return false;
} }
// Predict param2 for facedir and wallmounted nodes // Predict param2 for facedir and wallmounted nodes
u8 param2 = 0; u8 param2 = 0;
@ -903,13 +903,14 @@ void nodePlacementPrediction(Client &client,
else else
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)
return; return false;
} }
// Add node to client map // Add node to client map
MapNode n(id, 0, param2); MapNode n(id, 0, param2);
try{ try{
// This triggers the required mesh update too // This triggers the required mesh update too
client.addNode(p, n); client.addNode(p, n);
return true;
}catch(InvalidPositionException &e){ }catch(InvalidPositionException &e){
errorstream<<"Node placement prediction failed for " errorstream<<"Node placement prediction failed for "
<<playeritem_def.name<<" (places " <<playeritem_def.name<<" (places "
@ -917,6 +918,7 @@ void nodePlacementPrediction(Client &client,
<<") - Position not loaded"<<std::endl; <<") - Position not loaded"<<std::endl;
} }
} }
return false;
} }
@ -2774,13 +2776,17 @@ void the_game(
// If the wielded item has node placement prediction, // If the wielded item has node placement prediction,
// make that happen // make that happen
nodePlacementPrediction(client, bool placed = nodePlacementPrediction(client,
playeritem_def, playeritem_def,
nodepos, neighbourpos); nodepos, neighbourpos);
// Read the sound // Read the sound
soundmaker.m_player_rightpunch_sound = if(placed)
playeritem_def.sound_place; soundmaker.m_player_rightpunch_sound =
playeritem_def.sound_place;
else
soundmaker.m_player_rightpunch_sound =
SimpleSoundSpec();
} }
} }
} }