From d7068b35a85f0c0248a5533240087747d02e1a17 Mon Sep 17 00:00:00 2001 From: "lapayo94@gmail.com" Date: Sun, 1 Jan 2012 04:55:17 +0000 Subject: - implemented separated inventory for creative mode (cSurvivalInventory and cCreativeInventory) (Separation is not perfect yet, because maybe there are some mayor changes needed :D) - implemented CreativeInventoryAction (was mistakenly called CreateInventoryAction) -> Fixed meta data for creative selected blocks ->->Slabs/Steps are now placed correctly - slabs can now be build to a double slab - fixed a bug in the inventory which put items with different meta values in the same slot git-svn-id: http://mc-server.googlecode.com/svn/trunk@160 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cWindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/cWindow.cpp') diff --git a/source/cWindow.cpp b/source/cWindow.cpp index 68c8d4142..02ee3c541 100644 --- a/source/cWindow.cpp +++ b/source/cWindow.cpp @@ -48,7 +48,7 @@ cItem* cWindow::GetDraggingItem( cPlayer * a_Player /* = 0 */ ) { if( m_bInventoryVisible && a_Player ) { - cWindow* Window = a_Player->GetInventory().GetWindow(); + cWindow* Window = a_Player->GetSurvivalInventory().GetWindow(); if( Window ) { return Window->GetDraggingItem(); @@ -68,7 +68,7 @@ void cWindow::Clicked( cPacket_WindowClick* a_ClickPacket, cPlayer & a_Player ) if( m_bInventoryVisible ) { - cWindow* Window = a_Player.GetInventory().GetWindow(); + cWindow* Window = a_Player.GetSurvivalInventory().GetWindow(); if( Window ) { m_DraggingItem = Window->GetDraggingItem(); @@ -170,7 +170,7 @@ void cWindow::Clicked( cPacket_WindowClick* a_ClickPacket, cPlayer & a_Player ) { a_ClickPacket->m_WindowID = 0; a_ClickPacket->m_SlotNum -= (short)(m_NumSlots - 9); - cWindow* Window = a_Player.GetInventory().GetWindow(); + cWindow* Window = a_Player.GetSurvivalInventory().GetWindow(); if( Window ) { Window->Clicked( a_ClickPacket, a_Player ); -- cgit v1.2.3