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

Merge pull request #376 from NotAdam/develop

Browse source 
misc fixes
This commit is contained in:
Mordred 2018-08-23 15:34:33 +02:00 • committed by GitHub
commit cc07b4421e
6 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/Common.h
View file

@ -600,6 +600,9 @@ namespace Common {
HideWeapon = 0x2, HideWeapon = 0x2,
HideLegacyMark = 0x4, HideLegacyMark = 0x4,
StoreNewItemsInArmouryChest = 0x5,
StoreCraftedItemsInInventory = 0x6,
Visor = 0x40, Visor = 0x40,
}; };

2
src/common/Network/GamePacketNew.h
View file

@ -219,7 +219,7 @@ public:
return data; return data;
} }
virtual T1 ipcType() T1 ipcType() override
{ {
return static_cast< T1 >( m_data._ServerIpcType ); return static_cast< T1 >( m_data._ServerIpcType );
}; };

2
src/servers/Scripts/quest/subquest/gridania/SubFst008.cpp
View file

@ -57,7 +57,7 @@ class SubFst008 : public EventScript
{ {
Scene00001( player ); Scene00001( player );
} }
else if( Actor2 == Actor2 ) else if( actor == Actor2 )
{ {
Scene00002( player ); Scene00002( player );
} }

2
src/servers/sapphire_zone/Actor/Player.h
View file

@ -131,7 +131,7 @@ public:
/*! update quest ( register it as active quest if new ) */ /*! update quest ( register it as active quest if new ) */
void updateQuest( uint16_t questId, uint8_t sequence ); void updateQuest( uint16_t questId, uint8_t sequence );
/*! return true if quest is currently active */ /*! return true if quest is currently active */
bool hasQuest( uint16_t questId ); bool hasQuest( uint32_t questId );
/*! return the current quest sequence */ /*! return the current quest sequence */
uint8_t getQuestSeq( uint16_t questId ); uint8_t getQuestSeq( uint16_t questId );
/*! send the quest tracker packet */ /*! send the quest tracker packet */

4
src/servers/sapphire_zone/Actor/PlayerQuest.cpp
View file

@ -72,9 +72,9 @@ void Core::Entity::Player::removeQuest( uint16_t questId )
} }
bool Core::Entity::Player::hasQuest( uint16_t questId ) bool Core::Entity::Player::hasQuest( uint32_t questId )
{ {
return ( getQuestIndex( questId ) > -1 ); return ( getQuestIndex( static_cast< uint16_t >( questId ) ) > -1 );
} }
int8_t Core::Entity::Player::getQuestIndex( uint16_t questId ) int8_t Core::Entity::Player::getQuestIndex( uint16_t questId )

3
src/servers/sapphire_zone/Network/GameConnection.cpp
View file

@ -259,6 +259,9 @@ void Core::Network::GameConnection::handlePacket( Core::Network::Packets::FFXIVA
case Network::ConnectionType::Chat: case Network::ConnectionType::Chat:
handleChatPacket( pPacket ); handleChatPacket( pPacket );
break; break;
default:
break;
} }
} }