flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

LuaWindow: Initial code, the window can be opened, but not much manipulated

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1532 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2013-05-30 19:34:09 +00:00
parent 4e0ea176d0
commit 9684f90f83
17 changed files with 1077 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/Player.cpp
View File

@@ -128,7 +128,7 @@ void cPlayer::Initialize( cWorld* a_World )
void cPlayer::Destroyed()
{
CloseWindow(-1);
CloseWindow();
m_ClientHandle = NULL;
}
@@ -433,9 +433,9 @@ Vector3d cPlayer::GetEyePosition()
void cPlayer::OpenWindow( cWindow* a_Window )
void cPlayer::OpenWindow(cWindow * a_Window)
{
CloseWindow(m_CurrentWindow ? (char)m_CurrentWindow->GetWindowType() : 0);
CloseWindow();
a_Window->OpenedByPlayer(*this);
m_CurrentWindow = a_Window;
}
@@ -444,12 +444,29 @@ void cPlayer::OpenWindow( cWindow* a_Window )
void cPlayer::CloseWindow(char a_WindowType)
void cPlayer::CloseWindow(void)
{
if (m_CurrentWindow != NULL)
if (m_CurrentWindow == NULL)
{
m_CurrentWindow->ClosedByPlayer(*this);
m_CurrentWindow = m_InventoryWindow;
return;
}
m_CurrentWindow->ClosedByPlayer(*this);
m_CurrentWindow = m_InventoryWindow;
}
void cPlayer::CloseWindowIfID(char a_WindowID)
{
if ((m_CurrentWindow == NULL) || (m_CurrentWindow->GetWindowID() != a_WindowID))
{
return;
}
m_CurrentWindow->ClosedByPlayer(*this);
m_CurrentWindow = m_InventoryWindow;
}