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:
@@ -20,7 +20,7 @@ using namespace std;
|
||||
TileItem::TileItem(int id) : Item(id)
|
||||
{
|
||||
this->tileId = id + 256;
|
||||
itemIcon = NULL;
|
||||
itemIcon = nullptr;
|
||||
}
|
||||
|
||||
int TileItem::getTileId()
|
||||
@@ -39,7 +39,7 @@ int TileItem::getIconType()
|
||||
|
||||
Icon *TileItem::getIcon(int auxValue)
|
||||
{
|
||||
if (itemIcon != NULL)
|
||||
if (itemIcon != nullptr)
|
||||
{
|
||||
return itemIcon;
|
||||
}
|
||||
@@ -128,7 +128,7 @@ bool TileItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Player> playe
|
||||
//
|
||||
// if(iPlaceSound==-1)
|
||||
// {
|
||||
// strcpy(szPlaceSoundName,"NULL");
|
||||
// strcpy(szPlaceSoundName,"nullptr");
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
@@ -136,7 +136,7 @@ bool TileItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Player> playe
|
||||
// }
|
||||
// if(iStepSound==-1)
|
||||
// {
|
||||
// strcpy(szStepSoundName,"NULL");
|
||||
// strcpy(szStepSoundName,"nullptr");
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
|
||||
Reference in New Issue
Block a user