Project modernization (#630)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
This commit is contained in:
@@ -14,14 +14,14 @@
|
||||
// private boolean replacement;
|
||||
|
||||
LevelType *LevelType::levelTypes[16];// = new LevelType[16];
|
||||
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);
|
||||
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);
|
||||
|
||||
void LevelType::staticCtor()
|
||||
{
|
||||
for(int i=0;i<16;i++) levelTypes[i]=NULL;
|
||||
for(int i=0;i<16;i++) levelTypes[i]=nullptr;
|
||||
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] != NULL && (genname.compare(name)==0))
|
||||
if (levelTypes[i] != nullptr && (genname.compare(name)==0))
|
||||
{
|
||||
return levelTypes[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
int LevelType::getId()
|
||||
|
||||
Reference in New Issue
Block a user