From f0fc0edd21b9340ce48561a5fceee29e4e055dff Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Fri, 24 Aug 2012 09:49:00 +0000 Subject: cPickup doesn't use cPackets. Also, Lua API change, OnCollectItem -> OnCollectPickup; first param is cPlayer to match other callbacks. git-svn-id: http://mc-server.googlecode.com/svn/trunk@786 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cPlugin_Squirrel.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'source/cPlugin_Squirrel.cpp') diff --git a/source/cPlugin_Squirrel.cpp b/source/cPlugin_Squirrel.cpp index f0152f240..bfd5a7037 100644 --- a/source/cPlugin_Squirrel.cpp +++ b/source/cPlugin_Squirrel.cpp @@ -99,13 +99,16 @@ void cPlugin_Squirrel::Tick(float a_Dt) -bool cPlugin_Squirrel::OnCollectItem( cPickup* a_Pickup, cPlayer* a_Player ) +bool cPlugin_Squirrel::OnCollectPickup(cPlayer * a_Player, cPickup * a_Pickup) { - cCSLock Lock( m_CriticalSection ); + cCSLock Lock(m_CriticalSection); - if(!m_Plugin->HasFunction("OnCollectItem")) return false; + if (!m_Plugin->HasFunction("OnCollectPickup")) + { + return false; + } - return m_Plugin->GetFunction("OnCollectItem").Evaluate(a_Pickup, a_Player); + return m_Plugin->GetFunction("OnCollectPickup").Evaluate(a_Player, a_Pickup); } -- cgit v1.2.3