* 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
42 lines
1.1 KiB
C++
42 lines
1.1 KiB
C++
#include "stdafx.h"
|
|
#include "Container.h"
|
|
#include "EntitySelector.h"
|
|
|
|
const EntitySelector *EntitySelector::ENTITY_STILL_ALIVE = new AliveEntitySelector();
|
|
const EntitySelector *EntitySelector::CONTAINER_ENTITY_SELECTOR = new ContainerEntitySelector();
|
|
|
|
bool AliveEntitySelector::matches(shared_ptr<Entity> entity) const
|
|
{
|
|
return entity->isAlive();
|
|
}
|
|
|
|
bool ContainerEntitySelector::matches(shared_ptr<Entity> entity) const
|
|
{
|
|
return (dynamic_pointer_cast<Container>(entity) != nullptr) && entity->isAlive();
|
|
}
|
|
|
|
MobCanWearArmourEntitySelector::MobCanWearArmourEntitySelector(shared_ptr<ItemInstance> item)
|
|
{
|
|
this->item = item;
|
|
}
|
|
|
|
bool MobCanWearArmourEntitySelector::matches(shared_ptr<Entity> entity) const
|
|
{
|
|
if ( !entity->isAlive() ) return false;
|
|
if ( !entity->instanceof(eTYPE_LIVINGENTITY) ) return false;
|
|
|
|
shared_ptr<LivingEntity> mob = dynamic_pointer_cast<LivingEntity>(entity);
|
|
|
|
if (mob->getCarried(Mob::getEquipmentSlotForItem(item)) != nullptr) return false;
|
|
|
|
if ( mob->instanceof(eTYPE_MOB) )
|
|
{
|
|
return dynamic_pointer_cast<Mob>(mob)->canPickUpLoot();
|
|
}
|
|
else if (mob->instanceof(eTYPE_PLAYER))
|
|
{
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
} |