Changeset 12392 for code

Timestamp:

May 16, 2019, 4:57:51 PM (6 years ago)

Author:

pomselj

Message:

 

Location:

code/branches/OrxoBlox_FS19

Files:

• data/levels/includes/OrxoBloxWeapon.oxi (modified) (1 diff)
• src/modules/OrxoBlox/OrxoBlox.cc (modified) (4 diffs)
• src/modules/OrxoBlox/OrxoBloxWall.cc (modified) (1 diff)
• src/modules/weapons/projectiles/BasicProjectile.cc (modified) (3 diffs)

code/branches/OrxoBlox_FS19/data/levels/includes/OrxoBloxWeapon.oxi

@@ -21 +21 @@
     </weaponpacks>
     <munition>
-      <BallMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=10 replenishamount=1 replenishinterval=0.5/>
+      <BallMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=1 replenishamount=1 replenishinterval=4/>
     </munition>

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

@@ -111 +111 @@
             }
         */
-        
-        for (OrxoBloxWall* wall : this->activeWalls_)
+        for (OrxoBloxWall* wall : this->activeWalls_) {
             if (wall != nullptr)
                 wall->destroy();
+        }
         this->activeWalls_.clear();
         
 
-        for (OrxoBloxStones* stone : this->stones_)
+        for (OrxoBloxStones* stone : this->stones_) {
             if(stone != nullptr)
             stone->destroy();
+        }
         this->stones_.clear();
+        if(this->playership != nullptr) {
+            this->playership->destroy();
+        }
+        if(this->center_ != nullptr) {
+            this->center_->destroy();
+        }
         
 
@@ -136 +143 @@
         if (this->center_ != nullptr) // There needs to be a OrxoBloxCenterpoint, i.e. the area the game takes place.
         {
-            //if (this->ball_ == nullptr) // If there is no ball, create a new ball.
-            //{
-            //    this->ball_ = new OrxoBloxBall(this->center_->getContext());
-                // Apply the template for the ball specified by the centerpoint.
-            //    this->ball_->addTemplate(this->center_->getBalltemplate());
-            //}
-
-            // Attach the ball to the centerpoint and set the parameters as specified in the centerpoint, the ball is attached to.
-            //this->center_->attach(this->ball_);
-            //Startposition Ball
-            //this->ball_->setPosition(0, 0, 40);
-            //this->ball_->setFieldDimension(this->center_->getFieldDimension());
-            //this->ball_->setSpeed(0);
-            //this->ball_->setAccelerationFactor(this->center_->getBallAccelerationFactor());
-            
+
             level_=1;
-
-            // Create the first Wall.
-            this->LevelUp();
-
-
-
-            //Create Ship
-            //this->ship_ = new OrxoBloxShip(this->center_->getContext());
-            //this->ship_->setPosition(0, 0, 0);
 
         }
@@ -230 +214 @@
         orxout() << "level up called" << endl;
         this->playerScored(this->player_);// add points
-        
-
 
         this->createWall();
@@ -264 +246 @@
         for(OrxoBloxStones* stone : this->stones_){
             if (stone != nullptr) {
-            int x_=(stone->getPosition()).x;
-            int y_=(stone->getPosition()).y;
-            z_=(stone->getPosition()).z;
-            //if(z_==90)this->end();
-
-            stone->setPosition(x_,y_,z_+9.0f);
-            if( z_ >= 45){
-                orxout() << "calling end() function" << endl;
-                this->end();
-            }
-            }
-            
+                int x_=(stone->getPosition()).x;
+                int y_=(stone->getPosition()).y;
+                z_=(stone->getPosition()).z;
+                //if(z_==90)this->end();
+
+                stone->setPosition(x_,y_,z_+9.0f);
+                if( z_ >= 45){
+                    orxout() << "calling end() function" << endl;
+                    this->end();
+                }
+            }
         }
 

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

@@ -34 +34 @@
             if(j<2){
                 this->size_ = 9.0f;
-                OrxoBloxStones* stone = new OrxoBloxStones(this->getContext());
+                OrxoBloxStones* stone = new OrxoBloxStones(this->center_->getContext());
                 if (stone == nullptr) {
                     std::abort();

code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BasicProjectile.cc

@@ -92 +92 @@
             if (getDestroyAfterCollision())
             {
-                orxout() << "Destroy that stuff" << endl;
                 this->bDestroy_ = true; // If something is hit, the object is destroyed and can't hit something else.
                                         // The projectile is destroyed by its tick()-function (in the following tick).
@@ -174 +173 @@
     {
         if(GameMode::isMaster() && this->bDestroy_) {
-            orxout() << "Set true, smhow" << endl;
             this->destroy();
         }
@@ -186 +184 @@
     {
         if(GameMode::isMaster()) {
-            orxout() << "Deleted myself" << endl;
             this->destroy();
         }