Revert "Get rid of MSVC's __int64"

This reverts commit d63f79325f85e014361eb8cf1e41eaebedb1ae71.

1 files changed, 15 insertions, 15 deletions

diff --git a/Minecraft.World/DirectoryLevelStorage.cpp b/Minecraft.World/DirectoryLevelStorage.cpp
index 5a1dfc0a..27514c9b 100644
--- a/Minecraft.World/DirectoryLevelStorage.cpp
+++ b/Minecraft.World/DirectoryLevelStorage.cpp
@@ -108,19 +108,19 @@ void _MapDataMappings_old::setMapping(int id, PlayerUID xuid, int dimension)
 #ifdef _LARGE_WORLDS
 void DirectoryLevelStorage::PlayerMappings::addMapping(int id, int centreX, int centreZ, int dimension, int scale)
 {
-	int64_t index = ( ((int64_t)(centreZ & 0x1FFFFFFF)) << 34) | ( ((int64_t)(centreX & 0x1FFFFFFF)) << 5) | ( (scale & 0x7) << 2) | (dimension & 0x3);
+	__int64 index = ( ((__int64)(centreZ & 0x1FFFFFFF)) << 34) | ( ((__int64)(centreX & 0x1FFFFFFF)) << 5) | ( (scale & 0x7) << 2) | (dimension & 0x3);
 	m_mappings[index] = id;
 	//app.DebugPrintf("Adding mapping: %d - (%d,%d)/%d/%d [%I64d - 0x%016llx]\n", id, centreX, centreZ, dimension, scale, index, index);
 }
 
 bool DirectoryLevelStorage::PlayerMappings::getMapping(int &id, int centreX, int centreZ, int dimension, int scale)
 {
-	//int64_t zMasked = centreZ & 0x1FFFFFFF;
-	//int64_t xMasked = centreX & 0x1FFFFFFF;
-	//int64_t zShifted = zMasked << 34;
-	//int64_t xShifted = xMasked << 5;
+	//__int64 zMasked = centreZ & 0x1FFFFFFF;
+	//__int64 xMasked = centreX & 0x1FFFFFFF;
+	//__int64 zShifted = zMasked << 34;
+	//__int64 xShifted = xMasked << 5;
 	//app.DebugPrintf("xShifted = %d (0x%016x), zShifted = %I64d (0x%016llx)\n", xShifted, xShifted, zShifted, zShifted);
-	int64_t index = ( ((int64_t)(centreZ & 0x1FFFFFFF)) << 34) | ( ((int64_t)(centreX & 0x1FFFFFFF)) << 5) | ( (scale & 0x7) << 2) | (dimension & 0x3);
+	__int64 index = ( ((__int64)(centreZ & 0x1FFFFFFF)) << 34) | ( ((__int64)(centreX & 0x1FFFFFFF)) << 5) | ( (scale & 0x7) << 2) | (dimension & 0x3);
 	AUTO_VAR(it,m_mappings.find(index));
 	if(it != m_mappings.end())
 	{
@@ -151,7 +151,7 @@ void DirectoryLevelStorage::PlayerMappings::readMappings(DataInputStream *dis)
 	int count = dis->readInt();
 	for(unsigned int i = 0; i < count; ++i)
 	{
-		int64_t index = dis->readLong();
+		__int64 index = dis->readLong();
 		int id = dis->readInt();
 		m_mappings[index] = id;
 		app.DebugPrintf("    -- %lld (0x%016llx) = %d\n", index, index, id);
@@ -233,7 +233,7 @@ ChunkStorage *DirectoryLevelStorage::createChunkStorage(Dimension *dimension)
 	return new OldChunkStorage(dir, true);
 }
 
-LevelData *DirectoryLevelStorage::prepareLevel()
+LevelData *DirectoryLevelStorage::prepareLevel() 
 {
 	// 4J Stu Added
 #ifdef _LARGE_WORLDS
@@ -295,7 +295,7 @@ LevelData *DirectoryLevelStorage::prepareLevel()
 #else
 
 			if(getSaveFile()->getSaveVersion() < END_DIMENSION_MAP_MAPPINGS_SAVE_VERSION)
-			{
+			{			
 				MapDataMappings_old oldMapDataMappings;
 				getSaveFile()->readFile(	fileEntry,
 					&oldMapDataMappings, // data buffer
@@ -334,7 +334,7 @@ LevelData *DirectoryLevelStorage::prepareLevel()
 
 	ConsoleSavePath dataFile = ConsoleSavePath( wstring( L"level.dat" ) );
 
-	if ( m_saveFile->doesFileExist( dataFile ) )
+	if ( m_saveFile->doesFileExist( dataFile ) ) 
 	{
 		ConsoleSaveFileInputStream fis = ConsoleSaveFileInputStream(m_saveFile, dataFile);
 		CompoundTag *root = NbtIo::readCompressed(&fis);
@@ -429,7 +429,7 @@ void DirectoryLevelStorage::save(shared_ptr<Player> player)
 }
 
  // 4J Changed return val to bool to check if new player or loaded player
-bool DirectoryLevelStorage::load(shared_ptr<Player> player)
+bool DirectoryLevelStorage::load(shared_ptr<Player> player) 
 {
 	bool newPlayer = true;
 	CompoundTag *tag = loadPlayerDataTag( player->getXuid() );
@@ -499,7 +499,7 @@ void DirectoryLevelStorage::clearOldPlayerFiles()
 				m_saveFile->deleteFile( playerFiles->at(i) );
 			}
 		}
-		else
+		else 
 #endif
 			if( playerFiles->size() > MAX_PLAYER_DATA_SAVES )
 			{
@@ -523,12 +523,12 @@ void DirectoryLevelStorage::clearOldPlayerFiles()
 	}
 }
 
-PlayerIO *DirectoryLevelStorage::getPlayerIO()
+PlayerIO *DirectoryLevelStorage::getPlayerIO() 
 {
 	return this;
 }
 
-void DirectoryLevelStorage::closeAll()
+void DirectoryLevelStorage::closeAll() 
 {
 }
 
@@ -582,7 +582,7 @@ void DirectoryLevelStorage::resetNetherPlayerPositions()
 					// If the player is in the nether, set their y position above the top of the nether
 					// This will force the player to be spawned in a valid position in the overworld when they are loaded
 					if(tag->contains(L"Dimension") && tag->getInt(L"Dimension") == LevelData::DIMENSION_NETHER && tag->contains(L"Pos"))
-					{
+					{						
 						ListTag<DoubleTag> *pos = (ListTag<DoubleTag> *) tag->getList(L"Pos");
 						pos->get(1)->data = DBL_MAX;