Punchwear (improved) (#8959)

2019-09-22 22:12:21 +02:00
parent fec30e37ac
commit 70f9e1aafa
10 changed files with 73 additions and 31 deletions
--- a/src/serverobject.h
+++ b/src/serverobject.h
@@ -133,10 +133,10 @@ class ServerActiveObject : public ActiveObject
 	{return true;}

 	// Returns tool wear
-	virtual int punch(v3f dir,
-			const ToolCapabilities *toolcap=NULL,
-			ServerActiveObject *puncher=NULL,
-			float time_from_last_punch=1000000)
+	virtual u16 punch(v3f dir,
+			const ToolCapabilities *toolcap = nullptr,
+			ServerActiveObject *puncher = nullptr,
+			float time_from_last_punch = 1000000.0f)
 	{ return 0; }
 	virtual void rightClick(ServerActiveObject *clicker)
 	{}