Order es_DrawType exactly like enum NodeDrawType in nodedef.h (#5946)

[dragonfireclient.git] / src / script / cpp_api / s_player.h

diff --git a/src/script/cpp_api/s_player.h b/src/script/cpp_api/s_player.h
index c77d397c408fd28139e98c6bcca4a24472bd7252..9b4611f9ec7b75848ab3cdb252936b18b98f7945 100644 (file)
--- a/src/script/cpp_api/s_player.h
+++ b/src/script/cpp_api/s_player.h
@@ -20,13 +20,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef S_PLAYER_H_
 #define S_PLAYER_H_
 
-#include <map>
-
 #include "cpp_api/s_base.h"
+#include "irr_v3d.h"
+#include "util/string.h"
 
+struct ToolCapabilities;
 
-class ScriptApiPlayer
-               : virtual public ScriptApiBase
+class ScriptApiPlayer : virtual public ScriptApiBase
 {
 public:
        virtual ~ScriptApiPlayer();
@@ -34,15 +34,17 @@ class ScriptApiPlayer
        void on_newplayer(ServerActiveObject *player);
        void on_dieplayer(ServerActiveObject *player);
        bool on_respawnplayer(ServerActiveObject *player);
-       bool on_prejoinplayer(std::string name, std::string ip, std::string &reason);
+       bool on_prejoinplayer(const std::string &name, const std::string &ip,
+                       std::string *reason);
        void on_joinplayer(ServerActiveObject *player);
-       void on_leaveplayer(ServerActiveObject *player);
+       void on_leaveplayer(ServerActiveObject *player, bool timeout);
        void on_cheat(ServerActiveObject *player, const std::string &cheat_type);
-
+       bool on_punchplayer(ServerActiveObject *player, ServerActiveObject *hitter,
+                       float time_from_last_punch, const ToolCapabilities *toolcap,
+                       v3f dir, s16 damage);
+       s16 on_player_hpchange(ServerActiveObject *player, s16 hp_change);
        void on_playerReceiveFields(ServerActiveObject *player,
-                       const std::string &formname,
-                       const std::map<std::string, std::string> &fields);
+                       const std::string &formname, const StringMap &fields);
 };
 
-
 #endif /* S_PLAYER_H_ */