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

fix debug commands not working for questbattles, map another actrl

Browse source
This commit is contained in:
NotAdam 2019-04-08 23:36:02 +10:00
parent 23f5f3b6e5
commit 799588114e
2 changed files with 13 additions and 8 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, AetherReductionDlg = 0x17D,
/*!
* param1 = state
* param2 = actorid
*/
QuestBattleEObjState = 0x199,
Unk6 = 0x19C, Unk6 = 0x19C,
EObjAnimation = 0x19D, EObjAnimation = 0x19D,

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 ); 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 ) if( !instance )
return; return;
@ -1097,7 +1097,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
sscanf( params.c_str(), "%s %hhu", objName, &state ); 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 ) if( !instance )
return; return;
@ -1115,7 +1115,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
sscanf( params.c_str(), "%s %i %i", objName, &state1, &state2 ); 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 ) if( !instance )
return; return;
@ -1134,7 +1134,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
sscanf( params.c_str(), "%hhu", &seq ); 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 ) if( !instance )
return; return;
@ -1146,7 +1146,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
sscanf( params.c_str(), "%hhu", &branch ); 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 ) if( !instance )
return; return;
@ -1154,7 +1154,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
} }
else if( subCommand == "qte_start" ) 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 ) if( !instance )
return; return;
@ -1163,7 +1163,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
} }
else if( subCommand == "event_start" ) 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 ) if( !instance )
return; return;
@ -1172,7 +1172,7 @@ void Sapphire::World::Manager::DebugCommandMgr::questBattle( char* data, Entity:
} }
else if( subCommand == "event_end" ) 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 ) if( !instance )
return; return;