backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-19 21:52:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #80 from zukrmn/fix/linux-compiler-warnings

Browse source 
fix: resolve high-severity Linux compiler warnings
This commit is contained in:
ThePixelMoon 2026-03-07 03:23:05 +02:00 committed by GitHub
parent 41314fa873 e3fc6ebe52
commit 87c9733e09
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Minecraft.Client/GameState/GameMode.cpp
View file

@ -49,6 +49,7 @@ void GameMode::render(float a)
bool GameMode::useItem(shared_ptr<Player> player, Level *level, shared_ptr<ItemInstance> item, bool bTestUseOnly)
{
return false;
}
void GameMode::initPlayer(shared_ptr<Player> player)

2
Minecraft.World/IO/Files/ConsoleSaveFileConverter.cpp
View file

@ -102,7 +102,7 @@ void ConsoleSaveFileConverter::ConvertSave(ConsoleSaveFile *sourceSave, ConsoleS
{
FileEntry *sourceFe = sourceSave->createFile( sourcePlayerDatPath );
FileEntry *targetFe = targetSave->createFile( targetPlayerDatPath );
printf("Processing player dat file %s\n", playerFiles->at(fileIdx)->data.filename);
wprintf(L"Processing player dat file %ls\n", playerFiles->at(fileIdx)->data.filename);
ProcessSimpleFile(sourceSave, sourceFe, targetSave, targetFe);
targetFe->data.lastModifiedTime = sourceFe->data.lastModifiedTime;

4
Minecraft.World/IO/Files/FileOutputStream.cpp
View file

@ -86,7 +86,7 @@ void FileOutputStream::write(unsigned int b)
);
#else // LINUX
int fileDescriptor = (int)(intptr_t)(m_fileHandle);
ssize_t numberOfBytesWritten = ::write(fileDescriptor, NULL, 1);
ssize_t numberOfBytesWritten = ::write(fileDescriptor, &value, 1);
int result = static_cast<int>(numberOfBytesWritten);
#endif // _WIN32
@ -115,7 +115,7 @@ void FileOutputStream::write(byteArray b)
);
#else // Linux
int fileDescriptor = (int)(intptr_t)(m_fileHandle);
ssize_t numberOfBytesWritten = ::write(fileDescriptor, NULL, 1);
ssize_t numberOfBytesWritten = ::write(fileDescriptor, static_cast<const void*>(b.data), b.length);
int result = static_cast<int>(numberOfBytesWritten);
#endif // _WIN32

4
Minecraft.World/Level/Storage/ChunkStorageProfileDecorator.cpp
View file

@ -44,6 +44,8 @@ void ChunkStorageProfilerDecorator::tick()
#ifndef _CONTENT_PACKAGE
#ifdef __PSVITA__
sprintf(buf,"Average load time: %f (%lld)",0.000001 * (double) timeSpentLoading / (double) loadCount, loadCount);
#elif defined(__linux__)
sprintf(buf,"Average load time: %f (%lld)",0.000001 * (double) timeSpentLoading / (double) loadCount, (long long)loadCount);
#else
sprintf(buf,"Average load time: %f (%I64d)",0.000001 * (double) timeSpentLoading / (double) loadCount, loadCount);
#endif
@ -55,6 +57,8 @@ void ChunkStorageProfilerDecorator::tick()
#ifndef _CONTENT_PACKAGE
#ifdef __PSVITA__
sprintf(buf,"Average save time: %f (%lld)",0.000001 * (double) timeSpentSaving / (double) loadCount, loadCount);
#elif defined(__linux__)
sprintf(buf,"Average save time: %f (%lld)",0.000001 * (double) timeSpentSaving / (double) loadCount, (long long)loadCount);
#else
sprintf(buf,"Average save time: %f (%I64d)",0.000001 * (double) timeSpentSaving / (double) loadCount, loadCount);
#endif