mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-08-20 09:57:10 +00:00
Remove DWORD from server init settings
This commit is contained in:
parent
238bf98cad
commit
c247f918f1
|
|
@ -99,7 +99,7 @@ MinecraftServer::~MinecraftServer()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
bool MinecraftServer::initServer(__int64 seed, NetworkGameInitData *initData, DWORD initSettings, bool findSeed)
|
bool MinecraftServer::initServer(__int64 seed, NetworkGameInitData *initData, std::uint32_t initSettings, bool findSeed)
|
||||||
{
|
{
|
||||||
// 4J - removed
|
// 4J - removed
|
||||||
#if 0
|
#if 0
|
||||||
|
|
@ -1060,7 +1060,7 @@ extern int c0a, c0b, c1a, c1b, c1c, c2a, c2b;
|
||||||
void MinecraftServer::run(__int64 seed, void *lpParameter)
|
void MinecraftServer::run(__int64 seed, void *lpParameter)
|
||||||
{
|
{
|
||||||
NetworkGameInitData *initData = NULL;
|
NetworkGameInitData *initData = NULL;
|
||||||
DWORD initSettings = 0;
|
std::uint32_t initSettings = 0;
|
||||||
bool findSeed = false;
|
bool findSeed = false;
|
||||||
if(lpParameter != NULL)
|
if(lpParameter != NULL)
|
||||||
{
|
{
|
||||||
|
|
@ -1695,4 +1695,4 @@ bool MinecraftServer::flagEntitiesToBeRemoved(unsigned int *flags)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return removedFound;
|
return removedFound;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -34,7 +34,7 @@ typedef struct _NetworkGameInitData
|
||||||
{
|
{
|
||||||
__int64 seed;
|
__int64 seed;
|
||||||
LoadSaveDataThreadParam *saveData;
|
LoadSaveDataThreadParam *saveData;
|
||||||
DWORD settings;
|
std::uint32_t settings;
|
||||||
LevelGenerationOptions *levelGen;
|
LevelGenerationOptions *levelGen;
|
||||||
std::uint32_t texturePackId;
|
std::uint32_t texturePackId;
|
||||||
bool findSeed;
|
bool findSeed;
|
||||||
|
|
@ -127,7 +127,7 @@ public:
|
||||||
~MinecraftServer();
|
~MinecraftServer();
|
||||||
private:
|
private:
|
||||||
// 4J Added - LoadSaveDataThreadParam
|
// 4J Added - LoadSaveDataThreadParam
|
||||||
bool initServer(__int64 seed, NetworkGameInitData *initData, DWORD initSettings, bool findSeed);
|
bool initServer(__int64 seed, NetworkGameInitData *initData, std::uint32_t initSettings, bool findSeed);
|
||||||
void postProcessTerminate(ProgressRenderer *mcprogress);
|
void postProcessTerminate(ProgressRenderer *mcprogress);
|
||||||
bool loadLevel(LevelStorageSource *storageSource, const std::wstring& name, __int64 levelSeed, LevelType *pLevelType, NetworkGameInitData *initData);
|
bool loadLevel(LevelStorageSource *storageSource, const std::wstring& name, __int64 levelSeed, LevelType *pLevelType, NetworkGameInitData *initData);
|
||||||
void setProgress(const std::wstring& status, int progress);
|
void setProgress(const std::wstring& status, int progress);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue