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

Aethery bools fix and potential action flags.

Browse source
This commit is contained in:
Mordred 2022-01-12 23:16:49 +01:00
parent c5c8199bd2
commit be8d885e39
2 changed files with 35 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
deps/datReader/Exd/Structs.h vendored
View file

@ -345,32 +345,32 @@ namespace Component::Excel
int8_t SelectCorpse; int8_t SelectCorpse;
int8_t AttackType; int8_t AttackType;
uint8_t SelectMyPet : 1;
uint8_t SelectGround : 1;
uint8_t SelectENpc : 1;
uint8_t SelectOthers : 1;
uint8_t SelectEnemy : 1;
uint8_t SelectAlliance : 1;
uint8_t SelectParty : 1;
uint8_t SelectMyself : 1; uint8_t SelectMyself : 1;
uint8_t SelectParty : 1;
uint8_t SelectAlliance : 1;
uint8_t SelectEnemy : 1;
uint8_t SelectOthers : 1;
uint8_t SelectENpc : 1;
uint8_t SelectGround : 1;
uint8_t SelectMyPet : 1;
uint8_t PvPOnly : 1;
uint8_t InvalidMove : 1;
uint8_t Silence : 1;
uint8_t ComboContinue : 1;
uint8_t EffectEnemy : 1;
uint8_t CheckDir : 1;
uint8_t Lay : 1;
uint8_t SelectPartyPet : 1; uint8_t SelectPartyPet : 1;
uint8_t Lay : 1;
uint8_t CheckDir : 1;
uint8_t EffectEnemy : 1;
uint8_t ComboContinue : 1;
uint8_t Silence : 1;
uint8_t InvalidMove : 1;
uint8_t PvPOnly : 1;
uint8_t IsTargetLine : 1;
uint8_t HideCastBar : 1;
uint8_t ForceVFX : 1;
uint8_t LogExec : 1;
uint8_t LogMiss : 1;
uint8_t LogCast : 1;
uint8_t IsMove : 1;
uint8_t IsAvoid : 1; uint8_t IsAvoid : 1;
uint8_t IsMove : 1;
uint8_t LogCast : 1;
uint8_t LogMiss : 1;
uint8_t LogExec : 1;
uint8_t ForceVFX : 1;
uint8_t HideCastBar : 1;
uint8_t IsTargetLine : 1;
int8_t padding0; int8_t padding0;
}; };
@ -667,14 +667,13 @@ namespace Component::Excel
uint16_t TelepoName; uint16_t TelepoName;
uint16_t TransferName; uint16_t TransferName;
uint16_t TerritoryType; uint16_t TerritoryType;
uint16_t TextIcon;
int16_t CostPosX; int16_t CostPosX;
int16_t CostPosY; int16_t CostPosY;
uint8_t Town; uint8_t Town;
uint8_t SortKey; uint8_t SortKey;
uint8_t TextIcon; uint8_t Telepo : 1;
uint8_t Telepo : 7; uint8_t padding1 : 7;
uint8_t padding1 : 1;
int8_t padding2[2];
}; };
/* 195176 */ /* 195176 */

12
src/world/WorldServer.cpp
View file

@ -148,6 +148,17 @@ void Sapphire::World::WorldServer::run( int32_t argc, char* argv[] )
} }
Common::Service< Data::ExdData >::set( pExdData ); Common::Service< Data::ExdData >::set( pExdData );
auto idList = pExdData->getIdList< Component::Excel::Aetheryte >();
for( auto id : idList )
{
auto aetherInfo = pExdData->getRow< Component::Excel::Aetheryte >( id );
Logger::info( "id: {0} bool: {1}, padd: {2}", id, aetherInfo->data().Telepo, aetherInfo->data().padding1 );
}
auto pDb = std::make_shared< Db::DbWorkerPool< Db::ZoneDbConnection > >(); auto pDb = std::make_shared< Db::DbWorkerPool< Db::ZoneDbConnection > >();
Sapphire::Db::DbLoader loader; Sapphire::Db::DbLoader loader;
loader.addDb( *pDb, m_config.global.database ); loader.addDb( *pDb, m_config.global.database );
@ -419,7 +430,6 @@ Sapphire::World::SessionPtr Sapphire::World::WorldServer::getSession( uint64_t i
return nullptr; return nullptr;
} }
Sapphire::World::SessionPtr Sapphire::World::WorldServer::getSession( const std::string& playerName ) Sapphire::World::SessionPtr Sapphire::World::WorldServer::getSession( const std::string& playerName )
{ {
//std::lock_guard<std::mutex> lock( m_sessionMutex ); //std::lock_guard<std::mutex> lock( m_sessionMutex );