From 912a1e7adc650d20b0302a3dfe45816b5e541bc7 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Fri, 21 Dec 2012 11:04:08 +0000 Subject: Refactored the TakeDamage API to take equipped weapon and armor into consideration (PvP untested) http://forum.mc-server.org/showthread.php?tid=625 git-svn-id: http://mc-server.googlecode.com/svn/trunk@1087 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Plugin_NewLua.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'source/Plugin_NewLua.h') diff --git a/source/Plugin_NewLua.h b/source/Plugin_NewLua.h index 88fd98963..dbaf3b6c6 100644 --- a/source/Plugin_NewLua.h +++ b/source/Plugin_NewLua.h @@ -14,9 +14,14 @@ typedef struct lua_State lua_State; -class cPlugin_NewLua : public cPlugin, public cWebPlugin //tolua_export -{ //tolua_export -public: //tolua_export +// tolua_begin +class cPlugin_NewLua : + public cPlugin, + public cWebPlugin +{ +public: + // tolua_end + cPlugin_NewLua( const AString & a_PluginDirectory ); ~cPlugin_NewLua(); @@ -41,7 +46,7 @@ public: //tolua_export virtual void OnPlayerSpawn (cPlayer * a_Player ) override; virtual bool OnPostCrafting (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe) override; virtual bool OnPreCrafting (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe) override; - virtual void OnTakeDamage (cPawn * a_Pawn, TakeDamageInfo * a_TakeDamageInfo ) override; + virtual bool OnTakeDamage (cPawn & a_Receiver, TakeDamageInfo & a_TakeDamageInfo) override; virtual bool OnUpdatedSign (cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4, cPlayer * a_Player) override; virtual bool OnUpdatingSign (cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, AString & a_Line1, AString & a_Line2, AString & a_Line3, AString & a_Line4, cPlayer * a_Player) override; virtual bool OnWeatherChanged (cWorld * a_World) override; -- cgit v1.2.3