Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More fixes

Browse Source
This commit is contained in:
Daegaladh 2024-08-27 23:15:28 +02:00
parent ba156ae3d2
commit d5ce32d7bf
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/map/clif.cpp
View File

@ -1768,13 +1768,13 @@ void clif_homunculus_updatestatus(map_session_data& sd, _sp type) {
p.value = static_cast<decltype(p.value)>( std::min<decltype(sd.hd->homunculus.exp)>( sd.hd->homunculus.exp, std::numeric_limits<decltype(PACKET_ZC_PROPERTY_HOMUN::exp)>::max() ) ); p.value = static_cast<decltype(p.value)>( std::min<decltype(sd.hd->homunculus.exp)>( sd.hd->homunculus.exp, std::numeric_limits<decltype(PACKET_ZC_PROPERTY_HOMUN::exp)>::max() ) );
break; break;
case SP_HP: case SP_HP:
if (status->max_hp > (std::numeric_limits<std::make_signed<decltype(PACKET_ZC_PROPERTY_HOMUN::hp)>::type>::max() / 100)) if (status->max_hp > (std::is_same<decltype(PACKET_ZC_PROPERTY_HOMUN::hp), uint16>::value ? INT16_MAX : std::numeric_limits<std::make_signed<decltype(PACKET_ZC_PROPERTY_HOMUN::hp)>::type>::max() / 100))
p.value = status->hp / (status->max_hp / 100); p.value = status->hp / (status->max_hp / 100);
else else
p.value = static_cast<decltype(p.value)>(status->hp); p.value = static_cast<decltype(p.value)>(status->hp);
break; break;
case SP_SP: case SP_SP:
if (status->max_sp > (std::numeric_limits<std::make_signed<decltype(PACKET_ZC_PROPERTY_HOMUN::sp)>::type>::max() / 100)) if (status->max_sp > (std::is_same<decltype(PACKET_ZC_PROPERTY_HOMUN::sp), uint16>::value ? INT16_MAX : std::numeric_limits<std::make_signed<decltype(PACKET_ZC_PROPERTY_HOMUN::sp)>::type>::max() / 100))
p.value = status->sp / (status->max_sp / 100); p.value = status->sp / (status->max_sp / 100);
else else
p.value = static_cast<decltype(p.value)>(status->sp); p.value = static_cast<decltype(p.value)>(status->sp);
@ -1828,14 +1828,14 @@ void clif_hominfo( map_session_data *sd, struct homun_data *hd, int flag ){
p.amotion = (flag) ? 0 : status->amotion; p.amotion = (flag) ? 0 : status->amotion;
// Homunculus HP and SP bars will screw up if the percentage calculation exceeds signed values // Homunculus HP and SP bars will screw up if the percentage calculation exceeds signed values
// Tested maximum: 21474836(=INT32_MAX/100), any value above will screw up the bars // Tested maximum: 21474836(=INT32_MAX/100), any value above will screw up the bars
if( status->max_hp > ( std::numeric_limits<decltype(p.hp)>::max() / 200 ) ){ if( status->max_hp > ( std::is_same<decltype(p.hp), uint16>::value ? INT16_MAX : std::numeric_limits<std::make_signed<decltype(p.hp)>::type>::max() / 100 ) ){
p.hp = status->hp / ( status->max_hp / 100 ); p.hp = status->hp / ( status->max_hp / 100 );
p.maxHp = 100; p.maxHp = 100;
}else{ }else{
p.hp = static_cast<decltype(p.hp)>(status->hp); p.hp = static_cast<decltype(p.hp)>(status->hp);
p.maxHp = static_cast<decltype(p.maxHp)>(status->max_hp); p.maxHp = static_cast<decltype(p.maxHp)>(status->max_hp);
} }
if( status->max_sp > ( std::numeric_limits<decltype(p.sp)>::max() / 200) ){ if( status->max_sp > ( std::is_same<decltype(p.sp), uint16>::value ? INT16_MAX : std::numeric_limits<std::make_signed<decltype(p.sp)>::type>::max() / 100 ) ){
p.sp = status->sp / ( status->max_sp / 100 ); p.sp = status->sp / ( status->max_sp / 100 );
p.maxSp = 100; p.maxSp = 100;
}else{ }else{