Changeset 12031 for code/branches/mergeFS18/src/modules/superorxobros/SOBFigure.h

Timestamp:

Oct 10, 2018, 4:08:48 PM (6 years ago)

Author:

merholzl

Message:

merged Tubes into SuperOrxoBros

Location:

code/branches/mergeFS18

Files:

• . (modified) (1 prop)
• src/modules/superorxobros/SOBFigure.h (modified) (3 diffs)

code/branches/mergeFS18/src/modules/superorxobros/SOBFigure.h

@@ -32 +32 @@
 #include "superorxobros/SOBPrereqs.h"
 #include "worldentities/ControllableEntity.h"
+#include "SOBTube.h"
 
 
@@ -58 +59 @@
             //Soooo many declarations
             bool fireallowed_;
-
-            bool moveUpPressed_;
+            SOBTube*       tube; //class SOBTube* used because tube needs to be global using in collides against function and tick function in SOBfigure.cc
+            bool moveUpPressed_; 
+            int kkk;
+           
+            bool tcol_;  //used for getting through tube
+            bool tubing; //used for getting through tube 
             bool moveDownPressed_;
             bool moveLeftPressed_;
@@ -68 +73 @@
             float lastSpeed_z;
             float firecooldown_;
+            float positiontube_;
             bool isColliding_;
             WorldEntity* particlespawner_;