Get rid of MSVC's __int64
Use either int64_t, uint64_t or long long and unsigned long long, defined as per C++11 standard
This commit is contained in:
@@ -85,7 +85,7 @@ GameType *GameType::byName(const wstring &name)
|
||||
return SURVIVAL;
|
||||
}
|
||||
|
||||
void LevelSettings::_init(__int64 seed, GameType *gameType, bool generateMapFeatures, bool hardcore, bool newSeaLevel, LevelType *levelType, int xzSize, int hellScale)
|
||||
void LevelSettings::_init(int64_t seed, GameType *gameType, bool generateMapFeatures, bool hardcore, bool newSeaLevel, LevelType *levelType, int xzSize, int hellScale)
|
||||
{
|
||||
this->seed = seed;
|
||||
this->gameType = gameType;
|
||||
@@ -99,11 +99,11 @@ void LevelSettings::_init(__int64 seed, GameType *gameType, bool generateMapFeat
|
||||
m_hellScale = hellScale;
|
||||
}
|
||||
|
||||
LevelSettings::LevelSettings(__int64 seed, GameType *gameType, bool generateMapFeatures, bool hardcore, bool newSeaLevel, LevelType *levelType, int xzSize, int hellScale) :
|
||||
seed(seed),
|
||||
gameType(gameType),
|
||||
LevelSettings::LevelSettings(int64_t seed, GameType *gameType, bool generateMapFeatures, bool hardcore, bool newSeaLevel, LevelType *levelType, int xzSize, int hellScale) :
|
||||
seed(seed),
|
||||
gameType(gameType),
|
||||
hardcore(hardcore),
|
||||
generateMapFeatures(generateMapFeatures),
|
||||
generateMapFeatures(generateMapFeatures),
|
||||
newSeaLevel(newSeaLevel),
|
||||
levelType(levelType),
|
||||
startingBonusItems(false)
|
||||
@@ -133,7 +133,7 @@ bool LevelSettings::hasStartingBonusItems()
|
||||
return startingBonusItems;
|
||||
}
|
||||
|
||||
__int64 LevelSettings::getSeed()
|
||||
int64_t LevelSettings::getSeed()
|
||||
{
|
||||
return seed;
|
||||
}
|
||||
@@ -148,7 +148,7 @@ bool LevelSettings::isHardcore()
|
||||
return hardcore;
|
||||
}
|
||||
|
||||
LevelType *LevelSettings::getLevelType()
|
||||
LevelType *LevelSettings::getLevelType()
|
||||
{
|
||||
return levelType;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user