summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/Bindings.cpp44
-rw-r--r--source/Bindings.h2
-rw-r--r--source/cCreativeInventory.cpp14
-rw-r--r--source/cPlayer.cpp54
-rw-r--r--source/cPlayer.h2
-rw-r--r--source/packets/cPacket_WindowClick.h8
6 files changed, 76 insertions, 48 deletions
diff --git a/source/Bindings.cpp b/source/Bindings.cpp
index eb884ea9e..c7ab6de68 100644
--- a/source/Bindings.cpp
+++ b/source/Bindings.cpp
@@ -1,6 +1,6 @@
/*
** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 08/03/12 10:35:41.
+** Generated automatically by tolua++-1.0.92 on 08/10/12 20:57:53.
*/
#ifndef __cplusplus
@@ -6461,7 +6461,9 @@ static int tolua_AllToLua_cPlayer_TossItem00(lua_State* tolua_S)
!tolua_isusertype(tolua_S,1,"cPlayer",0,&tolua_err) ||
!tolua_isboolean(tolua_S,2,0,&tolua_err) ||
!tolua_isnumber(tolua_S,3,1,&tolua_err) ||
- !tolua_isnoobj(tolua_S,4,&tolua_err)
+ !tolua_isnumber(tolua_S,4,1,&tolua_err) ||
+ !tolua_isnumber(tolua_S,5,1,&tolua_err) ||
+ !tolua_isnoobj(tolua_S,6,&tolua_err)
)
goto tolua_lerror;
else
@@ -6470,11 +6472,13 @@ static int tolua_AllToLua_cPlayer_TossItem00(lua_State* tolua_S)
cPlayer* self = (cPlayer*) tolua_tousertype(tolua_S,1,0);
bool a_bDraggingItem = ((bool) tolua_toboolean(tolua_S,2,0));
int a_Amount = ((int) tolua_tonumber(tolua_S,3,1));
+ int a_CreateType = ((int) tolua_tonumber(tolua_S,4,0));
+ int a_CreateHealth = ((int) tolua_tonumber(tolua_S,5,0));
#ifndef TOLUA_RELEASE
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'TossItem'", NULL);
#endif
{
- self->TossItem(a_bDraggingItem,a_Amount);
+ self->TossItem(a_bDraggingItem,a_Amount,a_CreateType,a_CreateHealth);
}
}
return 0;
@@ -7880,7 +7884,7 @@ static int tolua_AllToLua_cPlugin_OnChunkGenerating00(lua_State* tolua_S)
#endif
{
cPlugin* self = (cPlugin*) tolua_tousertype(tolua_S,1,0);
- cWorld* a_Wordl = ((cWorld*) tolua_tousertype(tolua_S,2,0));
+ cWorld* a_World = ((cWorld*) tolua_tousertype(tolua_S,2,0));
int a_ChunkX = ((int) tolua_tonumber(tolua_S,3,0));
int a_ChunkZ = ((int) tolua_tonumber(tolua_S,4,0));
cLuaChunk* a_pLuaChunk = ((cLuaChunk*) tolua_tousertype(tolua_S,5,0));
@@ -7888,7 +7892,7 @@ static int tolua_AllToLua_cPlugin_OnChunkGenerating00(lua_State* tolua_S)
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'OnChunkGenerating'", NULL);
#endif
{
- bool tolua_ret = (bool) self->OnChunkGenerating(a_Wordl,a_ChunkX,a_ChunkZ,a_pLuaChunk);
+ bool tolua_ret = (bool) self->OnChunkGenerating(a_World,a_ChunkX,a_ChunkZ,a_pLuaChunk);
tolua_pushboolean(tolua_S,(bool)tolua_ret);
}
}
@@ -8433,9 +8437,9 @@ static int tolua_AllToLua_cPlugin_AddCommand00(lua_State* tolua_S)
#endif
{
cPlugin* self = (cPlugin*) tolua_tousertype(tolua_S,1,0);
- std::string a_Command = ((std::string) tolua_tocppstring(tolua_S,2,0));
- std::string a_Description = ((std::string) tolua_tocppstring(tolua_S,3,0));
- std::string a_Permission = ((std::string) tolua_tocppstring(tolua_S,4,0));
+ const AString a_Command = ((const AString) tolua_tocppstring(tolua_S,2,0));
+ const AString a_Description = ((const AString) tolua_tocppstring(tolua_S,3,0));
+ const AString a_Permission = ((const AString) tolua_tocppstring(tolua_S,4,0));
#ifndef TOLUA_RELEASE
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'AddCommand'", NULL);
#endif
@@ -8618,9 +8622,9 @@ public:
return ( void ) cPlugin:: OnChunkGenerated(a_World,a_ChunkX,a_ChunkZ);
};
};
- bool OnChunkGenerating( cWorld* a_Wordl, int a_ChunkX, int a_ChunkZ, cLuaChunk* a_pLuaChunk) {
+ bool OnChunkGenerating( cWorld* a_World, int a_ChunkX, int a_ChunkZ, cLuaChunk* a_pLuaChunk) {
if (push_method("OnChunkGenerating", tolua_AllToLua_cPlugin_OnChunkGenerating00)) {
- tolua_pushusertype(lua_state, (void*)a_Wordl, "cWorld");
+ tolua_pushusertype(lua_state, (void*)a_World, "cWorld");
tolua_pushnumber(lua_state, (lua_Number)a_ChunkX);
tolua_pushnumber(lua_state, (lua_Number)a_ChunkZ);
tolua_pushusertype(lua_state, (void*)a_pLuaChunk, "cLuaChunk");
@@ -8629,7 +8633,7 @@ public:
lua_pop(lua_state, 1);
return tolua_ret;
} else {
- return ( bool ) cPlugin:: OnChunkGenerating(a_Wordl,a_ChunkX,a_ChunkZ,a_pLuaChunk);
+ return ( bool ) cPlugin:: OnChunkGenerating(a_World,a_ChunkX,a_ChunkZ,a_pLuaChunk);
};
};
bool OnPreCrafting( const cPlayer* a_Player, const cCraftingGrid* a_Grid, cCraftingRecipe* a_Recipe) {
@@ -8776,8 +8780,8 @@ public:
void cPlugin__OnChunkGenerated( cWorld* a_World, int a_ChunkX, int a_ChunkZ) {
return ( void )cPlugin::OnChunkGenerated(a_World,a_ChunkX,a_ChunkZ);
};
- bool cPlugin__OnChunkGenerating( cWorld* a_Wordl, int a_ChunkX, int a_ChunkZ, cLuaChunk* a_pLuaChunk) {
- return ( bool )cPlugin::OnChunkGenerating(a_Wordl,a_ChunkX,a_ChunkZ,a_pLuaChunk);
+ bool cPlugin__OnChunkGenerating( cWorld* a_World, int a_ChunkX, int a_ChunkZ, cLuaChunk* a_pLuaChunk) {
+ return ( bool )cPlugin::OnChunkGenerating(a_World,a_ChunkX,a_ChunkZ,a_pLuaChunk);
};
bool cPlugin__OnPreCrafting( const cPlayer* a_Player, const cCraftingGrid* a_Grid, cCraftingRecipe* a_Recipe) {
return ( bool )cPlugin::OnPreCrafting(a_Player,a_Grid,a_Recipe);
@@ -9344,7 +9348,7 @@ static int tolua_AllToLua_Lua__cPlugin_cPlugin__OnChunkGenerating00(lua_State* t
#endif
{
Lua__cPlugin* self = (Lua__cPlugin*) tolua_tousertype(tolua_S,1,0);
- cWorld* a_Wordl = ((cWorld*) tolua_tousertype(tolua_S,2,0));
+ cWorld* a_World = ((cWorld*) tolua_tousertype(tolua_S,2,0));
int a_ChunkX = ((int) tolua_tonumber(tolua_S,3,0));
int a_ChunkZ = ((int) tolua_tonumber(tolua_S,4,0));
cLuaChunk* a_pLuaChunk = ((cLuaChunk*) tolua_tousertype(tolua_S,5,0));
@@ -9352,7 +9356,7 @@ static int tolua_AllToLua_Lua__cPlugin_cPlugin__OnChunkGenerating00(lua_State* t
if (!self) tolua_error(tolua_S,"invalid 'self' in function 'cPlugin__OnChunkGenerating'", NULL);
#endif
{
- bool tolua_ret = (bool) self->cPlugin__OnChunkGenerating(a_Wordl,a_ChunkX,a_ChunkZ,a_pLuaChunk);
+ bool tolua_ret = (bool) self->cPlugin__OnChunkGenerating(a_World,a_ChunkX,a_ChunkZ,a_pLuaChunk);
tolua_pushboolean(tolua_S,(bool)tolua_ret);
}
}
@@ -10043,9 +10047,9 @@ public:
return ( void ) cPlugin_NewLua:: OnChunkGenerated(a_World,a_ChunkX,a_ChunkZ);
};
};
- bool OnChunkGenerating( cWorld* a_Wordl, int a_ChunkX, int a_ChunkZ, cLuaChunk* a_pLuaChunk) {
+ bool OnChunkGenerating( cWorld* a_World, int a_ChunkX, int a_ChunkZ, cLuaChunk* a_pLuaChunk) {
if (push_method("OnChunkGenerating", tolua_AllToLua_cPlugin_OnChunkGenerating00)) {
- tolua_pushusertype(lua_state, (void*)a_Wordl, "cWorld");
+ tolua_pushusertype(lua_state, (void*)a_World, "cWorld");
tolua_pushnumber(lua_state, (lua_Number)a_ChunkX);
tolua_pushnumber(lua_state, (lua_Number)a_ChunkZ);
tolua_pushusertype(lua_state, (void*)a_pLuaChunk, "cLuaChunk");
@@ -10054,7 +10058,7 @@ public:
lua_pop(lua_state, 1);
return tolua_ret;
} else {
- return ( bool ) cPlugin_NewLua:: OnChunkGenerating(a_Wordl,a_ChunkX,a_ChunkZ,a_pLuaChunk);
+ return ( bool ) cPlugin_NewLua:: OnChunkGenerating(a_World,a_ChunkX,a_ChunkZ,a_pLuaChunk);
};
};
bool OnPreCrafting( const cPlayer* a_Player, const cCraftingGrid* a_Grid, cCraftingRecipe* a_Recipe) {
@@ -10204,8 +10208,8 @@ public:
void cPlugin_NewLua__OnChunkGenerated( cWorld* a_World, int a_ChunkX, int a_ChunkZ) {
return ( void )cPlugin_NewLua::OnChunkGenerated(a_World,a_ChunkX,a_ChunkZ);
};
- bool cPlugin_NewLua__OnChunkGenerating( cWorld* a_Wordl, int a_ChunkX, int a_ChunkZ, cLuaChunk* a_pLuaChunk) {
- return ( bool )cPlugin_NewLua::OnChunkGenerating(a_Wordl,a_ChunkX,a_ChunkZ,a_pLuaChunk);
+ bool cPlugin_NewLua__OnChunkGenerating( cWorld* a_World, int a_ChunkX, int a_ChunkZ, cLuaChunk* a_pLuaChunk) {
+ return ( bool )cPlugin_NewLua::OnChunkGenerating(a_World,a_ChunkX,a_ChunkZ,a_pLuaChunk);
};
bool cPlugin_NewLua__OnPreCrafting( const cPlayer* a_Player, const cCraftingGrid* a_Grid, cCraftingRecipe* a_Recipe) {
return ( bool )cPlugin_NewLua::OnPreCrafting(a_Player,a_Grid,a_Recipe);
diff --git a/source/Bindings.h b/source/Bindings.h
index 78cb3f2e1..c07022baf 100644
--- a/source/Bindings.h
+++ b/source/Bindings.h
@@ -1,6 +1,6 @@
/*
** Lua binding: AllToLua
-** Generated automatically by tolua++-1.0.92 on 08/03/12 10:35:42.
+** Generated automatically by tolua++-1.0.92 on 08/10/12 20:57:53.
*/
/* Exported function */
diff --git a/source/cCreativeInventory.cpp b/source/cCreativeInventory.cpp
index 7083adeb7..77b9107b7 100644
--- a/source/cCreativeInventory.cpp
+++ b/source/cCreativeInventory.cpp
@@ -28,8 +28,20 @@ void cCreativeInventory::Clicked( cPacket* a_ClickPacket )
{
cPacket_CreativeInventoryAction* Packet = reinterpret_cast<cPacket_CreativeInventoryAction *>(a_ClickPacket);
short Slot = Packet->m_Slot;
+ if (Slot == -1)
+ {
+ // object thrown out
+ m_Owner->TossItem(false, Packet->m_Quantity, Packet->m_ItemID, Packet->m_Damage);
+ return;
+ }
+
+ if ((Slot < c_HotOffset) || (Slot >= c_NumSlots))
+ {
+ LOG("%s: Invalid slot (%d) in CreativeInventoryAction packet. Ignoring...", m_Owner->GetName().c_str(), Slot);
+ return;
+ }
- cItem* SlotItem = &(this->m_Slots[Slot]);
+ cItem * SlotItem = &(this->m_Slots[Slot]);
SlotItem->m_ItemID = (ENUM_ITEM_ID) Packet->m_ItemID;
SlotItem->m_ItemHealth = Packet->m_Damage;
diff --git a/source/cPlayer.cpp b/source/cPlayer.cpp
index c260330f6..7c0f0c703 100644
--- a/source/cPlayer.cpp
+++ b/source/cPlayer.cpp
@@ -792,38 +792,52 @@ AString cPlayer::GetColor(void) const
-void cPlayer::TossItem( bool a_bDraggingItem, int a_Amount /* = 1 */ )
+void cPlayer::TossItem(
+ bool a_bDraggingItem,
+ int a_Amount /* = 1 */,
+ int a_CreateType /* = 0 */,
+ int a_CreateHealth /* = 0 */
+)
{
cItems Drops;
- if (a_bDraggingItem)
+ if (a_CreateType)
{
- cItem * Item = GetInventory().GetWindow()->GetDraggingItem();
- if (!Item->IsEmpty())
- {
- Drops.push_back(*Item);
- if( Item->m_ItemCount > a_Amount )
- Item->m_ItemCount -= (char)a_Amount;
- else
- Item->Empty();
- }
+ // Just create item without touching the inventory (used in creative mode)
+ Drops.push_back(cItem((ENUM_ITEM_ID)a_CreateType, (char)a_Amount, a_CreateHealth));
}
else
{
- // Else drop equipped item
- cItem DroppedItem = GetInventory().GetEquippedItem();
- if (!DroppedItem.IsEmpty())
+ // Drop an item from the inventory:
+ if (a_bDraggingItem)
+ {
+ cItem * Item = GetInventory().GetWindow()->GetDraggingItem();
+ if (!Item->IsEmpty())
+ {
+ Drops.push_back(*Item);
+ if( Item->m_ItemCount > a_Amount )
+ Item->m_ItemCount -= (char)a_Amount;
+ else
+ Item->Empty();
+ }
+ }
+ else
{
- DroppedItem.m_ItemCount = 1;
- if (GetInventory().RemoveItem(DroppedItem))
+ // Else drop equipped item
+ cItem DroppedItem = GetInventory().GetEquippedItem();
+ if (!DroppedItem.IsEmpty())
{
- DroppedItem.m_ItemCount = 1; // RemoveItem decreases the count, so set it to 1 again
- Drops.push_back(DroppedItem);
+ DroppedItem.m_ItemCount = 1;
+ if (GetInventory().RemoveItem(DroppedItem))
+ {
+ DroppedItem.m_ItemCount = 1; // RemoveItem decreases the count, so set it to 1 again
+ Drops.push_back(DroppedItem);
+ }
}
}
}
float vX = 0, vY = 0, vZ = 0;
- EulerToVector( -GetRotation(), GetPitch(), vZ, vX, vY );
- vY = -vY*2 + 1.f;
+ EulerToVector(-GetRotation(), GetPitch(), vZ, vX, vY);
+ vY = -vY * 2 + 1.f;
m_World->SpawnItemPickups(Drops, GetPosX(), GetPosY() + 1.6f, GetPosZ(), vX * 2, vY * 2, vZ * 2);
}
diff --git a/source/cPlayer.h b/source/cPlayer.h
index 50a92f44f..469d84701 100644
--- a/source/cPlayer.h
+++ b/source/cPlayer.h
@@ -79,7 +79,7 @@ public:
AString GetColor(void) const; //tolua_export
- void TossItem( bool a_bDraggingItem, int a_Amount = 1 ); //tolua_export
+ void TossItem(bool a_bDraggingItem, int a_Amount = 1, int a_CreateType = 0, int a_CreateHealth = 0); //tolua_export
void Heal( int a_Health ); //tolua_export
diff --git a/source/packets/cPacket_WindowClick.h b/source/packets/cPacket_WindowClick.h
index 2d78d3f00..e9abd80df 100644
--- a/source/packets/cPacket_WindowClick.h
+++ b/source/packets/cPacket_WindowClick.h
@@ -33,9 +33,9 @@ public:
// 9-35 = inventory
// 36-44 = Hot bar
- char m_RightMouse; // 0 = left 1 = Right mb
- short m_NumClicks; // Num clicks
- bool m_Bool; // unkown???????????? SHIFT clicked
+ char m_RightMouse; // 0 = Left 1 = Right mb
+ short m_NumClicks; // Num clicks
+ bool m_Bool; // Shift pressed when clicked?
// Below = item
short m_ItemID; // if this is -1 the next stuff dont exist
@@ -43,8 +43,6 @@ public:
short m_ItemUses;
short m_EnchantNums;
-
- static const unsigned int c_Size = 1 + 1 + 2 + 1 + 2 + 2; // Minimal size ( +1+1 = max)
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 20:48:43 +0100