mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 14:37:44 +00:00
Code Activity

EObj: use permissionInvisibilty

Browse source
This commit is contained in:
Rushi 2022-02-16 23:18:32 +01:00
parent 9b5b72f922
commit bd635b18c5
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/world/Actor/EventObject.cpp
View file

@ -86,8 +86,6 @@ uint8_t Sapphire::Entity::EventObject::getState() const
void Sapphire::Entity::EventObject::setState( uint8_t state ) void Sapphire::Entity::EventObject::setState( uint8_t state )
{ {
m_state = state; m_state = state;
sendToInRangeSet( makeActorControl( getId(), DirectorEObjMod, state ) );
} }
void Sapphire::Entity::EventObject::setAnimationFlag( uint32_t flag, uint32_t animationFlag ) void Sapphire::Entity::EventObject::setAnimationFlag( uint32_t flag, uint32_t animationFlag )
@ -144,6 +142,7 @@ void Sapphire::Entity::EventObject::spawn( Sapphire::Entity::PlayerPtr pTarget )
eobjStatePacket->data().EntityId = getId(); eobjStatePacket->data().EntityId = getId();
eobjStatePacket->data().Dir = Util::floatToUInt16Rot( getRot() ); eobjStatePacket->data().Dir = Util::floatToUInt16Rot( getRot() );
eobjStatePacket->data().OwnerId = getOwnerId(); eobjStatePacket->data().OwnerId = getOwnerId();
eobjStatePacket->data().PermissionInvisibility = getPermissionInvisibility();
eobjStatePacket->data().Args = 0xE0; eobjStatePacket->data().Args = 0xE0;
eobjStatePacket->data().Args2 = 0; // initial animation state eobjStatePacket->data().Args2 = 0; // initial animation state
eobjStatePacket->data().Args3 = getHousingLink(); eobjStatePacket->data().Args3 = getHousingLink();
@ -178,6 +177,8 @@ uint8_t Sapphire::Entity::EventObject::getPermissionInvisibility() const
void Sapphire::Entity::EventObject::setPermissionInvisibility( uint8_t permissionInvisibility ) void Sapphire::Entity::EventObject::setPermissionInvisibility( uint8_t permissionInvisibility )
{ {
m_permissionInvisibility = permissionInvisibility; m_permissionInvisibility = permissionInvisibility;
sendToInRangeSet( makeActorControl( getId(), DirectorEObjMod, permissionInvisibility ) );
} }
uint32_t Sapphire::Entity::EventObject::getOwnerId() const uint32_t Sapphire::Entity::EventObject::getOwnerId() const

2
src/world/Manager/DebugCommandMgr.cpp
View file

@ -993,7 +993,7 @@ void DebugCommandMgr::instance( char* data, Entity::Player& player, std::shared_
if( !obj ) if( !obj )
return; return;
obj->setState( state ); obj->setPermissionInvisibility( state );
} }
else if( subCommand == "objflag" ) else if( subCommand == "objflag" )
{ {

2
src/world/Territory/InstanceContent.cpp
View file

@ -154,7 +154,7 @@ void Sapphire::InstanceContent::onUpdate( uint64_t tickCount )
sendDutyCommence(); sendDutyCommence();
if( m_pEntranceEObj ) if( m_pEntranceEObj )
m_pEntranceEObj->setState( 1 ); m_pEntranceEObj->setPermissionInvisibility( 1 );
m_state = DutyInProgress; m_state = DutyInProgress;
break; break;
} }