mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-30 16:17:46 +00:00
Code Activity

Moved byte bool code into exd parser

Browse source
This commit is contained in:
amibu 2017-09-25 18:05:33 +02:00
parent a6d7532038
commit 70c581e60c
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/servers/Server_Common/Exd/ExdData.cpp
View file

@ -344,21 +344,13 @@ bool Core::Data::ExdData::loadActionInfo()
uint8_t points_type = getField< uint8_t >( fields, 30 ); // 30 uint8_t points_type = getField< uint8_t >( fields, 30 ); // 30
uint16_t points_cost = getField< uint16_t >( fields, 31 ); // 31 uint16_t points_cost = getField< uint16_t >( fields, 31 ); // 31
uint32_t instantval = getField< bool >( fields, 35 ); // 35 bool is_instant = getField< bool >( fields, 35 ); // 35
uint16_t cast_time = getField< uint16_t >( fields, 36 ); // 36 uint16_t cast_time = getField< uint16_t >( fields, 36 ); // 36
uint16_t recast_time = getField< uint16_t >( fields, 37 ); // 37 uint16_t recast_time = getField< uint16_t >( fields, 37 ); // 37
int8_t model = getField< int8_t >( fields, 39 ); // 39: Action model int8_t model = getField< int8_t >( fields, 39 ); // 39: Action model
uint8_t aspect = getField< uint8_t >( fields, 40 ); // 40: Action aspect uint8_t aspect = getField< uint8_t >( fields, 40 ); // 40: Action aspect
uint8_t typeshift = 0x6;
uint8_t mask = 1 << typeshift;
instantval &= mask;
bool final = ( instantval & mask ) == mask;
bool is_instant = final;
info->id = id; info->id = id;
info->name = name; info->name = name;
info->category = category; info->category = category;