Skip to content

Commit

Permalink
Bye Warning C4266 (otland#4453)
Browse files Browse the repository at this point in the history
* Bye Warning C4266

* using on top
  • Loading branch information
MillhioreBT authored Sep 6, 2023
1 parent 9dc86d0 commit daef35e
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/housetile.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ class HouseTile final : public DynamicTile
public:
HouseTile(int32_t x, int32_t y, int32_t z, House* house);

using DynamicTile::internalAddThing;

// cylinder implementations
ReturnValue queryAdd(int32_t index, const Thing& thing, uint32_t count, uint32_t flags,
Creature* actor = nullptr) const override;
Expand Down
3 changes: 3 additions & 0 deletions src/monster.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ class Monster final : public Creature
{
public:
static Monster* createMonster(const std::string& name);

using Creature::onWalk;

static int32_t despawnRange;
static int32_t despawnRadius;

Expand Down
2 changes: 2 additions & 0 deletions src/npc.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,8 @@ class Npc final : public Creature
Npc(const Npc&) = delete;
Npc& operator=(const Npc&) = delete;

using Creature::onWalk;

Npc* getNpc() override { return this; }
const Npc* getNpc() const override { return this; }

Expand Down
2 changes: 2 additions & 0 deletions src/player.h
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ class Player final : public Creature, public Cylinder
explicit Player(ProtocolGame_ptr p);
~Player();

using Creature::onWalk;

// non-copyable
Player(const Player&) = delete;
Player& operator=(const Player&) = delete;
Expand Down
4 changes: 4 additions & 0 deletions src/tile.h
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,8 @@ class DynamicTile : public Tile
}
}

using Tile::internalAddThing;

// non-copyable
DynamicTile(const DynamicTile&) = delete;
DynamicTile& operator=(const DynamicTile&) = delete;
Expand Down Expand Up @@ -297,6 +299,8 @@ class StaticTile final : public Tile
}
}

using Tile::internalAddThing;

// non-copyable
StaticTile(const StaticTile&) = delete;
StaticTile& operator=(const StaticTile&) = delete;
Expand Down

0 comments on commit daef35e

Please sign in to comment.