From fa2345375a119d6fe3f933d6c291202408c254ed Mon Sep 17 00:00:00 2001 From: auria Date: Sat, 15 Nov 2008 02:12:28 +0000 Subject: [PATCH] renamed missile.projectile to bubblegum.projectile git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2458 178a84e3-b1eb-0310-8ba1-8eac791a3b58 --- data/{missile.projectile => bubblegum.projectile} | 0 src/items/item.hpp | 2 +- src/items/powerup_manager.cpp | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) rename data/{missile.projectile => bubblegum.projectile} (100%) diff --git a/data/missile.projectile b/data/bubblegum.projectile similarity index 100% rename from data/missile.projectile rename to data/bubblegum.projectile diff --git a/src/items/item.hpp b/src/items/item.hpp index bca16b47e..6d2617a62 100644 --- a/src/items/item.hpp +++ b/src/items/item.hpp @@ -63,7 +63,7 @@ public: Item (ItemType type, const Vec3& xyz, const Vec3& normal, ssgEntity* model, unsigned int item_id, bool rotate=true); - ~Item (); + virtual ~Item (); void update (float delta); virtual void isCollected(float t=2.0f); // ------------------------------------------------------------------------ diff --git a/src/items/powerup_manager.cpp b/src/items/powerup_manager.cpp index 44790360d..6efbfdd67 100644 --- a/src/items/powerup_manager.cpp +++ b/src/items/powerup_manager.cpp @@ -42,9 +42,9 @@ initPowerupType; initPowerupType ict[]= { {POWERUP_ZIPPER, "zipper.collectable" }, - {POWERUP_BOWLING, "bowling.projectile" }, - {POWERUP_BUBBLEGUM, "missile.projectile" }, - {POWERUP_CAKE, "cake.projectile" }, + {POWERUP_BOWLING, "bowling.projectile" }, + {POWERUP_BUBBLEGUM, "bubblegum.projectile" }, + {POWERUP_CAKE, "cake.projectile" }, {POWERUP_ANVIL, "anvil.collectable" }, {POWERUP_PARACHUTE, "parachute.collectable" }, {POWERUP_MAX, "" },