diff options
| author | lapayo94@gmail.com <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2011-12-25 15:03:01 +0100 |
|---|---|---|
| committer | lapayo94@gmail.com <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2011-12-25 15:03:01 +0100 |
| commit | 62737fd1632abd232e7e0ff00a19456bb28a4a37 (patch) | |
| tree | 7bf91facfdbd586ff5c144eaf1ac6160b2965002 /source/cPlayer.cpp | |
| parent | Code improvements (diff) | |
| download | cuberite-62737fd1632abd232e7e0ff00a19456bb28a4a37.tar cuberite-62737fd1632abd232e7e0ff00a19456bb28a4a37.tar.gz cuberite-62737fd1632abd232e7e0ff00a19456bb28a4a37.tar.bz2 cuberite-62737fd1632abd232e7e0ff00a19456bb28a4a37.tar.lz cuberite-62737fd1632abd232e7e0ff00a19456bb28a4a37.tar.xz cuberite-62737fd1632abd232e7e0ff00a19456bb28a4a37.tar.zst cuberite-62737fd1632abd232e7e0ff00a19456bb28a4a37.zip | |
Diffstat (limited to 'source/cPlayer.cpp')
| -rw-r--r-- | source/cPlayer.cpp | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/source/cPlayer.cpp b/source/cPlayer.cpp index 5a005005d..d13e1e5aa 100644 --- a/source/cPlayer.cpp +++ b/source/cPlayer.cpp @@ -108,7 +108,7 @@ cPlayer::~cPlayer(void) SaveToDisk();
m_ClientHandle = 0;
- CloseWindow();
+ CloseWindow(-1);
if( m_Inventory )
{
delete m_Inventory;
@@ -401,14 +401,36 @@ Vector3d cPlayer::GetEyePosition() void cPlayer::OpenWindow( cWindow* a_Window )
{
- CloseWindow();
+ CloseWindow(m_CurrentWindow ? (char)m_CurrentWindow->GetWindowType() : 0);
a_Window->Open( *this );
m_CurrentWindow = a_Window;
}
-void cPlayer::CloseWindow()
+void cPlayer::CloseWindow(char wID = -1)
{
if( m_CurrentWindow ) m_CurrentWindow->Close( *this );
+ if (wID == 0) {
+ if(GetInventory().GetWindow()->GetDraggingItem() && GetInventory().GetWindow()->GetDraggingItem()->m_ItemCount > 0)
+ {
+ LOG("Player holds item! Dropping it...");
+ TossItem( true, GetInventory().GetWindow()->GetDraggingItem()->m_ItemCount );
+ }
+
+ //Drop whats in the crafting slots (1, 2, 3, 4)
+ for( int i = 1; i <= 4; i++ )
+ {
+ cItem* Item = m_Inventory->GetSlot( i );
+ if( Item->m_ItemID > 0 && Item->m_ItemCount > 0 )
+ {
+ float vX = 0, vY = 0, vZ = 0;
+ EulerToVector( -GetRotation(), GetPitch(), vZ, vX, vY );
+ vY = -vY*2 + 1.f;
+ cPickup* Pickup = new cPickup( (int)(GetPosX()*32), (int)(GetPosY()*32) + (int)(1.6f*32), (int)(GetPosZ()*32), *Item, vX*2, vY*2, vZ*2 );
+ Pickup->Initialize( GetWorld() );
+ }
+ Item->Empty();
+ }
+ }
m_CurrentWindow = 0;
}
|