X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fspecial.h;h=304d209071e5335cf73412bb56a79b7a918641a2;hb=157cef71aeb9ae25b7bb90f37dda11bc09329d11;hp=5ea0d59c2d854cbd46045e12eb3ce98e4c543055;hpb=403f2652505e814b645892bffaf89a584984f9b8;p=supertux.git diff --git a/src/special.h b/src/special.h index 5ea0d59c2..304d20907 100644 --- a/src/special.h +++ b/src/special.h @@ -53,14 +53,11 @@ public: virtual ~Upgrade(); virtual void action(float frame_ratio); - virtual void draw(ViewPort& viewport, int layer); + virtual void draw(Camera& viewport, int layer); virtual void collision(const MovingObject& other, int); void collision(void* p_c_object, int c_object, CollisionType type); - virtual std::string type() const - { return "Upgrade"; }; - private: void bump(Player* player); }; @@ -77,12 +74,10 @@ public: int kind); virtual void action(float frame_ratio); - virtual void draw(ViewPort& viewport, int layer); + virtual void draw(Camera& viewport, int layer); void collision(int c_object); virtual void collision(const MovingObject& other_object, int type); - virtual std::string type() const - { return "Bullet"; }; int kind;