mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 11:07:45 +00:00
Code Activity

clean up

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/scripts/action/war/ActionMaim37.cpp
View file

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

1
src/scripts/action/war/ActionStormsEye45.cpp
View file

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

1
src/scripts/action/war/ActionStormsPath42.cpp
View file

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

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

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

6
src/world/Actor/Player.h
View file

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