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

Merge sapphire-master

Browse source
This commit is contained in:
Maru 2017-08-20 13:02:22 -03:00
commit 3b77d239cf
5 changed files with 2 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/servers/Server_Common/Common.h
View file

@ -281,7 +281,7 @@ namespace Core {
Aetherytes = 0x00000080, // Attuned aetherytes Aetherytes = 0x00000080, // Attuned aetherytes
HomePoint = 0x00000100, // Current homepoint HomePoint = 0x00000100, // Current homepoint
HowTo = 0x00000200, HowTo = 0x00000200,
FirstLogin = 0x00000400,
HpMp = 0x00000800, HpMp = 0x00000800,
QuestTracker = 0x00001000, QuestTracker = 0x00001000,
NewGame = 0x00002000, NewGame = 0x00002000,

11
src/servers/Server_Zone/Actor/Player.cpp
View file

@ -793,17 +793,6 @@ uint8_t Core::Entity::Player::getUserLevel() const
return m_userLevel; return m_userLevel;
} }
bool Core::Entity::Player::isFirstLogin() const
{
return m_bFirstLogin;
}
void Core::Entity::Player::setFirstLogin( bool mode )
{
m_bFirstLogin = mode;
setSyncFlag( PlayerSyncFlags::FirstLogin );
}
void Core::Entity::Player::eventActionStart( uint32_t eventId, void Core::Entity::Player::eventActionStart( uint32_t eventId,
uint32_t action, uint32_t action,
ActionCallback finishCallback, ActionCallback finishCallback,

6
src/servers/Server_Zone/Actor/Player.h
View file

@ -292,10 +292,6 @@ public:
void setGcRankAt( uint8_t index, uint8_t rank ); void setGcRankAt( uint8_t index, uint8_t rank );
/*! return a const pointer to the look array */ /*! return a const pointer to the look array */
const uint8_t * getLookArray() const; const uint8_t * getLookArray() const;
/*! return true if the player is loggin in for the first time */
bool isFirstLogin() const;
/*! set first log in state */
void setFirstLogin( bool mode );
/*! returns true if the player is currently in combat */ /*! returns true if the player is currently in combat */
bool isInCombat() const; bool isInCombat() const;
/*! sets players combat state */ /*! sets players combat state */
@ -593,7 +589,7 @@ private:
uint8_t m_stateFlags[7]; uint8_t m_stateFlags[7];
uint8_t m_userLevel; uint8_t m_userLevel;
uint16_t zoneId; uint16_t zoneId;
bool m_bFirstLogin;
bool m_bInCombat; bool m_bInCombat;
bool m_bLoadingComplete; bool m_bLoadingComplete;
bool m_bAutoattack; bool m_bAutoattack;

5
src/servers/Server_Zone/Actor/PlayerSql.cpp
View file

@ -128,8 +128,6 @@ bool Core::Entity::Player::load( uint32_t charId, Core::SessionPtr pSession )
m_pos.z = field[8].getFloat(); m_pos.z = field[8].getFloat();
setRotation( field[9].getFloat() ); setRotation( field[9].getFloat() );
m_bFirstLogin = field[10].getBool();
field[11].getBinary( reinterpret_cast< char* >( m_customize ), 26 ); field[11].getBinary( reinterpret_cast< char* >( m_customize ), 26 );
m_modelMainWeapon = field[12].getUInt64(); m_modelMainWeapon = field[12].getUInt64();
@ -322,9 +320,6 @@ void Core::Entity::Player::createUpdateSql()
if( m_updateFlags & PlayerSyncFlags::NewGame ) if( m_updateFlags & PlayerSyncFlags::NewGame )
charaBaseSet.insert( " IsNewGame = " + std::to_string( static_cast< uint32_t >( m_bNewGame ) ) ); charaBaseSet.insert( " IsNewGame = " + std::to_string( static_cast< uint32_t >( m_bNewGame ) ) );
if( m_updateFlags & PlayerSyncFlags::FirstLogin )
charaBaseSet.insert( " FirstLogin = 0 " );
if( m_updateFlags & PlayerSyncFlags::NewAdventurer ) if( m_updateFlags & PlayerSyncFlags::NewAdventurer )
charaBaseSet.insert( " IsNewAdventurer = " + std::to_string( static_cast< uint32_t >( m_bNewAdventurer ) ) ); charaBaseSet.insert( " IsNewAdventurer = " + std::to_string( static_cast< uint32_t >( m_bNewAdventurer ) ) );

2
src/servers/Server_Zone/Script/ScriptManagerInit.cpp
View file

@ -43,8 +43,6 @@ int Core::Scripting::ScriptManager::init()
m_pChaiHandler->add( chaiscript::fun( &Entity::Player::getClassAsInt ), "getClass" ); m_pChaiHandler->add( chaiscript::fun( &Entity::Player::getClassAsInt ), "getClass" );
m_pChaiHandler->add( chaiscript::fun( &Entity::Player::getRace ), "getRace" ); m_pChaiHandler->add( chaiscript::fun( &Entity::Player::getRace ), "getRace" );
m_pChaiHandler->add( chaiscript::fun( &Entity::Player::getGender ), "getGender" ); m_pChaiHandler->add( chaiscript::fun( &Entity::Player::getGender ), "getGender" );
m_pChaiHandler->add( chaiscript::fun( &Entity::Player::isFirstLogin ), "isFirstLogin" );
m_pChaiHandler->add( chaiscript::fun( &Entity::Player::setFirstLogin ), "setFirstLogin" );
m_pChaiHandler->add( chaiscript::fun( &Entity::Player::gainExp ), "gainExp" ); m_pChaiHandler->add( chaiscript::fun( &Entity::Player::gainExp ), "gainExp" );
m_pChaiHandler->add( chaiscript::fun( &Entity::Player::unlock ), "unlock" ); m_pChaiHandler->add( chaiscript::fun( &Entity::Player::unlock ), "unlock" );
m_pChaiHandler->add( chaiscript::fun( &Entity::Player::registerAetheryte ), "aetheryteRegister" ); m_pChaiHandler->add( chaiscript::fun( &Entity::Player::registerAetheryte ), "aetheryteRegister" );