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,7 +5,7 @@
|
||||
|
||||
ThinFenceTile::ThinFenceTile(int id, const wstring &tex, const wstring &edgeTex, Material *material, bool dropsResources) : Tile(id, material,isSolidRender())
|
||||
{
|
||||
iconSide = NULL;
|
||||
iconSide = nullptr;
|
||||
edgeTexture = edgeTex;
|
||||
this->dropsResources = dropsResources;
|
||||
this->texture = tex;
|
||||
@@ -144,7 +144,7 @@ bool ThinFenceTile::isSilkTouchable()
|
||||
|
||||
shared_ptr<ItemInstance> ThinFenceTile::getSilkTouchItemInstance(int data)
|
||||
{
|
||||
return shared_ptr<ItemInstance>(new ItemInstance(id, 1, data));
|
||||
return std::make_shared<ItemInstance>(id, 1, data);
|
||||
}
|
||||
|
||||
void ThinFenceTile::registerIcons(IconRegister *iconRegister)
|
||||
|
||||
Reference in New Issue
Block a user