mirror of
https://port.numenaute.org/aleajactaest/khanat-code-old.git
synced 2024-11-09 16:59:01 +00:00
correction du merge sur la partie server
This commit is contained in:
parent
2794a69475
commit
bf0e7f65ec
3 changed files with 0 additions and 32 deletions
|
@ -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);
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in a new issue