Changeset 11729 for code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.h

Timestamp:

Feb 11, 2018, 4:49:56 PM (6 years ago)

Author:

landauf

Message:

fixed crash when setting highscore

File:

• code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.h (modified) (2 diffs)

code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DStone.h

@@ -53 +53 @@
             Vector3 randomPosition (float maxwidth, float maxheight);
             Vector3 randomVelocity(float maxspeed);
-            void setAsteroids2DPlayer(Asteroids2DShip* player){this->player = player;};
             virtual int getSize(){ return this->size;}
             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
@@ -62 +61 @@
           Asteroids2D* getGame();
           WeakPtr<Asteroids2D> game;
-          WeakPtr<Asteroids2DShip> player;          
                 int size;                               // three sizes, 3-> two 2s, 2-> two 1s, 1-> die
                 float width, height;    //field