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

Merge pull request #1883 from mc-server/NarrowWindowID

Browse Source 
Narrowed WindowID to use only 7 bits.
This commit is contained in:
Mattes D 2015-04-22 07:52:30 +02:00
commit 6d99a0b968
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/UI/Window.cpp
View File

@ -21,19 +21,23 @@
char cWindow::m_WindowIDCounter = 1;
Byte cWindow::m_WindowIDCounter = 0;
cWindow::cWindow(WindowType a_WindowType, const AString & a_WindowTitle) :
m_WindowID((++m_WindowIDCounter) % 127),
m_WindowID(static_cast<char>((++m_WindowIDCounter) % 127)),
m_WindowType(a_WindowType),
m_WindowTitle(a_WindowTitle),
m_IsDestroyed(false),
m_Owner(nullptr)
{
// The window ID is signed in protocol 1.7, unsigned in protocol 1.8. Keep out of trouble by using only 7 bits:
// Ref.: http://forum.mc-server.org/showthread.php?tid=1876
ASSERT((m_WindowID >= 0) && (m_WindowID < 127));
if (a_WindowType == wtInventory)
{
m_WindowID = 0;

2
src/UI/Window.h
View File

@ -185,7 +185,7 @@ protected:
cWindowOwner * m_Owner;
static char m_WindowIDCounter;
static Byte m_WindowIDCounter;
/// Sets the internal flag as "destroyed"; notifies the owner that the window is destroying
virtual void Destroy(void);