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:
@@ -5,14 +5,14 @@
|
||||
#include "Material.h"
|
||||
#include "MobCategory.h"
|
||||
|
||||
MobCategory *MobCategory::monster = NULL;
|
||||
MobCategory *MobCategory::creature = NULL;
|
||||
MobCategory *MobCategory::ambient = NULL;
|
||||
MobCategory *MobCategory::waterCreature = NULL;
|
||||
MobCategory *MobCategory::monster = nullptr;
|
||||
MobCategory *MobCategory::creature = nullptr;
|
||||
MobCategory *MobCategory::ambient = nullptr;
|
||||
MobCategory *MobCategory::waterCreature = nullptr;
|
||||
// 4J - added these extra categories
|
||||
MobCategory *MobCategory::creature_wolf = NULL;
|
||||
MobCategory *MobCategory::creature_chicken = NULL;
|
||||
MobCategory *MobCategory::creature_mushroomcow = NULL;
|
||||
MobCategory *MobCategory::creature_wolf = nullptr;
|
||||
MobCategory *MobCategory::creature_chicken = nullptr;
|
||||
MobCategory *MobCategory::creature_mushroomcow = nullptr;
|
||||
|
||||
MobCategoryArray MobCategory::values = MobCategoryArray(7);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user