1
0

More 64-bit fixes

git-svn-id: http://mc-server.googlecode.com/svn/trunk@928 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2012-10-04 13:29:42 +00:00
parent bb8a19c71a
commit 9e7cfac327

View File

@ -293,11 +293,11 @@ cStatisticsFactory::~cStatisticsFactory()
LOG("cStatistics:"); LOG("cStatistics:");
LOG(" Joining results..."); LOG(" Joining results...");
JoinResults(); JoinResults();
LOG(" Total %d chunks went through", m_CombinedStats.m_TotalChunks); LOG(" Total %llu chunks went through", m_CombinedStats.m_TotalChunks);
LOG(" Biomes processed for %d chunks", m_CombinedStats.m_BiomeNumChunks); LOG(" Biomes processed for %llu chunks", m_CombinedStats.m_BiomeNumChunks);
// Check the number of blocks processed // Check the number of blocks processed
Int64 TotalBlocks = 0; UInt64 TotalBlocks = 0;
for (int i = 0; i <= 255; i++) for (int i = 0; i <= 255; i++)
{ {
for (int j = 0; j < 255; j++) for (int j = 0; j < 255; j++)
@ -305,8 +305,8 @@ cStatisticsFactory::~cStatisticsFactory()
TotalBlocks += m_CombinedStats.m_BlockCounts[i][j]; TotalBlocks += m_CombinedStats.m_BlockCounts[i][j];
} }
} }
Int64 ExpTotalBlocks = (Int64)(m_CombinedStats.m_BlockNumChunks) * 16LL * 16LL * 256LL; UInt64 ExpTotalBlocks = m_CombinedStats.m_BlockNumChunks * 16LL * 16LL * 256LL;
LOG(" BlockIDs processed for %d chunks, %lld blocks (exp %lld; %s)", m_CombinedStats.m_BlockNumChunks, TotalBlocks, ExpTotalBlocks, (TotalBlocks == ExpTotalBlocks) ? "match" : "failed"); LOG(" BlockIDs processed for %llu chunks, %llu blocks (exp %llu; %s)", m_CombinedStats.m_BlockNumChunks, TotalBlocks, ExpTotalBlocks, (TotalBlocks == ExpTotalBlocks) ? "match" : "failed");
// Save statistics: // Save statistics:
LOG(" Saving statistics into files:"); LOG(" Saving statistics into files:");