From 6b34a944779e53d8708e40c1420e0672d451dd01 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sun, 11 Nov 2012 14:05:48 +0000 Subject: Cleanup: Removed deprecated functions from Lua API git-svn-id: http://mc-server.googlecode.com/svn/trunk@1033 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Bindings.cpp | 104 +---------------------------------------------- source/Bindings.h | 2 +- source/Item.h | 8 ---- source/Player.h | 2 - source/Plugin_NewLua.cpp | 12 ------ source/Plugin_NewLua.h | 2 - 6 files changed, 2 insertions(+), 128 deletions(-) (limited to 'source') diff --git a/source/Bindings.cpp b/source/Bindings.cpp index ed082c93e..3826711b5 100644 --- a/source/Bindings.cpp +++ b/source/Bindings.cpp @@ -1,6 +1,6 @@ /* ** Lua binding: AllToLua -** Generated automatically by tolua++-1.0.92 on 11/11/12 14:50:43. +** Generated automatically by tolua++-1.0.92 on 11/11/12 15:02:07. */ #ifndef __cplusplus @@ -6058,38 +6058,6 @@ static int tolua_AllToLua_cPlayer_GetEyePosition00(lua_State* tolua_S) } #endif //#ifndef TOLUA_DISABLE -/* method: GetFlying of class cPlayer */ -#ifndef TOLUA_DISABLE_tolua_AllToLua_cPlayer_GetFlying00 -static int tolua_AllToLua_cPlayer_GetFlying00(lua_State* tolua_S) -{ -#ifndef TOLUA_RELEASE - tolua_Error tolua_err; - if ( - !tolua_isusertype(tolua_S,1,"cPlayer",0,&tolua_err) || - !tolua_isnoobj(tolua_S,2,&tolua_err) - ) - goto tolua_lerror; - else -#endif - { - cPlayer* self = (cPlayer*) tolua_tousertype(tolua_S,1,0); -#ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'GetFlying'", NULL); -#endif - { - bool tolua_ret = (bool) self->GetFlying(); - tolua_pushboolean(tolua_S,(bool)tolua_ret); - } - } - return 1; -#ifndef TOLUA_RELEASE - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'GetFlying'.",&tolua_err); - return 0; -#endif -} -#endif //#ifndef TOLUA_DISABLE - /* method: IsOnGround of class cPlayer */ #ifndef TOLUA_DISABLE_tolua_AllToLua_cPlayer_IsOnGround00 static int tolua_AllToLua_cPlayer_IsOnGround00(lua_State* tolua_S) @@ -10707,39 +10675,6 @@ static int tolua_AllToLua_cPlugin_NewLua_Tick00(lua_State* tolua_S) } #endif //#ifndef TOLUA_DISABLE -/* method: CreateWebPlugin of class cPlugin_NewLua */ -#ifndef TOLUA_DISABLE_tolua_AllToLua_cPlugin_NewLua_CreateWebPlugin00 -static int tolua_AllToLua_cPlugin_NewLua_CreateWebPlugin00(lua_State* tolua_S) -{ -#ifndef TOLUA_RELEASE - tolua_Error tolua_err; - if ( - !tolua_isusertype(tolua_S,1,"cPlugin_NewLua",0,&tolua_err) || - !tolua_isnoobj(tolua_S,2,&tolua_err) - ) - goto tolua_lerror; - else -#endif - { - cPlugin_NewLua* self = (cPlugin_NewLua*) tolua_tousertype(tolua_S,1,0); - lua_State* a_LuaState = tolua_S; -#ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'CreateWebPlugin'", NULL); -#endif - { - OBSOLETE cPlugin_NewLua* tolua_ret = (OBSOLETE cPlugin_NewLua*) self->CreateWebPlugin(a_LuaState); - tolua_pushusertype(tolua_S,(void*)tolua_ret,"cPlugin_NewLua"); - } - } - return 1; -#ifndef TOLUA_RELEASE - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'CreateWebPlugin'.",&tolua_err); - return 0; -#endif -} -#endif //#ifndef TOLUA_DISABLE - /* get function: __cWebPlugin__ of class cPlugin_NewLua */ #ifndef TOLUA_DISABLE_tolua_get_cPlugin_NewLua___cWebPlugin__ static int tolua_get_cPlugin_NewLua___cWebPlugin__(lua_State* tolua_S) @@ -14024,40 +13959,6 @@ static int tolua_AllToLua_cItem_IsEmpty00(lua_State* tolua_S) } #endif //#ifndef TOLUA_DISABLE -/* method: Equals of class cItem */ -#ifndef TOLUA_DISABLE_tolua_AllToLua_cItem_Equals00 -static int tolua_AllToLua_cItem_Equals00(lua_State* tolua_S) -{ -#ifndef TOLUA_RELEASE - tolua_Error tolua_err; - if ( - !tolua_isusertype(tolua_S,1,"const cItem",0,&tolua_err) || - (tolua_isvaluenil(tolua_S,2,&tolua_err) || !tolua_isusertype(tolua_S,2,"const cItem",0,&tolua_err)) || - !tolua_isnoobj(tolua_S,3,&tolua_err) - ) - goto tolua_lerror; - else -#endif - { - const cItem* self = (const cItem*) tolua_tousertype(tolua_S,1,0); - const cItem* a_Item = ((const cItem*) tolua_tousertype(tolua_S,2,0)); -#ifndef TOLUA_RELEASE - if (!self) tolua_error(tolua_S,"invalid 'self' in function 'Equals'", NULL); -#endif - { - bool tolua_ret = (bool) self->Equals(*a_Item); - tolua_pushboolean(tolua_S,(bool)tolua_ret); - } - } - return 1; -#ifndef TOLUA_RELEASE - tolua_lerror: - tolua_error(tolua_S,"#ferror in function 'Equals'.",&tolua_err); - return 0; -#endif -} -#endif //#ifndef TOLUA_DISABLE - /* method: IsEqual of class cItem */ #ifndef TOLUA_DISABLE_tolua_AllToLua_cItem_IsEqual00 static int tolua_AllToLua_cItem_IsEqual00(lua_State* tolua_S) @@ -22989,7 +22890,6 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S) tolua_function(tolua_S,"Initialize",tolua_AllToLua_cPlayer_Initialize00); tolua_function(tolua_S,"GetEyeHeight",tolua_AllToLua_cPlayer_GetEyeHeight00); tolua_function(tolua_S,"GetEyePosition",tolua_AllToLua_cPlayer_GetEyePosition00); - tolua_function(tolua_S,"GetFlying",tolua_AllToLua_cPlayer_GetFlying00); tolua_function(tolua_S,"IsOnGround",tolua_AllToLua_cPlayer_IsOnGround00); tolua_function(tolua_S,"GetStance",tolua_AllToLua_cPlayer_GetStance00); tolua_function(tolua_S,"GetInventory",tolua_AllToLua_cPlayer_GetInventory00); @@ -23173,7 +23073,6 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S) tolua_function(tolua_S,"OnDisable",tolua_AllToLua_cPlugin_NewLua_OnDisable00); tolua_function(tolua_S,"Initialize",tolua_AllToLua_cPlugin_NewLua_Initialize00); tolua_function(tolua_S,"Tick",tolua_AllToLua_cPlugin_NewLua_Tick00); - tolua_function(tolua_S,"CreateWebPlugin",tolua_AllToLua_cPlugin_NewLua_CreateWebPlugin00); tolua_variable(tolua_S,"__cWebPlugin__",tolua_get_cPlugin_NewLua___cWebPlugin__,NULL); tolua_endmodule(tolua_S); tolua_cclass(tolua_S,"Lua__cPlugin_NewLua","Lua__cPlugin_NewLua","cPlugin_NewLua",NULL); @@ -23278,7 +23177,6 @@ TOLUA_API int tolua_AllToLua_open (lua_State* tolua_S) tolua_function(tolua_S,"Empty",tolua_AllToLua_cItem_Empty00); tolua_function(tolua_S,"Clear",tolua_AllToLua_cItem_Clear00); tolua_function(tolua_S,"IsEmpty",tolua_AllToLua_cItem_IsEmpty00); - tolua_function(tolua_S,"Equals",tolua_AllToLua_cItem_Equals00); tolua_function(tolua_S,"IsEqual",tolua_AllToLua_cItem_IsEqual00); tolua_function(tolua_S,"IsSameType",tolua_AllToLua_cItem_IsSameType00); tolua_function(tolua_S,"GetMaxDuration",tolua_AllToLua_cItem_GetMaxDuration00); diff --git a/source/Bindings.h b/source/Bindings.h index 53d1d69fa..85bc844d0 100644 --- a/source/Bindings.h +++ b/source/Bindings.h @@ -1,6 +1,6 @@ /* ** Lua binding: AllToLua -** Generated automatically by tolua++-1.0.92 on 11/11/12 14:50:43. +** Generated automatically by tolua++-1.0.92 on 11/11/12 15:02:07. */ /* Exported function */ diff --git a/source/Item.h b/source/Item.h index aa4b76bbc..812ba247d 100644 --- a/source/Item.h +++ b/source/Item.h @@ -43,14 +43,6 @@ public: return (m_ItemID <= 0 || m_ItemCount <= 0); } - // tolua_end - OBSOLETE - // tolua_begin - bool Equals(const cItem & a_Item) const // obsolete, use IsEqual() instead - { - return IsEqual(a_Item); - } - bool IsEqual(const cItem & a_Item) const { return (IsSameType(a_Item) && (m_ItemHealth == a_Item.m_ItemHealth)); diff --git a/source/Player.h b/source/Player.h index b074b430d..4800ed759 100644 --- a/source/Player.h +++ b/source/Player.h @@ -37,8 +37,6 @@ public: inline void SetStance( const double a_Stance ) { m_Stance = a_Stance; } double GetEyeHeight(); //tolua_export Vector3d GetEyePosition(); //tolua_export - OBSOLETE - inline bool GetFlying() { return m_bTouchGround; } //tolua_export inline bool IsOnGround(void) const {return m_bTouchGround; } // tolua_export inline const double GetStance(void) const { return m_Pos.y + 1.62; } //tolua_export // TODO: Proper stance when crouching etc. inline cInventory & GetInventory(void) { return m_Inventory; } //tolua_export diff --git a/source/Plugin_NewLua.cpp b/source/Plugin_NewLua.cpp index 55a04a88c..373f990c2 100644 --- a/source/Plugin_NewLua.cpp +++ b/source/Plugin_NewLua.cpp @@ -687,18 +687,6 @@ bool cPlugin_NewLua::OnHandshake(cClientHandle * a_Client, const AString & a_Use -cPlugin_NewLua * cPlugin_NewLua::CreateWebPlugin(lua_State * a_LuaState) -{ - LOGWARN("WARNING: Using deprecated function CreateWebPlugin()! A Lua plugin is a WebPlugin by itself now. (plugin \"%s\" in folder \"%s\")", - cPlugin::GetName().c_str(), GetLocalDirectory().c_str() - ); - return this; -} - - - - - AString cPlugin_NewLua::HandleWebRequest( HTTPRequest * a_Request ) { cCSLock Lock( m_CriticalSection ); diff --git a/source/Plugin_NewLua.h b/source/Plugin_NewLua.h index 93df5f1c2..88fd98963 100644 --- a/source/Plugin_NewLua.h +++ b/source/Plugin_NewLua.h @@ -58,8 +58,6 @@ public: //tolua_export lua_State* GetLuaState() { return m_LuaState; } - OBSOLETE cPlugin_NewLua * CreateWebPlugin(lua_State * a_LuaState); //tolua_export - cCriticalSection & GetCriticalSection() { return m_CriticalSection; } private: -- cgit v1.2.3