commit newest tfs branch only for compare

This commit is contained in:
ErikasKontenis
2020-01-02 19:39:21 +02:00
parent 0b0624a20b
commit 1f7dcd7347
160 changed files with 24900 additions and 10996 deletions

View File

@@ -1,6 +1,6 @@
/**
* Tibia GIMUD Server - a free and open-source MMORPG server emulator
* Copyright (C) 2019 Sabrehaven and Mark Samman <mark.samman@gmail.com>
* The Forgotten Server - a free and open-source MMORPG server emulator
* Copyright (C) 2019 Mark Samman <mark.samman@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -21,21 +21,24 @@
#define FS_DEPOTLOCKER_H_53AD8E0606A34070B87F792611F4F3F8
#include "container.h"
#include "inbox.h"
class DepotLocker final : public Container
{
public:
explicit DepotLocker(uint16_t type);
DepotLocker* getDepotLocker() final {
DepotLocker* getDepotLocker() override {
return this;
}
const DepotLocker* getDepotLocker() const final {
const DepotLocker* getDepotLocker() const override {
return this;
}
void removeInbox(Inbox* inbox);
//serialization
Attr_ReadValue readAttr(AttrTypes_t attr, PropStream& propStream) final;
Attr_ReadValue readAttr(AttrTypes_t attr, PropStream& propStream) override;
uint16_t getDepotId() const {
return depotId;
@@ -46,12 +49,12 @@ class DepotLocker final : public Container
//cylinder implementations
ReturnValue queryAdd(int32_t index, const Thing& thing, uint32_t count,
uint32_t flags, Creature* actor = nullptr) const final;
uint32_t flags, Creature* actor = nullptr) const override;
void postAddNotification(Thing* thing, const Cylinder* oldParent, int32_t index, cylinderlink_t link = LINK_OWNER) final;
void postRemoveNotification(Thing* thing, const Cylinder* newParent, int32_t index, cylinderlink_t link = LINK_OWNER) final;
void postAddNotification(Thing* thing, const Cylinder* oldParent, int32_t index, cylinderlink_t link = LINK_OWNER) override;
void postRemoveNotification(Thing* thing, const Cylinder* newParent, int32_t index, cylinderlink_t link = LINK_OWNER) override;
bool canRemove() const final {
bool canRemove() const override {
return false;
}