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

Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop

Browse source
This commit is contained in:
mordred 2019-04-09 15:11:29 +02:00
commit 86937ad542
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/Network/CommonActorControl.h
View file

@ -174,6 +174,11 @@ enum ActorControlType : uint16_t
AetherReductionDlg = 0x17D,
/*!
* param1 = state
* param2 = actorid
*/
EObjSetState = 0x199,
Unk6 = 0x19C,
EObjAnimation = 0x19D,

2
src/common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -752,9 +752,9 @@ namespace Sapphire::Network::Packets::Server
//Current instance can be confirmed at any time using the /instance text command." ( 7B F8 69 )
uint8_t unknown5;
uint32_t unknown8;
uint16_t festivalId;
uint16_t additionalFestivalId;
uint32_t unknown8;
uint32_t unknown9;
uint32_t unknown10;
uint32_t unknown11;

16
src/world/Manager/DebugCommandMgr.cpp
View file

@ -1084,7 +1084,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
sscanf( params.c_str(), "%d %d", &index, &value );
auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
if( !instance )
return;
@ -1097,7 +1097,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
sscanf( params.c_str(), "%s %hhu", objName, &state );
auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
if( !instance )
return;
@ -1115,7 +1115,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
sscanf( params.c_str(), "%s %i %i", objName, &state1, &state2 );
auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
if( !instance )
return;
@ -1134,7 +1134,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
sscanf( params.c_str(), "%hhu", &seq );
auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
if( !instance )
return;
@ -1146,7 +1146,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
sscanf( params.c_str(), "%hhu", &branch );
auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
if( !instance )
return;
@ -1154,7 +1154,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
}
else if( subCommand == "qte_start" )
{
auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
if( !instance )
return;
@ -1163,7 +1163,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
}
else if( subCommand == "event_start" )
{
auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
if( !instance )
return;
@ -1172,7 +1172,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
}
else if( subCommand == "event_end" )
{
auto instance = std::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
auto instance = std::dynamic_pointer_cast< QuestBattle >( player.getCurrentZone() );
if( !instance )
return;