Changeset 12402 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Timestamp:

May 20, 2019, 3:09:55 PM (5 years ago)

Author:

ahuwyler

Message:

last commit

Location:

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Files:

• OrxoBlox.cc (modified) (1 diff)
• OrxoBloxStones.cc (modified) (1 diff)
• OrxoBloxStones.h (modified) (2 diffs)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

@@ -143 +143 @@
     void OrxoBlox::LevelUp(){
         level_++;
+        if((level_%10)==0){
+            --counter;
+        }
         int z_ = 0;
 

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxStones.cc

@@ -18 +18 @@
 
         this->size_ = 9.0f;
-        this->health_ = 1;
+        this->setHealth(1);
         this->delay_ = false;
     }

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxStones.h

@@ -40 +40 @@
             float getSize(void) const
                 { return this->size_; }
-            /**
-            @brief Set the Health of the stone.
-            @param size The dimensions a stone has in the game world. (A stone is a cube)
-            */
-            void setHealth(unsigned int health)
-                { 
-                    this->health_ = health; 
+            
+            void gotHit(){
+                orxout()<<"GOT HIT"<<endl;
+                unsigned int health_ =this->getHealth();
+                if (health_> 0){
+                    this->setHealth(++health_); 
+                    }
+                else {
+                    this->kill();
                 }
-            /**
-            @brief Get the size of the stone.
-            @return Returns the dimensions a stone has in the game world. (A stone is a cube)
-            */
-            unsigned int getHealth(void) const
-                { return this->health_; }
-
-            void gotHit(){
-                if (this->health_ > 0){
-                    this->health_ -= this->health_; 
-                    }
-                //  else ~OrxoBloxStones();
                 }
 
@@ -74 +64 @@
         private:
             float size_; //!< The dimensions a stone has in the game world.
-            unsigned int health_;
             bool delay_;