Changeset 10050 for code/branches/pickupsFS14/src/modules/jump/Jump.h

Timestamp:

May 8, 2014, 4:14:31 PM (10 years ago)

Author:

fvultier

Message:

Added a whole bunch of code

File:

• code/branches/pickupsFS14/src/modules/jump/Jump.h (modified) (3 diffs)

code/branches/pickupsFS14/src/modules/jump/Jump.h

@@ -80 +80 @@
             virtual void playerScored(PlayerInfo* player, int score = 1); //!< Is called when the player scored.
 
-            virtual void addPlatform(JumpPlatform* newPlatform, float xPosition, float zPosition);
-            virtual void addStartSection();
-            virtual void addSection();
-            virtual float randomXPosition();
-            virtual float randomYPosition(float lowerBoundary, float upperBoundary);
-
             int getScore(PlayerInfo* player) const;
 
@@ -104 +98 @@
             void cleanup(); //!< Cleans up the Gametype by destroying the ball and the bats.
 
+            virtual void addPlatform(JumpPlatform* newPlatform, std::string platformTemplate, float xPosition, float zPosition);
+
+            virtual void addPlatformStatic(float xPosition, float zPosition);
+            virtual void addPlatformHMove(float xPosition, float zPosition, float leftBoundary, float rightBoundary, float speed);
+            virtual void addPlatformVMove(float xPosition, float zPosition, float lowerBoundary, float upperBoundary, float speed);
+            virtual void addPlatformDisappear(float xPosition, float zPosition);
+            virtual void addPlatformTimer(float xPosition, float zPosition, float time, float variance);
+            virtual void addPlatformFake(float xPosition, float zPosition);
+            virtual void addProjectile(float xPosition, float zPosition, float xVelocity, float zVelocity);
+            virtual void addEnemy1(float xPosition, float zPosition, float leftBoundary, float rightBoundary, float lowerBoundary, float upperBoundary, float xVelocity, float zVelocity);
+
+            virtual void addStartSection();
+            virtual void addSection();
+
+            virtual float randomXPosition();
+            virtual float randomXPosition(int totalColumns, int culomn);
+            virtual float randomYPosition(float lowerBoundary, float upperBoundary);
+
             WeakPtr<JumpCenterpoint> center_; //!< The playing field.
-            //WeakPtr<JumpPlatform> ball_; //!< The Jump ball.
             WeakPtr<JumpFigure> figure_; //!< The two bats.
             WeakPtr<Camera> camera;
@@ -113 +124 @@
             float totalScreenShift;
             float screenShiftSinceLastUpdate;
-            float sectionLength;
             int sectionNumber;
-            std::list<JumpPlatform*> platformList;
+
+            bool fakeAdded_;
     };
 }