Changeset 12384 for code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.h

Timestamp:

May 16, 2019, 4:03:46 PM (5 years ago)

Author:

pomselj

Message:

OrxoBlox is linked to Projectile, level up works

File:

• code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.h (modified) (3 diffs)

code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.h

@@ -37 +37 @@
 #include "weapons/WeaponsPrereqs.h"
 #include "weapons/projectiles/BillboardProjectile.h"
-#include "../OrxoBlox/OrxoBlox.h"
+#include "../../OrxoBlox/OrxoBlox.h"
+#include "../../OrxoBlox/OrxoBloxStones.h"
 
 #include "OrxoBlox/OrxoBloxPrereqs.h"
@@ -68 +69 @@
             void registerVariables();
             void changeTexture();
-            //OrxoBlox* getOrxoBlox();
+            OrxoBlox* getOrxoBlox();
             
             float speed_; //!< The speed (in x-direction) of the ball.
@@ -76 +77 @@
             unsigned int maxTextureIndex_; //!< The maximal index.
             std::string materialBase_; //!< The base name of the material.
-            //OrxoBlox* orxoblox_;
+            OrxoBlox* orxoblox_;
     };
 }