1
0
Fork 0

Fixed tabs used for alignment.

This commit is contained in:
madmaxoft 2014-07-17 23:15:53 +02:00
parent d0cc9aedb3
commit c03161f75d
29 changed files with 115 additions and 99 deletions

View File

@ -33,8 +33,8 @@ public:
if ((BlockBeforePlacement == E_BLOCK_SNOW) && (MetaBeforePlacement < 7))
{
// Only increment if:
// A snow block was already there (not first time placement) AND
// Height is smaller than 7, the maximum possible height
// - A snow block was already there (not first time placement) AND
// - Height is smaller than 7, the maximum possible height
MetaBeforePlacement++;
}

View File

@ -1455,7 +1455,7 @@ bool cPlayer::IsInGroup( const AString & a_Group )
void cPlayer::ResolvePermissions()
{
m_ResolvedPermissions.clear(); // Start with an empty map yo~
m_ResolvedPermissions.clear(); // Start with an empty map
// Copy all player specific permissions into the resolved permissions map
for( PermissionMap::iterator itr = m_Permissions.begin(); itr != m_Permissions.end(); ++itr )

View File

@ -459,13 +459,13 @@ bool cItemHandler::IsTool()
{
// TODO: Rewrite this to list all tools specifically
return
(m_ItemType >= 256 && m_ItemType <= 259)
|| (m_ItemType == 261)
|| (m_ItemType >= 267 && m_ItemType <= 279)
|| (m_ItemType >= 283 && m_ItemType <= 286)
|| (m_ItemType >= 290 && m_ItemType <= 294)
|| (m_ItemType == 325)
|| (m_ItemType == 346);
((m_ItemType >= 256) && (m_ItemType <= 259)) ||
(m_ItemType == 261) ||
((m_ItemType >= 267) && (m_ItemType <= 279)) ||
((m_ItemType >= 283) && (m_ItemType <= 286)) ||
((m_ItemType >= 290) && (m_ItemType <= 294)) ||
(m_ItemType == 325) ||
(m_ItemType == 346);
}

View File

@ -44,6 +44,10 @@ cSemaphore::cSemaphore( unsigned int a_MaxCount, unsigned int a_InitialCount /*
#endif
}
cSemaphore::~cSemaphore()
{
#ifdef _WIN32
@ -66,6 +70,10 @@ cSemaphore::~cSemaphore()
#endif
}
void cSemaphore::Wait()
{
#ifndef _WIN32
@ -78,6 +86,10 @@ void cSemaphore::Wait()
#endif
}
void cSemaphore::Signal()
{
#ifndef _WIN32
@ -89,3 +101,7 @@ void cSemaphore::Signal()
ReleaseSemaphore( m_Handle, 1, NULL );
#endif
}

View File

@ -91,7 +91,7 @@ void cThread::Start( bool a_bWaitOnDelete /* = true */ )
LOGERROR("ERROR: Could not create thread!");
#else
DWORD ThreadID = 0;
HANDLE hThread = CreateThread( 0 // security
HANDLE hThread = CreateThread(NULL // security
,0 // stack size
, (LPTHREAD_START_ROUTINE) MyThread // function name
,this // parameters

View File

@ -1005,9 +1005,9 @@ void cProtocol125::SendSpawnVehicle(const cEntity & a_Vehicle, char a_VehicleTyp
void cProtocol125::SendStatistics(const cStatManager & a_Manager)
{
/* NOTE:
* Versions prior to minecraft 1.7 use an incremental statistic sync
* method. The current setup does not allow us to implement that, because
* of performance considerations.
Versions prior to minecraft 1.7 use an incremental statistic sync
method. The current setup does not allow us to implement that, because
of performance considerations.
*/
#if 0
for (unsigned int i = 0; i < (unsigned int)statCount; ++i)

View File

@ -2707,7 +2707,8 @@ void cProtocol172::cPacketizer::WriteEntityMetadata(const cEntity & a_Entity)
// The following expression makes Minecarts shake more with less health or higher damage taken
// It gets half the maximum health, and takes it away from the current health minus the half health:
/* Health: 5 | 3 - (5 - 3) = 1 (shake power)
/*
Health: 5 | 3 - (5 - 3) = 1 (shake power)
Health: 3 | 3 - (3 - 3) = 3
Health: 1 | 3 - (1 - 3) = 5
*/

View File

@ -70,7 +70,7 @@ protected:
/*
Slots:
| 0 | 1 | ... | m_AddSlotNum | m_SimSlotNum | ... | m_TickDelay - 1 |
adding blocks here ^ | ^ simulating here
| adding blocks here ^ | ^ simulating here
*/
/// Called from SimulateChunk() to simulate each block in one slot of blocks. Descendants override this method to provide custom simulation.

View File

@ -52,9 +52,8 @@ private:
/** Utility class used to serialize item ID counts.
*
* In order to perform bounds checking (while loading),
* the last registered ID of each item is serialized to an NBT file.
In order to perform bounds checking (while loading),
the last registered ID of each item is serialized to an NBT file.
*/
class cIDCountSerializer
{