Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -14,14 +14,14 @@
|
||||
// private boolean replacement;
|
||||
|
||||
LevelType *LevelType::levelTypes[16];// = new LevelType[16];
|
||||
LevelType *LevelType::lvl_normal=nullptr;// = new LevelType(0, "default", 1).setHasReplacement();
|
||||
LevelType *LevelType::lvl_flat=nullptr;// = new LevelType(1, "flat");
|
||||
LevelType *LevelType::lvl_largeBiomes = nullptr;// = new LevelType(2, "largeBiomes");
|
||||
LevelType *LevelType::lvl_normal_1_1=nullptr;// = new LevelType(8, "default_1_1", 0).setSelectableByUser(false);
|
||||
LevelType *LevelType::lvl_normal=NULL;// = new LevelType(0, "default", 1).setHasReplacement();
|
||||
LevelType *LevelType::lvl_flat=NULL;// = new LevelType(1, "flat");
|
||||
LevelType *LevelType::lvl_largeBiomes = NULL;// = new LevelType(2, "largeBiomes");
|
||||
LevelType *LevelType::lvl_normal_1_1=NULL;// = new LevelType(8, "default_1_1", 0).setSelectableByUser(false);
|
||||
|
||||
void LevelType::staticCtor()
|
||||
{
|
||||
for(int i=0;i<16;i++) levelTypes[i]=nullptr;
|
||||
for(int i=0;i<16;i++) levelTypes[i]=NULL;
|
||||
lvl_normal = new LevelType(0, L"default", 1);
|
||||
lvl_normal->setHasReplacement();
|
||||
lvl_flat = new LevelType(1, L"flat");
|
||||
@@ -107,13 +107,13 @@ LevelType *LevelType::getLevelType(wstring name)
|
||||
{
|
||||
wstring genname=levelTypes[i]->m_generatorName;
|
||||
|
||||
if (levelTypes[i] != nullptr && (genname.compare(name)==0))
|
||||
if (levelTypes[i] != NULL && (genname.compare(name)==0))
|
||||
{
|
||||
return levelTypes[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int LevelType::getId()
|
||||
|
||||
Reference in New Issue
Block a user