1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 19:17:45 +00:00
This commit is contained in:
collett 2020-02-02 19:49:16 +09:00
parent 450ff0ddff
commit aaccb4bd6a
5 changed files with 8 additions and 6 deletions

View file

@ -22,7 +22,6 @@ public:
uint8_t ib = pPlayer->gaugeWarGetIb(); uint8_t ib = pPlayer->gaugeWarGetIb();
ib = std::min( 100, ib + 10 ); ib = std::min( 100, ib + 10 );
pPlayer->gaugeWarSetIb( ib ); pPlayer->gaugeWarSetIb( ib );
pPlayer->sendActorGuage();
} }
}; };

View file

@ -22,7 +22,6 @@ public:
uint8_t ib = pPlayer->gaugeWarGetIb(); uint8_t ib = pPlayer->gaugeWarGetIb();
ib = std::min( 100, ib + 10 ); ib = std::min( 100, ib + 10 );
pPlayer->gaugeWarSetIb( ib ); pPlayer->gaugeWarSetIb( ib );
pPlayer->sendActorGuage();
} }
}; };

View file

@ -22,7 +22,6 @@ public:
uint8_t ib = pPlayer->gaugeWarGetIb(); uint8_t ib = pPlayer->gaugeWarGetIb();
ib = std::min( 100, ib + 20 ); ib = std::min( 100, ib + 20 );
pPlayer->gaugeWarSetIb( ib ); pPlayer->gaugeWarSetIb( ib );
pPlayer->sendActorGuage();
} }
}; };

View file

@ -2161,6 +2161,7 @@ void Sapphire::Entity::Player::gaugeClear()
std::memset( m_gauge, 0, sizeof( m_gauge ) ); std::memset( m_gauge, 0, sizeof( m_gauge ) );
auto pPacket = makeZonePacket< FFXIVIpcEffect037F >( getId() ); auto pPacket = makeZonePacket< FFXIVIpcEffect037F >( getId() );
queuePacket( pPacket ); queuePacket( pPacket );
sendActorGauge();
} }
void Sapphire::Entity::Player::gaugeSet( uint8_t index, uint8_t value ) void Sapphire::Entity::Player::gaugeSet( uint8_t index, uint8_t value )
@ -2173,7 +2174,7 @@ uint8_t Sapphire::Entity::Player::gaugeGet( uint8_t index )
return m_gauge[ index ]; return m_gauge[ index ];
} }
void Sapphire::Entity::Player::sendActorGuage() void Sapphire::Entity::Player::sendActorGauge()
{ {
auto pPacket = makeZonePacket< FFXIVIpcActorGauge >( getId() ); auto pPacket = makeZonePacket< FFXIVIpcActorGauge >( getId() );
pPacket->data().classJobId = static_cast< uint8_t >( getClass() ); pPacket->data().classJobId = static_cast< uint8_t >( getClass() );
@ -2197,6 +2198,8 @@ void Sapphire::Entity::Player::gaugeWarSetIb( uint8_t value )
queuePacket( pPacket ); queuePacket( pPacket );
} }
gaugeSet( 0, value ); gaugeSet( 0, value );
if( oldValue != value )
sendActorGauge();
} }
uint8_t Sapphire::Entity::Player::gaugeWarGetIb() uint8_t Sapphire::Entity::Player::gaugeWarGetIb()

View file

@ -973,10 +973,12 @@ namespace Sapphire::Entity
// Job UI // Job UI
////////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////////
void gaugeClear(); private:
void gaugeSet( uint8_t index, uint8_t value ); void gaugeSet( uint8_t index, uint8_t value );
uint8_t gaugeGet( uint8_t index ); uint8_t gaugeGet( uint8_t index );
void sendActorGuage(); public:
void gaugeClear();
void sendActorGauge();
void gaugeWarSetIb( uint8_t value ); void gaugeWarSetIb( uint8_t value );
uint8_t gaugeWarGetIb(); uint8_t gaugeWarGetIb();