Added a Player parameter to OnUpdatedSign and OnUpdatingSign Lua callbacks and to the cWorld:UpdateSign method (http://forum.mc-server.org/showthread.php?tid=464&pid=4393#pid4393)
git-svn-id: http://mc-server.googlecode.com/svn/trunk@814 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
parent
476748ac8b
commit
63bd1976cc
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
** Lua binding: AllToLua
|
** Lua binding: AllToLua
|
||||||
** Generated automatically by tolua++-1.0.92 on 08/29/12 22:33:21.
|
** Generated automatically by tolua++-1.0.92 on 09/01/12 23:31:58.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef __cplusplus
|
#ifndef __cplusplus
|
||||||
@ -8291,7 +8291,8 @@ static int tolua_AllToLua_cPlugin_OnUpdatedSign00(lua_State* tolua_S)
|
|||||||
!tolua_iscppstring(tolua_S,7,0,&tolua_err) ||
|
!tolua_iscppstring(tolua_S,7,0,&tolua_err) ||
|
||||||
!tolua_iscppstring(tolua_S,8,0,&tolua_err) ||
|
!tolua_iscppstring(tolua_S,8,0,&tolua_err) ||
|
||||||
!tolua_iscppstring(tolua_S,9,0,&tolua_err) ||
|
!tolua_iscppstring(tolua_S,9,0,&tolua_err) ||
|
||||||
!tolua_isnoobj(tolua_S,10,&tolua_err)
|
!tolua_isusertype(tolua_S,10,"cPlayer",0,&tolua_err) ||
|
||||||
|
!tolua_isnoobj(tolua_S,11,&tolua_err)
|
||||||
)
|
)
|
||||||
goto tolua_lerror;
|
goto tolua_lerror;
|
||||||
else
|
else
|
||||||
@ -8306,11 +8307,12 @@ static int tolua_AllToLua_cPlugin_OnUpdatedSign00(lua_State* tolua_S)
|
|||||||
const AString a_Line2 = ((const AString) tolua_tocppstring(tolua_S,7,0));
|
const AString a_Line2 = ((const AString) tolua_tocppstring(tolua_S,7,0));
|
||||||
const AString a_Line3 = ((const AString) tolua_tocppstring(tolua_S,8,0));
|
const AString a_Line3 = ((const AString) tolua_tocppstring(tolua_S,8,0));
|
||||||
const AString a_Line4 = ((const AString) tolua_tocppstring(tolua_S,9,0));
|
const AString a_Line4 = ((const AString) tolua_tocppstring(tolua_S,9,0));
|
||||||
|
cPlayer* a_Player = ((cPlayer*) tolua_tousertype(tolua_S,10,0));
|
||||||
#ifndef TOLUA_RELEASE
|
#ifndef TOLUA_RELEASE
|
||||||
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'OnUpdatedSign'", NULL);
|
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'OnUpdatedSign'", NULL);
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
bool tolua_ret = (bool) self->OnUpdatedSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4);
|
bool tolua_ret = (bool) self->OnUpdatedSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4,a_Player);
|
||||||
tolua_pushboolean(tolua_S,(bool)tolua_ret);
|
tolua_pushboolean(tolua_S,(bool)tolua_ret);
|
||||||
tolua_pushcppstring(tolua_S,(const char*)a_Line1);
|
tolua_pushcppstring(tolua_S,(const char*)a_Line1);
|
||||||
tolua_pushcppstring(tolua_S,(const char*)a_Line2);
|
tolua_pushcppstring(tolua_S,(const char*)a_Line2);
|
||||||
@ -8343,7 +8345,8 @@ static int tolua_AllToLua_cPlugin_OnUpdatingSign00(lua_State* tolua_S)
|
|||||||
!tolua_iscppstring(tolua_S,7,0,&tolua_err) ||
|
!tolua_iscppstring(tolua_S,7,0,&tolua_err) ||
|
||||||
!tolua_iscppstring(tolua_S,8,0,&tolua_err) ||
|
!tolua_iscppstring(tolua_S,8,0,&tolua_err) ||
|
||||||
!tolua_iscppstring(tolua_S,9,0,&tolua_err) ||
|
!tolua_iscppstring(tolua_S,9,0,&tolua_err) ||
|
||||||
!tolua_isnoobj(tolua_S,10,&tolua_err)
|
!tolua_isusertype(tolua_S,10,"cPlayer",0,&tolua_err) ||
|
||||||
|
!tolua_isnoobj(tolua_S,11,&tolua_err)
|
||||||
)
|
)
|
||||||
goto tolua_lerror;
|
goto tolua_lerror;
|
||||||
else
|
else
|
||||||
@ -8358,11 +8361,12 @@ static int tolua_AllToLua_cPlugin_OnUpdatingSign00(lua_State* tolua_S)
|
|||||||
AString a_Line2 = ((AString) tolua_tocppstring(tolua_S,7,0));
|
AString a_Line2 = ((AString) tolua_tocppstring(tolua_S,7,0));
|
||||||
AString a_Line3 = ((AString) tolua_tocppstring(tolua_S,8,0));
|
AString a_Line3 = ((AString) tolua_tocppstring(tolua_S,8,0));
|
||||||
AString a_Line4 = ((AString) tolua_tocppstring(tolua_S,9,0));
|
AString a_Line4 = ((AString) tolua_tocppstring(tolua_S,9,0));
|
||||||
|
cPlayer* a_Player = ((cPlayer*) tolua_tousertype(tolua_S,10,0));
|
||||||
#ifndef TOLUA_RELEASE
|
#ifndef TOLUA_RELEASE
|
||||||
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'OnUpdatingSign'", NULL);
|
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'OnUpdatingSign'", NULL);
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
bool tolua_ret = (bool) self->OnUpdatingSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4);
|
bool tolua_ret = (bool) self->OnUpdatingSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4,a_Player);
|
||||||
tolua_pushboolean(tolua_S,(bool)tolua_ret);
|
tolua_pushboolean(tolua_S,(bool)tolua_ret);
|
||||||
tolua_pushcppstring(tolua_S,(const char*)a_Line1);
|
tolua_pushcppstring(tolua_S,(const char*)a_Line1);
|
||||||
tolua_pushcppstring(tolua_S,(const char*)a_Line2);
|
tolua_pushcppstring(tolua_S,(const char*)a_Line2);
|
||||||
@ -8916,7 +8920,7 @@ public:
|
|||||||
return ( void ) cPlugin:: OnTakeDamage(a_Pawn,a_TakeDamageInfo);
|
return ( void ) cPlugin:: OnTakeDamage(a_Pawn,a_TakeDamageInfo);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
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) {
|
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) {
|
||||||
if (push_method("OnUpdatedSign", tolua_AllToLua_cPlugin_OnUpdatedSign00)) {
|
if (push_method("OnUpdatedSign", tolua_AllToLua_cPlugin_OnUpdatedSign00)) {
|
||||||
tolua_pushusertype(lua_state, (void*)a_World, "cWorld");
|
tolua_pushusertype(lua_state, (void*)a_World, "cWorld");
|
||||||
tolua_pushnumber(lua_state, (lua_Number)a_BlockX);
|
tolua_pushnumber(lua_state, (lua_Number)a_BlockX);
|
||||||
@ -8926,15 +8930,16 @@ public:
|
|||||||
tolua_pushcppstring(lua_state, (const char*)a_Line2);
|
tolua_pushcppstring(lua_state, (const char*)a_Line2);
|
||||||
tolua_pushcppstring(lua_state, (const char*)a_Line3);
|
tolua_pushcppstring(lua_state, (const char*)a_Line3);
|
||||||
tolua_pushcppstring(lua_state, (const char*)a_Line4);
|
tolua_pushcppstring(lua_state, (const char*)a_Line4);
|
||||||
ToluaBase::dbcall(lua_state, 9, 1);
|
tolua_pushusertype(lua_state, (void*)a_Player, "cPlayer");
|
||||||
|
ToluaBase::dbcall(lua_state, 10, 1);
|
||||||
bool tolua_ret = ( bool )tolua_toboolean(lua_state, -1, 0);
|
bool tolua_ret = ( bool )tolua_toboolean(lua_state, -1, 0);
|
||||||
lua_pop(lua_state, 1);
|
lua_pop(lua_state, 1);
|
||||||
return tolua_ret;
|
return tolua_ret;
|
||||||
} else {
|
} else {
|
||||||
return ( bool ) cPlugin:: OnUpdatedSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4);
|
return ( bool ) cPlugin:: OnUpdatedSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4,a_Player);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
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) {
|
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) {
|
||||||
if (push_method("OnUpdatingSign", tolua_AllToLua_cPlugin_OnUpdatingSign00)) {
|
if (push_method("OnUpdatingSign", tolua_AllToLua_cPlugin_OnUpdatingSign00)) {
|
||||||
tolua_pushusertype(lua_state, (void*)a_World, "cWorld");
|
tolua_pushusertype(lua_state, (void*)a_World, "cWorld");
|
||||||
tolua_pushnumber(lua_state, (lua_Number)a_BlockX);
|
tolua_pushnumber(lua_state, (lua_Number)a_BlockX);
|
||||||
@ -8944,12 +8949,13 @@ public:
|
|||||||
tolua_pushcppstring(lua_state, (const char*)a_Line2);
|
tolua_pushcppstring(lua_state, (const char*)a_Line2);
|
||||||
tolua_pushcppstring(lua_state, (const char*)a_Line3);
|
tolua_pushcppstring(lua_state, (const char*)a_Line3);
|
||||||
tolua_pushcppstring(lua_state, (const char*)a_Line4);
|
tolua_pushcppstring(lua_state, (const char*)a_Line4);
|
||||||
ToluaBase::dbcall(lua_state, 9, 1);
|
tolua_pushusertype(lua_state, (void*)a_Player, "cPlayer");
|
||||||
|
ToluaBase::dbcall(lua_state, 10, 1);
|
||||||
bool tolua_ret = ( bool )tolua_toboolean(lua_state, -1, 0);
|
bool tolua_ret = ( bool )tolua_toboolean(lua_state, -1, 0);
|
||||||
lua_pop(lua_state, 1);
|
lua_pop(lua_state, 1);
|
||||||
return tolua_ret;
|
return tolua_ret;
|
||||||
} else {
|
} else {
|
||||||
return ( bool ) cPlugin:: OnUpdatingSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4);
|
return ( bool ) cPlugin:: OnUpdatingSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4,a_Player);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
bool OnWeatherChanged( cWorld* a_World) {
|
bool OnWeatherChanged( cWorld* a_World) {
|
||||||
@ -9029,11 +9035,11 @@ public:
|
|||||||
void cPlugin__OnTakeDamage( cPawn* a_Pawn, TakeDamageInfo* a_TakeDamageInfo) {
|
void cPlugin__OnTakeDamage( cPawn* a_Pawn, TakeDamageInfo* a_TakeDamageInfo) {
|
||||||
return ( void )cPlugin::OnTakeDamage(a_Pawn,a_TakeDamageInfo);
|
return ( void )cPlugin::OnTakeDamage(a_Pawn,a_TakeDamageInfo);
|
||||||
};
|
};
|
||||||
bool cPlugin__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) {
|
bool cPlugin__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) {
|
||||||
return ( bool )cPlugin::OnUpdatedSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4);
|
return ( bool )cPlugin::OnUpdatedSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4,a_Player);
|
||||||
};
|
};
|
||||||
bool cPlugin__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) {
|
bool cPlugin__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) {
|
||||||
return ( bool )cPlugin::OnUpdatingSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4);
|
return ( bool )cPlugin::OnUpdatingSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4,a_Player);
|
||||||
};
|
};
|
||||||
bool cPlugin__OnWeatherChanged( cWorld* a_World) {
|
bool cPlugin__OnWeatherChanged( cWorld* a_World) {
|
||||||
return ( bool )cPlugin::OnWeatherChanged(a_World);
|
return ( bool )cPlugin::OnWeatherChanged(a_World);
|
||||||
@ -9802,7 +9808,8 @@ static int tolua_AllToLua_Lua__cPlugin_cPlugin__OnUpdatedSign00(lua_State* tolua
|
|||||||
!tolua_iscppstring(tolua_S,7,0,&tolua_err) ||
|
!tolua_iscppstring(tolua_S,7,0,&tolua_err) ||
|
||||||
!tolua_iscppstring(tolua_S,8,0,&tolua_err) ||
|
!tolua_iscppstring(tolua_S,8,0,&tolua_err) ||
|
||||||
!tolua_iscppstring(tolua_S,9,0,&tolua_err) ||
|
!tolua_iscppstring(tolua_S,9,0,&tolua_err) ||
|
||||||
!tolua_isnoobj(tolua_S,10,&tolua_err)
|
!tolua_isusertype(tolua_S,10,"cPlayer",0,&tolua_err) ||
|
||||||
|
!tolua_isnoobj(tolua_S,11,&tolua_err)
|
||||||
)
|
)
|
||||||
goto tolua_lerror;
|
goto tolua_lerror;
|
||||||
else
|
else
|
||||||
@ -9817,11 +9824,12 @@ static int tolua_AllToLua_Lua__cPlugin_cPlugin__OnUpdatedSign00(lua_State* tolua
|
|||||||
const AString a_Line2 = ((const AString) tolua_tocppstring(tolua_S,7,0));
|
const AString a_Line2 = ((const AString) tolua_tocppstring(tolua_S,7,0));
|
||||||
const AString a_Line3 = ((const AString) tolua_tocppstring(tolua_S,8,0));
|
const AString a_Line3 = ((const AString) tolua_tocppstring(tolua_S,8,0));
|
||||||
const AString a_Line4 = ((const AString) tolua_tocppstring(tolua_S,9,0));
|
const AString a_Line4 = ((const AString) tolua_tocppstring(tolua_S,9,0));
|
||||||
|
cPlayer* a_Player = ((cPlayer*) tolua_tousertype(tolua_S,10,0));
|
||||||
#ifndef TOLUA_RELEASE
|
#ifndef TOLUA_RELEASE
|
||||||
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'cPlugin__OnUpdatedSign'", NULL);
|
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'cPlugin__OnUpdatedSign'", NULL);
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
bool tolua_ret = (bool) self->cPlugin__OnUpdatedSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4);
|
bool tolua_ret = (bool) self->cPlugin__OnUpdatedSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4,a_Player);
|
||||||
tolua_pushboolean(tolua_S,(bool)tolua_ret);
|
tolua_pushboolean(tolua_S,(bool)tolua_ret);
|
||||||
tolua_pushcppstring(tolua_S,(const char*)a_Line1);
|
tolua_pushcppstring(tolua_S,(const char*)a_Line1);
|
||||||
tolua_pushcppstring(tolua_S,(const char*)a_Line2);
|
tolua_pushcppstring(tolua_S,(const char*)a_Line2);
|
||||||
@ -9854,7 +9862,8 @@ static int tolua_AllToLua_Lua__cPlugin_cPlugin__OnUpdatingSign00(lua_State* tolu
|
|||||||
!tolua_iscppstring(tolua_S,7,0,&tolua_err) ||
|
!tolua_iscppstring(tolua_S,7,0,&tolua_err) ||
|
||||||
!tolua_iscppstring(tolua_S,8,0,&tolua_err) ||
|
!tolua_iscppstring(tolua_S,8,0,&tolua_err) ||
|
||||||
!tolua_iscppstring(tolua_S,9,0,&tolua_err) ||
|
!tolua_iscppstring(tolua_S,9,0,&tolua_err) ||
|
||||||
!tolua_isnoobj(tolua_S,10,&tolua_err)
|
!tolua_isusertype(tolua_S,10,"cPlayer",0,&tolua_err) ||
|
||||||
|
!tolua_isnoobj(tolua_S,11,&tolua_err)
|
||||||
)
|
)
|
||||||
goto tolua_lerror;
|
goto tolua_lerror;
|
||||||
else
|
else
|
||||||
@ -9869,11 +9878,12 @@ static int tolua_AllToLua_Lua__cPlugin_cPlugin__OnUpdatingSign00(lua_State* tolu
|
|||||||
AString a_Line2 = ((AString) tolua_tocppstring(tolua_S,7,0));
|
AString a_Line2 = ((AString) tolua_tocppstring(tolua_S,7,0));
|
||||||
AString a_Line3 = ((AString) tolua_tocppstring(tolua_S,8,0));
|
AString a_Line3 = ((AString) tolua_tocppstring(tolua_S,8,0));
|
||||||
AString a_Line4 = ((AString) tolua_tocppstring(tolua_S,9,0));
|
AString a_Line4 = ((AString) tolua_tocppstring(tolua_S,9,0));
|
||||||
|
cPlayer* a_Player = ((cPlayer*) tolua_tousertype(tolua_S,10,0));
|
||||||
#ifndef TOLUA_RELEASE
|
#ifndef TOLUA_RELEASE
|
||||||
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'cPlugin__OnUpdatingSign'", NULL);
|
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'cPlugin__OnUpdatingSign'", NULL);
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
bool tolua_ret = (bool) self->cPlugin__OnUpdatingSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4);
|
bool tolua_ret = (bool) self->cPlugin__OnUpdatingSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4,a_Player);
|
||||||
tolua_pushboolean(tolua_S,(bool)tolua_ret);
|
tolua_pushboolean(tolua_S,(bool)tolua_ret);
|
||||||
tolua_pushcppstring(tolua_S,(const char*)a_Line1);
|
tolua_pushcppstring(tolua_S,(const char*)a_Line1);
|
||||||
tolua_pushcppstring(tolua_S,(const char*)a_Line2);
|
tolua_pushcppstring(tolua_S,(const char*)a_Line2);
|
||||||
@ -10438,7 +10448,7 @@ public:
|
|||||||
return ( void ) cPlugin_NewLua:: OnTakeDamage(a_Pawn,a_TakeDamageInfo);
|
return ( void ) cPlugin_NewLua:: OnTakeDamage(a_Pawn,a_TakeDamageInfo);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
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) {
|
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) {
|
||||||
if (push_method("OnUpdatedSign", tolua_AllToLua_cPlugin_OnUpdatedSign00)) {
|
if (push_method("OnUpdatedSign", tolua_AllToLua_cPlugin_OnUpdatedSign00)) {
|
||||||
tolua_pushusertype(lua_state, (void*)a_World, "cWorld");
|
tolua_pushusertype(lua_state, (void*)a_World, "cWorld");
|
||||||
tolua_pushnumber(lua_state, (lua_Number)a_BlockX);
|
tolua_pushnumber(lua_state, (lua_Number)a_BlockX);
|
||||||
@ -10448,15 +10458,16 @@ public:
|
|||||||
tolua_pushcppstring(lua_state, (const char*)a_Line2);
|
tolua_pushcppstring(lua_state, (const char*)a_Line2);
|
||||||
tolua_pushcppstring(lua_state, (const char*)a_Line3);
|
tolua_pushcppstring(lua_state, (const char*)a_Line3);
|
||||||
tolua_pushcppstring(lua_state, (const char*)a_Line4);
|
tolua_pushcppstring(lua_state, (const char*)a_Line4);
|
||||||
ToluaBase::dbcall(lua_state, 9, 1);
|
tolua_pushusertype(lua_state, (void*)a_Player, "cPlayer");
|
||||||
|
ToluaBase::dbcall(lua_state, 10, 1);
|
||||||
bool tolua_ret = ( bool )tolua_toboolean(lua_state, -1, 0);
|
bool tolua_ret = ( bool )tolua_toboolean(lua_state, -1, 0);
|
||||||
lua_pop(lua_state, 1);
|
lua_pop(lua_state, 1);
|
||||||
return tolua_ret;
|
return tolua_ret;
|
||||||
} else {
|
} else {
|
||||||
return ( bool ) cPlugin_NewLua:: OnUpdatedSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4);
|
return ( bool ) cPlugin_NewLua:: OnUpdatedSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4,a_Player);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
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) {
|
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) {
|
||||||
if (push_method("OnUpdatingSign", tolua_AllToLua_cPlugin_OnUpdatingSign00)) {
|
if (push_method("OnUpdatingSign", tolua_AllToLua_cPlugin_OnUpdatingSign00)) {
|
||||||
tolua_pushusertype(lua_state, (void*)a_World, "cWorld");
|
tolua_pushusertype(lua_state, (void*)a_World, "cWorld");
|
||||||
tolua_pushnumber(lua_state, (lua_Number)a_BlockX);
|
tolua_pushnumber(lua_state, (lua_Number)a_BlockX);
|
||||||
@ -10466,12 +10477,13 @@ public:
|
|||||||
tolua_pushcppstring(lua_state, (const char*)a_Line2);
|
tolua_pushcppstring(lua_state, (const char*)a_Line2);
|
||||||
tolua_pushcppstring(lua_state, (const char*)a_Line3);
|
tolua_pushcppstring(lua_state, (const char*)a_Line3);
|
||||||
tolua_pushcppstring(lua_state, (const char*)a_Line4);
|
tolua_pushcppstring(lua_state, (const char*)a_Line4);
|
||||||
ToluaBase::dbcall(lua_state, 9, 1);
|
tolua_pushusertype(lua_state, (void*)a_Player, "cPlayer");
|
||||||
|
ToluaBase::dbcall(lua_state, 10, 1);
|
||||||
bool tolua_ret = ( bool )tolua_toboolean(lua_state, -1, 0);
|
bool tolua_ret = ( bool )tolua_toboolean(lua_state, -1, 0);
|
||||||
lua_pop(lua_state, 1);
|
lua_pop(lua_state, 1);
|
||||||
return tolua_ret;
|
return tolua_ret;
|
||||||
} else {
|
} else {
|
||||||
return ( bool ) cPlugin_NewLua:: OnUpdatingSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4);
|
return ( bool ) cPlugin_NewLua:: OnUpdatingSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4,a_Player);
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
bool OnWeatherChanged( cWorld* a_World) {
|
bool OnWeatherChanged( cWorld* a_World) {
|
||||||
@ -10554,11 +10566,11 @@ public:
|
|||||||
void cPlugin_NewLua__OnTakeDamage( cPawn* a_Pawn, TakeDamageInfo* a_TakeDamageInfo) {
|
void cPlugin_NewLua__OnTakeDamage( cPawn* a_Pawn, TakeDamageInfo* a_TakeDamageInfo) {
|
||||||
return ( void )cPlugin_NewLua::OnTakeDamage(a_Pawn,a_TakeDamageInfo);
|
return ( void )cPlugin_NewLua::OnTakeDamage(a_Pawn,a_TakeDamageInfo);
|
||||||
};
|
};
|
||||||
bool cPlugin_NewLua__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) {
|
bool cPlugin_NewLua__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) {
|
||||||
return ( bool )cPlugin_NewLua::OnUpdatedSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4);
|
return ( bool )cPlugin_NewLua::OnUpdatedSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4,a_Player);
|
||||||
};
|
};
|
||||||
bool cPlugin_NewLua__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) {
|
bool cPlugin_NewLua__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) {
|
||||||
return ( bool )cPlugin_NewLua::OnUpdatingSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4);
|
return ( bool )cPlugin_NewLua::OnUpdatingSign(a_World,a_BlockX,a_BlockY,a_BlockZ,a_Line1,a_Line2,a_Line3,a_Line4,a_Player);
|
||||||
};
|
};
|
||||||
bool cPlugin_NewLua__OnWeatherChanged( cWorld* a_World) {
|
bool cPlugin_NewLua__OnWeatherChanged( cWorld* a_World) {
|
||||||
return ( bool )cPlugin_NewLua::OnWeatherChanged(a_World);
|
return ( bool )cPlugin_NewLua::OnWeatherChanged(a_World);
|
||||||
@ -11101,7 +11113,8 @@ static int tolua_AllToLua_cWorld_UpdateSign00(lua_State* tolua_S)
|
|||||||
!tolua_iscppstring(tolua_S,6,0,&tolua_err) ||
|
!tolua_iscppstring(tolua_S,6,0,&tolua_err) ||
|
||||||
!tolua_iscppstring(tolua_S,7,0,&tolua_err) ||
|
!tolua_iscppstring(tolua_S,7,0,&tolua_err) ||
|
||||||
!tolua_iscppstring(tolua_S,8,0,&tolua_err) ||
|
!tolua_iscppstring(tolua_S,8,0,&tolua_err) ||
|
||||||
!tolua_isnoobj(tolua_S,9,&tolua_err)
|
!tolua_isusertype(tolua_S,9,"cPlayer",1,&tolua_err) ||
|
||||||
|
!tolua_isnoobj(tolua_S,10,&tolua_err)
|
||||||
)
|
)
|
||||||
goto tolua_lerror;
|
goto tolua_lerror;
|
||||||
else
|
else
|
||||||
@ -11115,11 +11128,12 @@ static int tolua_AllToLua_cWorld_UpdateSign00(lua_State* tolua_S)
|
|||||||
const AString a_Line2 = ((const AString) tolua_tocppstring(tolua_S,6,0));
|
const AString a_Line2 = ((const AString) tolua_tocppstring(tolua_S,6,0));
|
||||||
const AString a_Line3 = ((const AString) tolua_tocppstring(tolua_S,7,0));
|
const AString a_Line3 = ((const AString) tolua_tocppstring(tolua_S,7,0));
|
||||||
const AString a_Line4 = ((const AString) tolua_tocppstring(tolua_S,8,0));
|
const AString a_Line4 = ((const AString) tolua_tocppstring(tolua_S,8,0));
|
||||||
|
cPlayer* a_Player = ((cPlayer*) tolua_tousertype(tolua_S,9,NULL));
|
||||||
#ifndef TOLUA_RELEASE
|
#ifndef TOLUA_RELEASE
|
||||||
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'UpdateSign'", NULL);
|
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'UpdateSign'", NULL);
|
||||||
#endif
|
#endif
|
||||||
{
|
{
|
||||||
self->UpdateSign(a_X,a_Y,a_Z,a_Line1,a_Line2,a_Line3,a_Line4);
|
self->UpdateSign(a_X,a_Y,a_Z,a_Line1,a_Line2,a_Line3,a_Line4,a_Player);
|
||||||
tolua_pushcppstring(tolua_S,(const char*)a_Line1);
|
tolua_pushcppstring(tolua_S,(const char*)a_Line1);
|
||||||
tolua_pushcppstring(tolua_S,(const char*)a_Line2);
|
tolua_pushcppstring(tolua_S,(const char*)a_Line2);
|
||||||
tolua_pushcppstring(tolua_S,(const char*)a_Line3);
|
tolua_pushcppstring(tolua_S,(const char*)a_Line3);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
** Lua binding: AllToLua
|
** Lua binding: AllToLua
|
||||||
** Generated automatically by tolua++-1.0.92 on 08/29/12 22:33:21.
|
** Generated automatically by tolua++-1.0.92 on 09/01/12 23:31:58.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Exported function */
|
/* Exported function */
|
||||||
|
@ -237,7 +237,7 @@ void cPlugin::OnTakeDamage(cPawn * a_Pawn, TakeDamageInfo * a_TakeDamageInfo)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
bool cPlugin::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)
|
bool cPlugin::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)
|
||||||
{
|
{
|
||||||
UNUSED(a_World);
|
UNUSED(a_World);
|
||||||
UNUSED(a_BlockX);
|
UNUSED(a_BlockX);
|
||||||
@ -247,6 +247,7 @@ bool cPlugin::OnUpdatedSign(cWorld * a_World, int a_BlockX, int a_BlockY, int a_
|
|||||||
UNUSED(a_Line2);
|
UNUSED(a_Line2);
|
||||||
UNUSED(a_Line3);
|
UNUSED(a_Line3);
|
||||||
UNUSED(a_Line4);
|
UNUSED(a_Line4);
|
||||||
|
UNUSED(a_Player);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -254,7 +255,7 @@ bool cPlugin::OnUpdatedSign(cWorld * a_World, int a_BlockX, int a_BlockY, int a_
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
bool cPlugin::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)
|
bool cPlugin::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)
|
||||||
{
|
{
|
||||||
UNUSED(a_World);
|
UNUSED(a_World);
|
||||||
UNUSED(a_BlockX);
|
UNUSED(a_BlockX);
|
||||||
@ -264,6 +265,7 @@ bool cPlugin::OnUpdatingSign(cWorld * a_World, int a_BlockX, int a_BlockY, int a
|
|||||||
UNUSED(a_Line2);
|
UNUSED(a_Line2);
|
||||||
UNUSED(a_Line3);
|
UNUSED(a_Line3);
|
||||||
UNUSED(a_Line4);
|
UNUSED(a_Line4);
|
||||||
|
UNUSED(a_Player);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -58,8 +58,8 @@ public:
|
|||||||
virtual bool OnPostCrafting (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe);
|
virtual bool OnPostCrafting (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe);
|
||||||
virtual bool OnPreCrafting (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe);
|
virtual bool OnPreCrafting (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe);
|
||||||
virtual void OnTakeDamage (cPawn * a_Pawn, TakeDamageInfo * a_TakeDamageInfo );
|
virtual void OnTakeDamage (cPawn * a_Pawn, TakeDamageInfo * a_TakeDamageInfo );
|
||||||
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);
|
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);
|
||||||
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);
|
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);
|
||||||
virtual bool OnWeatherChanged (cWorld * a_World);
|
virtual bool OnWeatherChanged (cWorld * a_World);
|
||||||
|
|
||||||
// Accessors
|
// Accessors
|
||||||
|
@ -585,7 +585,7 @@ bool cPluginManager::CallHookWeatherChanged(cWorld * a_World)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
bool cPluginManager::CallHookUpdatingSign(cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, AString & a_Line1, AString & a_Line2, AString & a_Line3, AString & a_Line4)
|
bool cPluginManager::CallHookUpdatingSign(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)
|
||||||
{
|
{
|
||||||
HookMap::iterator Plugins = m_Hooks.find(HOOK_UPDATING_SIGN);
|
HookMap::iterator Plugins = m_Hooks.find(HOOK_UPDATING_SIGN);
|
||||||
if (Plugins == m_Hooks.end())
|
if (Plugins == m_Hooks.end())
|
||||||
@ -594,7 +594,7 @@ bool cPluginManager::CallHookUpdatingSign(cWorld * a_World, int a_BlockX, int a_
|
|||||||
}
|
}
|
||||||
for (PluginList::iterator itr = Plugins->second.begin(); itr != Plugins->second.end(); ++itr)
|
for (PluginList::iterator itr = Plugins->second.begin(); itr != Plugins->second.end(); ++itr)
|
||||||
{
|
{
|
||||||
if ((*itr)->OnUpdatingSign(a_World, a_BlockX, a_BlockY, a_BlockZ, a_Line1, a_Line2, a_Line3, a_Line4))
|
if ((*itr)->OnUpdatingSign(a_World, a_BlockX, a_BlockY, a_BlockZ, a_Line1, a_Line2, a_Line3, a_Line4, a_Player))
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -606,7 +606,7 @@ bool cPluginManager::CallHookUpdatingSign(cWorld * a_World, int a_BlockX, int a_
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
bool cPluginManager::CallHookUpdatedSign(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)
|
bool cPluginManager::CallHookUpdatedSign(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)
|
||||||
{
|
{
|
||||||
HookMap::iterator Plugins = m_Hooks.find(HOOK_UPDATED_SIGN);
|
HookMap::iterator Plugins = m_Hooks.find(HOOK_UPDATED_SIGN);
|
||||||
if (Plugins == m_Hooks.end())
|
if (Plugins == m_Hooks.end())
|
||||||
@ -615,7 +615,7 @@ bool cPluginManager::CallHookUpdatedSign(cWorld * a_World, int a_BlockX, int a_B
|
|||||||
}
|
}
|
||||||
for (PluginList::iterator itr = Plugins->second.begin(); itr != Plugins->second.end(); ++itr)
|
for (PluginList::iterator itr = Plugins->second.begin(); itr != Plugins->second.end(); ++itr)
|
||||||
{
|
{
|
||||||
if ((*itr)->OnUpdatedSign(a_World, a_BlockX, a_BlockY, a_BlockZ, a_Line1, a_Line2, a_Line3, a_Line4))
|
if ((*itr)->OnUpdatedSign(a_World, a_BlockX, a_BlockY, a_BlockZ, a_Line1, a_Line2, a_Line3, a_Line4, a_Player))
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -112,8 +112,8 @@ public: //tolua_export
|
|||||||
bool CallHookLogin (cClientHandle * a_Client, int a_ProtocolVersion, const AString & a_Username);
|
bool CallHookLogin (cClientHandle * a_Client, int a_ProtocolVersion, const AString & a_Username);
|
||||||
bool CallHookPostCrafting (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe);
|
bool CallHookPostCrafting (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe);
|
||||||
bool CallHookPreCrafting (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe);
|
bool CallHookPreCrafting (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe);
|
||||||
bool CallHookUpdatedSign (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);
|
bool CallHookUpdatedSign (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);
|
||||||
bool CallHookUpdatingSign (cWorld * a_World, int a_BlockX, int a_BlockY, int a_BlockZ, AString & a_Line1, AString & a_Line2, AString & a_Line3, AString & a_Line4);
|
bool CallHookUpdatingSign (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);
|
||||||
bool CallHookWeatherChanged (cWorld * a_World);
|
bool CallHookWeatherChanged (cWorld * a_World);
|
||||||
|
|
||||||
void RemoveHooks( cPlugin* a_Plugin );
|
void RemoveHooks( cPlugin* a_Plugin );
|
||||||
|
@ -555,7 +555,8 @@ bool cPlugin_NewLua::OnWeatherChanged(cWorld * a_World)
|
|||||||
bool cPlugin_NewLua::OnUpdatingSign(
|
bool cPlugin_NewLua::OnUpdatingSign(
|
||||||
cWorld * a_World,
|
cWorld * a_World,
|
||||||
int a_BlockX, int a_BlockY, int a_BlockZ,
|
int a_BlockX, int a_BlockY, int a_BlockZ,
|
||||||
AString & a_Line1, AString & a_Line2, AString & a_Line3, AString & a_Line4
|
AString & a_Line1, AString & a_Line2, AString & a_Line3, AString & a_Line4,
|
||||||
|
cPlayer * a_Player
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
cCSLock Lock(m_CriticalSection);
|
cCSLock Lock(m_CriticalSection);
|
||||||
@ -572,8 +573,9 @@ bool cPlugin_NewLua::OnUpdatingSign(
|
|||||||
tolua_pushstring (m_LuaState, a_Line2.c_str());
|
tolua_pushstring (m_LuaState, a_Line2.c_str());
|
||||||
tolua_pushstring (m_LuaState, a_Line3.c_str());
|
tolua_pushstring (m_LuaState, a_Line3.c_str());
|
||||||
tolua_pushstring (m_LuaState, a_Line4.c_str());
|
tolua_pushstring (m_LuaState, a_Line4.c_str());
|
||||||
|
tolua_pushusertype(m_LuaState, (void *)a_Player, "cPlayer");
|
||||||
|
|
||||||
if (!CallFunction(8, 5, "OnUpdatingSign"))
|
if (!CallFunction(9, 5, "OnUpdatingSign"))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -605,7 +607,8 @@ bool cPlugin_NewLua::OnUpdatingSign(
|
|||||||
bool cPlugin_NewLua::OnUpdatedSign(
|
bool cPlugin_NewLua::OnUpdatedSign(
|
||||||
cWorld * a_World,
|
cWorld * a_World,
|
||||||
int a_BlockX, int a_BlockY, int a_BlockZ,
|
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
|
const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4,
|
||||||
|
cPlayer * a_Player
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
cCSLock Lock(m_CriticalSection);
|
cCSLock Lock(m_CriticalSection);
|
||||||
@ -622,8 +625,9 @@ bool cPlugin_NewLua::OnUpdatedSign(
|
|||||||
tolua_pushstring (m_LuaState, a_Line2.c_str());
|
tolua_pushstring (m_LuaState, a_Line2.c_str());
|
||||||
tolua_pushstring (m_LuaState, a_Line3.c_str());
|
tolua_pushstring (m_LuaState, a_Line3.c_str());
|
||||||
tolua_pushstring (m_LuaState, a_Line4.c_str());
|
tolua_pushstring (m_LuaState, a_Line4.c_str());
|
||||||
|
tolua_pushusertype(m_LuaState, (void *)a_Player, "cPlayer");
|
||||||
|
|
||||||
if (!CallFunction(8, 1, "OnUpdatedSign"))
|
if (!CallFunction(9, 1, "OnUpdatedSign"))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -42,8 +42,8 @@ public: //tolua_export
|
|||||||
virtual bool OnPostCrafting (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe) 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 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 void OnTakeDamage (cPawn* a_Pawn, 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) 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) 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;
|
virtual bool OnWeatherChanged (cWorld * a_World) override;
|
||||||
|
|
||||||
const AString & GetDirectory(void) const {return m_Directory; }
|
const AString & GetDirectory(void) const {return m_Directory; }
|
||||||
|
@ -337,7 +337,8 @@ bool cPlugin_Squirrel::OnWeatherChanged(cWorld * a_World)
|
|||||||
bool cPlugin_Squirrel::OnUpdatingSign(
|
bool cPlugin_Squirrel::OnUpdatingSign(
|
||||||
cWorld * a_World,
|
cWorld * a_World,
|
||||||
int a_BlockX, int a_BlockY, int a_BlockZ,
|
int a_BlockX, int a_BlockY, int a_BlockZ,
|
||||||
AString & a_Line1, AString & a_Line2, AString & a_Line3, AString & a_Line4
|
AString & a_Line1, AString & a_Line2, AString & a_Line3, AString & a_Line4,
|
||||||
|
cPlayer * a_Player
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
cCSLock Lock(m_CriticalSection);
|
cCSLock Lock(m_CriticalSection);
|
||||||
@ -352,7 +353,8 @@ bool cPlugin_Squirrel::OnUpdatingSign(
|
|||||||
a_Line1,
|
a_Line1,
|
||||||
a_Line2,
|
a_Line2,
|
||||||
a_Line3,
|
a_Line3,
|
||||||
a_Line4
|
a_Line4,
|
||||||
|
a_Player
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -363,7 +365,8 @@ bool cPlugin_Squirrel::OnUpdatingSign(
|
|||||||
bool cPlugin_Squirrel::OnUpdatedSign(
|
bool cPlugin_Squirrel::OnUpdatedSign(
|
||||||
cWorld * a_World,
|
cWorld * a_World,
|
||||||
int a_BlockX, int a_BlockY, int a_BlockZ,
|
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
|
const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4,
|
||||||
|
cPlayer * a_Player
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
cCSLock Lock(m_CriticalSection);
|
cCSLock Lock(m_CriticalSection);
|
||||||
@ -378,6 +381,7 @@ bool cPlugin_Squirrel::OnUpdatedSign(
|
|||||||
a_Line1,
|
a_Line1,
|
||||||
a_Line2,
|
a_Line2,
|
||||||
a_Line3,
|
a_Line3,
|
||||||
a_Line4
|
a_Line4,
|
||||||
|
a_Player
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -38,8 +38,8 @@ public:
|
|||||||
virtual bool OnPostCrafting (const cPlayer * a_Player, const cCraftingGrid * a_Grid, cCraftingRecipe * a_Recipe) 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 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 void OnTakeDamage (cPawn* a_Pawn, 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) 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) 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;
|
virtual bool OnWeatherChanged (cWorld * a_World) override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
@ -1911,18 +1911,18 @@ void cWorld::ChunkLoadFailed(int a_ChunkX, int a_ChunkY, int a_ChunkZ)
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
void cWorld::UpdateSign(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)
|
void cWorld::UpdateSign(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)
|
||||||
{
|
{
|
||||||
AString Line1(a_Line1);
|
AString Line1(a_Line1);
|
||||||
AString Line2(a_Line2);
|
AString Line2(a_Line2);
|
||||||
AString Line3(a_Line3);
|
AString Line3(a_Line3);
|
||||||
AString Line4(a_Line4);
|
AString Line4(a_Line4);
|
||||||
if (cRoot::Get()->GetPluginManager()->CallHookUpdatingSign(this, a_BlockX, a_BlockY, a_BlockZ, Line1, Line2, Line3, Line4))
|
if (cRoot::Get()->GetPluginManager()->CallHookUpdatingSign(this, a_BlockX, a_BlockY, a_BlockZ, Line1, Line2, Line3, Line4, a_Player))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
m_ChunkMap->UpdateSign(a_BlockX, a_BlockY, a_BlockZ, Line1, Line2, Line3, Line4);
|
m_ChunkMap->UpdateSign(a_BlockX, a_BlockY, a_BlockZ, Line1, Line2, Line3, Line4);
|
||||||
cRoot::Get()->GetPluginManager()->CallHookUpdatedSign(this, a_BlockX, a_BlockY, a_BlockZ, Line1, Line2, Line3, Line4);
|
cRoot::Get()->GetPluginManager()->CallHookUpdatedSign(this, a_BlockX, a_BlockY, a_BlockZ, Line1, Line2, Line3, Line4, a_Player);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -216,7 +216,8 @@ public:
|
|||||||
/// Marks the chunk as failed-to-load:
|
/// Marks the chunk as failed-to-load:
|
||||||
void ChunkLoadFailed(int a_ChunkX, int a_ChunkY, int a_ChunkZ);
|
void ChunkLoadFailed(int a_ChunkX, int a_ChunkY, int a_ChunkZ);
|
||||||
|
|
||||||
void UpdateSign(int a_X, int a_Y, int a_Z, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4); //tolua_export
|
/// Updates the sign, askin gplugins for permission forst. a_Player is the player who changed the sign, may be NULL
|
||||||
|
void UpdateSign(int a_X, int a_Y, int a_Z, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4, cPlayer * a_Player = NULL); //tolua_export
|
||||||
|
|
||||||
/// Marks (a_Stay == true) or unmarks (a_Stay == false) chunks as non-unloadable. To be used only by cChunkStay!
|
/// Marks (a_Stay == true) or unmarks (a_Stay == false) chunks as non-unloadable. To be used only by cChunkStay!
|
||||||
void ChunksStay(const cChunkCoordsList & a_Chunks, bool a_Stay = true);
|
void ChunksStay(const cChunkCoordsList & a_Chunks, bool a_Stay = true);
|
||||||
|
Loading…
Reference in New Issue
Block a user