Changeset 9712 in orxonox.OLD

Timestamp:

Sep 1, 2006, 12:52:29 AM (18 years ago)

Author:

bensch

Message:

fixed minority reports

Location:

branches/new_class_id/src

Files:

• lib/util/loading/factory.cc (modified) (1 diff)
• story_entities/game_world_data.cc (modified) (2 diffs)
• world_entities/npcs/space_turret.cc (modified) (9 diffs)

branches/new_class_id/src/lib/util/loading/factory.cc

@@ -99 +99 @@
 BaseObject* Factory::fabricate(const TiXmlElement* root)
 {
-  assert (root != NULL && Factory::_factoryList != NULL);
+  assert (Factory::_factoryList != NULL);
 
   std::list<Factory*>::const_iterator factory;

branches/new_class_id/src/story_entities/game_world_data.cc

@@ -117 +117 @@
 ErrorMessage GameWorldData::loadData(const TiXmlElement* root)
 {
+  assert (root != NULL);
   // load the parameters
   // name
@@ -237 +238 @@
   {
     /// TODO Make this also loadable
-    this->localPlayer->setPlayable(Playable::objectList().back());
+    this->localPlayer->setPlayable(Playable::objectList().front());
   }
 

branches/new_class_id/src/world_entities/npcs/space_turret.cc

@@ -38 +38 @@
  */
 SpaceTurret::SpaceTurret(const TiXmlElement* root)
-  : NPC(root)
+    : NPC(root)
 {
   this->init();
@@ -50 +50 @@
  */
 SpaceTurret::~SpaceTurret ()
-{
-
-}
+{}
 
 
@@ -100 +98 @@
 
   element = root->FirstChildElement("weapon-left");
-  if (element != NULL) element = element->FirstChildElement();
-  this->left = dynamic_cast<Weapon*>( Factory::fabricate( element) );
+  if (element != NULL)
+    element = element->FirstChildElement();
+  if (element != NULL)
+    this->left = dynamic_cast<Weapon*>( Factory::fabricate( element) );
   if (this->left)
   {
@@ -114 +114 @@
 
   element = root->FirstChildElement("weapon-right");
-  if (element != NULL)  if (element != NULL) element = element->FirstChildElement();
-  this->right = dynamic_cast<Weapon*>( Factory::fabricate( element) );
+  if (element != NULL)
+    element = element->FirstChildElement();
+  if (element != NULL)
+    this->right = dynamic_cast<Weapon*>( Factory::fabricate( element) );
   if (this->right)
   {
@@ -134 +136 @@
  */
 void SpaceTurret::setWeaponLeft(const std::string& wLeft)
-{
-
-}
+{}
 
 /**
@@ -152 +152 @@
 {
   if(this->getHealth() > 0.0f && State::getPlayer() &&
-     State::getPlayer()->getPlayable() &&
-     State::getPlayer()->getPlayable()->distance(this) < 300) // HACK
-  {
-  if (likely(this->left != NULL))
-  {
-//    this->left->tickW(dt);
-    this->left->requestAction(WA_SHOOT);
-  }
-  if (likely(this->right != NULL))
-  {
-//    this->right->tickW(dt);
-    this->right->requestAction(WA_SHOOT);
-  }
+      State::getPlayer()->getPlayable() &&
+      State::getPlayer()->getPlayable()->distance(this) < 300) // HACK
+  {
+    if (likely(this->left != NULL))
+    {
+      //    this->left->tickW(dt);
+      this->left->requestAction(WA_SHOOT);
+    }
+    if (likely(this->right != NULL))
+    {
+      //    this->right->tickW(dt);
+      this->right->requestAction(WA_SHOOT);
+    }
   }
 }
@@ -185 +185 @@
     this->getModel(3)->draw();
   glPopMatrix();
-/*
-  if (this->left != NULL)
-    this->left->draw();
-  if (this->right != NULL)
-    this->right->draw();*/
+  /*
+    if (this->left != NULL)
+      this->left->draw();
+    if (this->right != NULL)
+      this->right->draw();*/
 }
 
@@ -199 +199 @@
  */
 void SpaceTurret::postSpawn ()
-{
-
-}
+{}
 
 /**
@@ -208 +206 @@
  */
 void SpaceTurret::leftWorld ()
-{
-
-}
+{}
 
 void SpaceTurret::destroy(WorldEntity* killer)