mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-05-29 10:24:46 +00:00
chore: remove #pragma warning directives
These are only recognized by MSVC and will throw *additional* warnings on other compilers.
This commit is contained in:
@@ -39,9 +39,9 @@ SparseLightStorage::SparseLightStorage(bool sky)
|
||||
XMemSet(data, 0, 128 * 127);
|
||||
|
||||
// Data and count packs together the pointer to our data and the count of planes allocated - 127 planes allocated in this case
|
||||
#pragma warning ( disable : 4826 )
|
||||
|
||||
dataAndCount = 0x007F000000000000L | (( (__int64) planeIndices ) & 0x0000ffffffffffffL);
|
||||
#pragma warning ( default : 4826 )
|
||||
|
||||
#ifdef LIGHT_COMPRESSION_STATS
|
||||
count = 127;
|
||||
#endif
|
||||
@@ -58,9 +58,9 @@ SparseLightStorage::SparseLightStorage(bool sky, bool isUpper)
|
||||
}
|
||||
|
||||
// Data and count packs together the pointer to our data and the count of planes allocated - 0 planes allocated in this case
|
||||
#pragma warning ( disable : 4826 )
|
||||
|
||||
dataAndCount = 0x0000000000000000L | (( (__int64) planeIndices ) & 0x0000ffffffffffffL);
|
||||
#pragma warning ( default : 4826 )
|
||||
|
||||
#ifdef LIGHT_COMPRESSION_STATS
|
||||
count = 0;
|
||||
#endif
|
||||
@@ -96,9 +96,9 @@ SparseLightStorage::SparseLightStorage(SparseLightStorage *copyFrom)
|
||||
|
||||
// AP - I've moved this to be before the memcpy because of a very strange bug on vita. Sometimes dataAndCount wasn't valid in time when ::get was called.
|
||||
// This should never happen and this isn't a proper solution but fixes it for now.
|
||||
#pragma warning ( disable : 4826 )
|
||||
|
||||
dataAndCount = ( sourceDataAndCount & 0xffff000000000000L ) | ( ((__int64) destIndicesAndData ) & 0x0000ffffffffffffL );
|
||||
#pragma warning ( default : 4826 )
|
||||
|
||||
|
||||
XMemCpy( destIndicesAndData, sourceIndicesAndData, sourceCount * 128 + 128 );
|
||||
|
||||
@@ -179,9 +179,9 @@ void SparseLightStorage::setData(byteArray dataIn, unsigned int inOffset)
|
||||
}
|
||||
|
||||
// Get new data and count packed info
|
||||
#pragma warning ( disable : 4826 )
|
||||
|
||||
__int64 newDataAndCount = ((__int64) planeIndices) & 0x0000ffffffffffffL;
|
||||
#pragma warning ( default : 4826 )
|
||||
|
||||
newDataAndCount |= ((__int64)allocatedPlaneCount) << 48;
|
||||
|
||||
updateDataAndCount( newDataAndCount );
|
||||
@@ -311,9 +311,9 @@ void SparseLightStorage::setAllBright()
|
||||
planeIndices[i] = ALL_15_INDEX;
|
||||
}
|
||||
// Data and count packs together the pointer to our data and the count of planes allocated, which is currently zero
|
||||
#pragma warning ( disable : 4826 )
|
||||
|
||||
__int64 newDataAndCount = ( (__int64) planeIndices ) & 0x0000ffffffffffffL;
|
||||
#pragma warning ( default : 4826 )
|
||||
|
||||
|
||||
updateDataAndCount( newDataAndCount );
|
||||
}
|
||||
@@ -406,9 +406,9 @@ void SparseLightStorage::addNewPlane(int y)
|
||||
dataPointer[y] = lastLinesUsed;
|
||||
|
||||
// Get new data and count packed info
|
||||
#pragma warning ( disable : 4826 )
|
||||
|
||||
__int64 newDataAndCount = ((__int64) dataPointer) & 0x0000ffffffffffffL;
|
||||
#pragma warning ( default : 4826 )
|
||||
|
||||
newDataAndCount |= ((__int64)linesUsed) << 48;
|
||||
|
||||
// Attempt to update the data & count atomically. This command will Only succeed if the data stored at
|
||||
@@ -574,9 +574,9 @@ int SparseLightStorage::compress()
|
||||
}
|
||||
|
||||
// Get new data and count packed info
|
||||
#pragma warning ( disable : 4826 )
|
||||
|
||||
__int64 newDataAndCount = ((__int64) newIndicesAndData) & 0x0000ffffffffffffL;
|
||||
#pragma warning ( default : 4826 )
|
||||
|
||||
newDataAndCount |= ((__int64)planesToAlloc) << 48;
|
||||
|
||||
// Attempt to update the data & count atomically. This command will Only succeed if the data stored at
|
||||
@@ -633,9 +633,9 @@ void SparseLightStorage::read(DataInputStream *dis)
|
||||
byteArray wrapper(dataPointer, count * 128 + 128);
|
||||
dis->readFully(wrapper);
|
||||
|
||||
#pragma warning ( disable : 4826 )
|
||||
|
||||
__int64 newDataAndCount = ((__int64) dataPointer) & 0x0000ffffffffffffL;
|
||||
#pragma warning ( default : 4826 )
|
||||
|
||||
newDataAndCount |= ((__int64)count) << 48;
|
||||
|
||||
updateDataAndCount( newDataAndCount );
|
||||
|
||||
Reference in New Issue
Block a user