mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 19:17:45 +00:00
Code Activity

Merge remote-tracking branch 'remotes/origin/develop' into develop_5.25

Browse source
This commit is contained in:
collett 2020-04-25 17:38:51 +09:00
commit be2c791746
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/common/Common.h
View file

@ -584,8 +584,8 @@ namespace Sapphire::Common
StatusEffect = 10, StatusEffect = 10,
WARGauge = 22, WARGauge = 22,
DRKGauge = 25, DRKGauge = 25,
// AetherflowStack = 30, // AetherflowStack = 30,
// Status = 32, // Status = 32,
SAMKenki = 39, SAMKenki = 39,
SAMSen = 40, SAMSen = 40,
PLDGauge = 41, PLDGauge = 41,
@ -593,9 +593,9 @@ namespace Sapphire::Common
WHMBloodLily = 56, WHMBloodLily = 56,
WHMLily = 57, WHMLily = 57,
SAMMeditation = 63, SAMMeditation = 63,
// RDMGaugeBoth = 74, // RDMGaugeBoth = 74,
//// RDMGaugeBlack = 75, // not right? //// RDMGaugeBlack = 75, // not right?
// DRGGauge3Eyes = 76, // DRGGauge3Eyes = 76,
}; };
enum class AttackType : int8_t enum class AttackType : int8_t

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

@ -366,8 +366,9 @@ void Sapphire::World::Manager::DebugCommandMgr::set( char* data, Entity::Player&
uint8_t values[15]; uint8_t values[15];
std::memset( values, 0, sizeof( values ) ); std::memset( values, 0, sizeof( values ) );
sscanf( params.c_str(), "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d", sscanf( params.c_str(), "%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d",
&values[0], &values[1], &values[2], &values[3], &values[4], &values[5], &values[6], &values[7], &values[8], &values[ 0 ], &values[ 1 ], &values[ 2 ], &values[ 3 ], &values[ 4 ],
&values[9], &values[10], &values[11], &values[12], &values[13], &values[14] ); &values[ 5 ], &values[ 6 ], &values[ 7 ], &values[ 8 ], &values[ 9 ],
&values[ 10 ], &values[ 11 ], &values[ 12 ], &values[ 13 ], &values[ 14 ] );
player.gaugeSetRaw( values ); player.gaugeSetRaw( values );
} }
else if( subCommand == "visual" ) else if( subCommand == "visual" )