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,7 +14,7 @@ void NoteBlockTile::neighborChanged(Level *level, int x, int y, int z, int type)
|
||||
bool signal = level->hasNeighborSignal(x, y, z);
|
||||
shared_ptr<MusicTileEntity> mte = dynamic_pointer_cast<MusicTileEntity>( level->getTileEntity(x, y, z) );
|
||||
app.DebugPrintf("-------- Signal is %s, tile is currently %s\n",signal?"TRUE":"FALSE", mte->on?"ON":"OFF");
|
||||
if (mte != NULL && mte->on != signal)
|
||||
if (mte != nullptr && mte->on != signal)
|
||||
{
|
||||
if (signal)
|
||||
{
|
||||
@@ -35,7 +35,7 @@ bool NoteBlockTile::use(Level *level, int x, int y, int z, shared_ptr<Player> pl
|
||||
if (soundOnly) return false;
|
||||
if (level->isClientSide) return true;
|
||||
shared_ptr<MusicTileEntity> mte = dynamic_pointer_cast<MusicTileEntity>( level->getTileEntity(x, y, z) );
|
||||
if (mte != NULL )
|
||||
if (mte != nullptr )
|
||||
{
|
||||
mte->tune();
|
||||
mte->playNote(level, x, y, z);
|
||||
@@ -47,17 +47,17 @@ void NoteBlockTile::attack(Level *level, int x, int y, int z, shared_ptr<Player>
|
||||
{
|
||||
if (level->isClientSide) return;
|
||||
shared_ptr<MusicTileEntity> mte = dynamic_pointer_cast<MusicTileEntity>( level->getTileEntity(x, y, z) );
|
||||
if( mte != NULL ) mte->playNote(level, x, y, z);
|
||||
if( mte != nullptr ) mte->playNote(level, x, y, z);
|
||||
}
|
||||
|
||||
shared_ptr<TileEntity> NoteBlockTile::newTileEntity(Level *level)
|
||||
{
|
||||
return shared_ptr<MusicTileEntity>( new MusicTileEntity() );
|
||||
return std::make_shared<MusicTileEntity>();
|
||||
}
|
||||
|
||||
bool NoteBlockTile::triggerEvent(Level *level, int x, int y, int z, int i, int note)
|
||||
{
|
||||
float pitch = (float) pow(2, (note - 12) / 12.0);
|
||||
float pitch = static_cast<float>(pow(2, (note - 12) / 12.0));
|
||||
|
||||
int iSound;
|
||||
switch(i)
|
||||
|
||||
Reference in New Issue
Block a user