Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

correction du merge sur la partie server

Browse source
This commit is contained in:
deed 2017-03-31 21:04:36 +02:00
parent 2794a69475
commit bf0e7f65ec
3 changed files with 0 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/server/src/entities_game_service/database_plr.cpp
View file

@ -3140,10 +3140,6 @@ void CBankAccessor_PLR::TPACK_ANIMAL::TBEAST::init(ICDBStructNode *parent, uint
nlassert(node != NULL); nlassert(node != NULL);
_DESPAWN = node; _DESPAWN = node;
node = parent->getNode( ICDBStructNode::CTextId("NAME"), false );
nlassert(node != NULL);
_NAME = node;
// WARNING: let the value to true, else it'll corrupt backups // WARNING: let the value to true, else it'll corrupt backups
node = parent->getNode( ICDBStructNode::CTextId("NAME"), true ); node = parent->getNode( ICDBStructNode::CTextId("NAME"), true );
nlassert(node != NULL); nlassert(node != NULL);

7
code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
View file

@ -829,13 +829,6 @@ void CCharacter::moveItem(INVENTORIES::TInventory srcInvId, uint32 srcSlot, INVE
return; return;
} }
// You cannot exchange genesis named items
if (srcItem->getPhraseId().find("genesis_") == 0 && !canPutNonDropableItemInInventory(dstInvId))
{
nlwarning("Character %s tries to move '%s' to inv %u", _Id.toString().c_str(), srcItem->getPhraseId().c_str(), dstInvId );
return;
}
// cannot move a pet animal ticket // cannot move a pet animal ticket
if (srcForm->Family == ITEMFAMILY::PET_ANIMAL_TICKET) if (srcForm->Family == ITEMFAMILY::PET_ANIMAL_TICKET)
return; return;

21
code/ryzom/server/src/server_share/msg_ai_service.h
View file

@ -602,27 +602,6 @@ public:
virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {} virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
}; };
//----------------------------------------------------------------------------
// AIS -> EGS ais change creature Max HP
//----------------------------------------------------------------------------
class CChangeCreatureMaxHPMsg : public CMirrorTransportClass
{
public:
std::vector<TDataSetRow> Entities;
std::vector<uint32> MaxHp;
std::vector<uint8> SetFull;
virtual void description ()
{
className ("CChangeCreatureMaxHPMsg");
propertyCont ("Entities", PropDataSetRow, Entities);
propertyCont ("MaxHp", PropUInt32, MaxHp);
propertyCont ("SetFull", PropUInt8, SetFull);
}
virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
};
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// AIS -> EGS ais change creature Max ChaScore1 // AIS -> EGS ais change creature Max ChaScore1
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------