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

Increased tick count to long

Browse Source
This commit is contained in:
Tycho 2014-01-17 10:23:40 -08:00
parent ce030bc7c9
commit 287144839e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/World.cpp
View File

@ -885,7 +885,7 @@ void cWorld::TickScheduledTasks()
} // for itr - m_Tasks[] } // for itr - m_Tasks[]
// Increment TickID // Increment TickID
m_TickID = (m_TickID+1) &0xFFFF; m_TickID = (m_TickID+1) & 0x7FFFFFFF;
} }
@ -2622,7 +2622,7 @@ void cWorld::QueueTask(cTask * a_Task)
void cWorld::ScheduleTask(cScheduledTask * a_Task) void cWorld::ScheduleTask(cScheduledTask * a_Task)
{ {
a_Task->Ticks = (a_Task->Ticks + m_TickID) & 0xFFFF; a_Task->Ticks = (a_Task->Ticks + m_TickID) & 0x7FFFFFFF;
cCSLock Lock(m_CSScheduledTasks); cCSLock Lock(m_CSScheduledTasks);
for(ScheduledTaskList::iterator itr = m_ScheduledTasks.begin(); itr != m_ScheduledTasks.end(); itr++) for(ScheduledTaskList::iterator itr = m_ScheduledTasks.begin(); itr != m_ScheduledTasks.end(); itr++)
{ {

2
src/World.h
View File

@ -773,7 +773,7 @@ private:
ScheduledTaskList m_ScheduledTasks; ScheduledTaskList m_ScheduledTasks;
/// Current Tick number for sceduled tasks /// Current Tick number for sceduled tasks
int m_TickID; long m_TickID;
/// Guards m_Clients /// Guards m_Clients
cCriticalSection m_CSClients; cCriticalSection m_CSClients;