From 64af6d3afe6ff677aa25e2cbb7395a911f8621af Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Mon, 23 Jan 2012 20:23:56 +0100 Subject: [PATCH] Fix some warnings on some compilers ItemStack is a struct, not a class CollisionInfo is a struct, not a class InventoryAction is abstract and it needs a virtual destructor --- src/inventorymanager.h | 1 + src/player.h | 2 +- src/scriptapi.h | 2 +- src/serverobject.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/inventorymanager.h b/src/inventorymanager.h index 55e8f840..52377f9a 100644 --- a/src/inventorymanager.h +++ b/src/inventorymanager.h @@ -103,6 +103,7 @@ struct InventoryAction virtual void apply(InventoryManager *mgr, ServerActiveObject *player, IGameDef *gamedef) = 0; virtual void clientApply(InventoryManager *mgr, IGameDef *gamedef) = 0; + virtual ~InventoryAction() {}; }; struct IMoveAction : public InventoryAction diff --git a/src/player.h b/src/player.h index 085a4a15..d62fb611 100644 --- a/src/player.h +++ b/src/player.h @@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc., class Map; class IGameDef; -class CollisionInfo; +struct CollisionInfo; class Player { diff --git a/src/scriptapi.h b/src/scriptapi.h index 500a9ab9..df8ae344 100644 --- a/src/scriptapi.h +++ b/src/scriptapi.h @@ -30,7 +30,7 @@ class ServerActiveObject; class ServerRemotePlayer; typedef struct lua_State lua_State; struct LuaEntityProperties; -class ItemStack; +struct ItemStack; struct PointedThing; //class IGameDef; diff --git a/src/serverobject.h b/src/serverobject.h index 94ceb489..380bf730 100644 --- a/src/serverobject.h +++ b/src/serverobject.h @@ -42,7 +42,7 @@ Some planning */ class ServerEnvironment; -class ItemStack; +struct ItemStack; class Player; struct ToolDiggingProperties; -- 2.30.2