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:
@@ -6,8 +6,8 @@
|
||||
CompoundContainer::CompoundContainer(int name, shared_ptr<Container> c1, shared_ptr<Container> c2)
|
||||
{
|
||||
this->name = name;
|
||||
if (c1 == NULL) c1 = c2;
|
||||
if (c2 == NULL) c2 = c1;
|
||||
if (c1 == nullptr) c1 = c2;
|
||||
if (c2 == nullptr) c2 = c1;
|
||||
this->c1 = c1;
|
||||
this->c2 = c2;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user