Changeset 1931 in orxonox.OLD for orxonox/trunk/core/world.cc

Timestamp:

Jun 9, 2004, 10:49:04 AM (21 years ago)

Author:

patrick

Message:

orxonox/trunk/core: speed of ground, shoot enemies

File:

• orxonox/trunk/core/world.cc (modified) (13 diffs)

orxonox/trunk/core/world.cc

@@ -33 +33 @@
   lastEnv = null;
   primitiveMove = 0;
+  step = 0;
 }
 
@@ -104 +105 @@
 
 /** 
+   \brief Remove Non-Player Character
+   \param player A reference to the new npc object
+   
+   Remove a new Non-Player-Character to the game.
+*/
+bool World::removeNPC(NPC* npc) {
+
+  npcList* npcRef = lastNPC;
+  npcList* lastRef = lastNPC;
+  while ( npcRef != null ) 
+    {
+      if ( npcRef->npc == npc ) {
+        cout << "found" << endl;
+        if ( npcRef == lastRef ) {
+          lastNPC = lastNPC->next;
+          delete npcRef;
+          npcRef = lastNPC;
+          lastRef = lastNPC;
+        }
+        else {
+          lastRef->next = npcRef->next;
+          delete npcRef;
+          npcRef = lastRef->next;
+        }
+        cout << "killed ..." << endl;
+      }
+      else {
+        lastRef = npcRef;
+        npcRef = npcRef->next;
+      }
+    }
+  cout << "npc left" << endl;
+}
+
+
+
+/** 
    \brief Add environmental object
    \param player A reference to the new env object
@@ -126 +164 @@
 }
 
-
-
-
-
-/** 
-   \brief Remove Non-Player Character
-   \param player A reference to the new npc object
-   
-   Remove a new Non-Player-Character to the game.
-*/
-bool World::removeNPC(NPC* npc) {
-  cout << "World::removeNPC not implemented yet" << endl;
-}
 
 
@@ -167 +192 @@
     }
 
-
   /* now draw the rest of the world: environement */
   envList* tmpEnv = lastEnv;
@@ -175 +199 @@
       tmpEnv = tmpEnv->next;
     }
-  
   
   /* draw the ground grid  */
@@ -189 +212 @@
         }
     }
- glEnd();
- //glPopMatrix();
- 
+  glEnd();
+  
   glBegin(GL_LINES);
   for (int x = 0; x < 60; x += 2)
@@ -204 +226 @@
 
   //primitiveMove+=0.07;
-  DataTank::yOffset += 0.07;
+  DataTank::yOffset += step;
 
   tmpPlayer = lastPlayer;
   while( tmpPlayer != null ) 
     {
-      tmpPlayer->player->yCor += 0.07;
+      tmpPlayer->player->yCor += step;
       tmpPlayer = tmpPlayer->next;
     }
@@ -228 +250 @@
     }
 }
+
+
+void World::setWorldStep(float step)
+{
+  this->step = step;
+  cout << "setting speed to " << step << endl;
+}
+
 
 
@@ -250 +280 @@
   //cout << "World::detectCollision" << endl;
   float xOff, yOff, zOff, radius;
-  npcList* tmpNPC;
+  npcList* tmpNPC, *tmpRef;
 
   //cout << "World::detectCollsions" << endl;
@@ -256 +286 @@
   playerList* tmpPlayer = lastPlayer;
   Player* player = tmpPlayer->player;
+  int state;
   while( tmpPlayer != null ) 
     {
@@ -261 +292 @@
       while( tmpNPC != null )
         {
+          //cout << "npc != null" << endl;
           radius = tmpNPC->npc->collisionRadius;
+          //cout << "worki" << endl;
           ShootLaser::shoot* shoota = tmpPlayer->player->shootLaser->lastShoot;
           while( shoota != null )
@@ -268 +301 @@
               yOff = shoota->yCor - tmpNPC->npc->yCor;
               zOff = shoota->zCor - tmpNPC->npc->zCor;
-              if ( sqrt(xOff*xOff + yOff*yOff + zOff*zOff) < radius )
-                cout << "COLLISION " << endl;
+              if ( sqrt(xOff*xOff + yOff*yOff + zOff*zOff) < radius ) 
+                {
+                  //cout << "COLLISION " << endl;
+                  int state = tmpNPC->npc->hit();
+                  /* state is a value that marks if the ship dies or not */
+                  /* if state == 0 the ship dies and we have to remove it */
+                  /*
+                  if ( state == 0 ) {
+                    tmpRef = tmpNPC;
+                    tmpNPC = tmpNPC->next;
+                    removeNPC(tmpRef->npc);
+                    break;
+                  }
+                  */
+                }
               shoota = shoota->next;
             }
+          //cout << "changing npc..." << endl;
           tmpNPC = tmpNPC->next;
-        }
-      
+          //cout << "..changing npc done" << endl;
+        }
+      //cout << "changing play..." << endl;
       tmpPlayer = tmpPlayer->next;
-    }
+      //cout << "changing play done" << endl;
+    }
+
+  //cout << "World::detectCollisions middle" << endl;
 
   /* second: check if any player hits an enemy */
-
-  
   tmpPlayer = lastPlayer;
   while( tmpPlayer != null ) 
@@ -291 +340 @@
           yOff = tmpPlayer->player->yCor - tmpNPC->npc->yCor;
           zOff = tmpPlayer->player->zCor - tmpNPC->npc->zCor;
-          if ( sqrt(xOff*xOff + yOff*yOff + zOff*zOff) < radius )
-            cout << "COLLISION " << endl;
+          if ( sqrt(xOff*xOff + yOff*yOff + zOff*zOff) < radius ) {
+            //cout << "COLLISION " << endl;
+            tmpNPC->npc->hit();
+          }
           
           tmpNPC = tmpNPC->next;