Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9656 in orxonox.OLD for trunk/src/world_entities/npcs


Ignore:
Timestamp:
Aug 4, 2006, 11:01:28 PM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the proxy bache back with no conflicts

Location:
trunk/src/world_entities/npcs
Files:
4 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/src/world_entities/npcs/ground_turret.cc

    r9406 r9656  
    3939 */
    4040GroundTurret::GroundTurret(const TiXmlElement* root)
    41   : NPC(root)
     41    : NPC(root)
    4242{
    4343  this->init();
    … …  
    5252GroundTurret::~GroundTurret ()
    5353{
    54 
    5554}
    5655
    … …  
    8079
    8180/**
    82  * loads a GroundTurret from a XML-element
     81 * @brief loads a GroundTurret from a XML-element
    8382 * @param root the XML-element to load from
    8483 * @todo make the class Loadable
    … …  
    8887  // all the clases this Entity is directly derived from must be called in this way, to load all settings.
    8988  NPC::loadParams(root);
    90 
    9189
    9290  /**
    … …  
    126124void GroundTurret::tick(float dt)
    127125{
    128   if(this->getHealth() > 0.0f && State::getPlayer() &&
    129      State::getPlayer()->getPlayable() &&
    130      State::getPlayer()->getPlayable()->distance(this) < 120) // HACK
     126  if(this->getHealth() > 0.0f
     127    ) // HACK <--- YOU ARE THE MOTHERFUCKER
    131128  {
    132   if (likely(this->left != NULL))
    133   {
    134 //    this->left->tickW(dt);
    135     this->left->requestAction(WA_SHOOT);
    136   }
    137   if (likely(this->right != NULL))
    138   {
    139 //    this->right->tickW(dt);
    140     this->right->requestAction(WA_SHOOT);
    141   }
     129    if (likely(this->left != NULL))
     130    {
     131      //    this->left->tickW(dt);
     132      this->left->requestAction(WA_SHOOT);
     133    }
     134    if (likely(this->right != NULL))
     135    {
     136      //    this->right->tickW(dt);
     137      this->right->requestAction(WA_SHOOT);
     138    }
    142139  }
    143140}
    … …  
    164161void GroundTurret::postSpawn ()
    165162{
    166 
    167163}
    168164
    … …  
    173169void GroundTurret::leftWorld ()
    174170{
    175 
    176171}
    177172

  • trunk/src/world_entities/npcs/ground_turret.h

    r9235 r9656  
    1515{
    1616
    17  public:
     17public:
    1818  GroundTurret(const TiXmlElement* root = NULL);
    1919  virtual ~GroundTurret();
    2020
    21   void init();
    2221  virtual void loadParams(const TiXmlElement* root);
    2322
    … …  
    3029  virtual void tick(float time);
    3130
    32  private:
    33    PNode  weaponHolder[2];
    34    Weapon *left, *right;
     31private:
     32  void init();
     33
     34
     35private:
     36  PNode  weaponHolder[2];
     37  Weapon *left, *right;
    3538};
    3639

  • trunk/src/world_entities/npcs/space_turret.cc

    r9235 r9656  
    7474  this->weaponHolder[0].setParent(this);
    7575  this->weaponHolder[1].setParent(this);
     76
     77  this->wLeftHandle = registerVarId( new SynchronizeableString( &this->wLeft, &this->wLeft, "weapon-left", PERMISSION_MASTER_SERVER ) );
     78  this->wRightHandle = registerVarId( new SynchronizeableString( &this->wRight, &this->wRight, "weapon-right", PERMISSION_MASTER_SERVER ) );
     79
    7680}
    7781
    … …  
    98102  if (this->left)
    99103  {
     104    this->wLeft = element->Value();
     105
    100106    this->left->setParent(this);
    101107    this->left->toList(this->getOMListNumber());
    … …  
    110116  if (this->right)
    111117  {
     118    this->wRight = element->Value();
     119
    112120    this->right->setParent(this);
    113121    this->right->toList(this->getOMListNumber());
    … …  
    117125  }
    118126}
     127
     128
     129/**
     130 * sets the left weapon called from net sync
     131 * @param wLeft the left weapon string
     132 */
     133void SpaceTurret::setWeaponLeft(const std::string& wLeft)
     134{
     135
     136}
     137
     138/**
     139 * sets the left weapon called from net sync
     140 * @param wRught the right weapon string
     141 */
     142void SpaceTurret::setWeaponRight(const std::string& wRight)
     143{}
    119144
    120145/**
    … …  
    198223
    199224}
     225
     226
     227
     228/**
     229 * handler for changes on registred vars
     230 * @param id id's which changed
     231 */
     232void SpaceTurret::varChangeHandler( std::list< int > & id )
     233{
     234  if ( std::find( id.begin(), id.end(), this->wLeftHandle ) != id.end())
     235  {
     236    this->setWeaponLeft(this->wLeft);
     237  }
     238
     239  if ( std::find( id.begin(), id.end(), this->wRightHandle ) != id.end() )
     240  {
     241    this->setWeaponRight(this->wRight);
     242  }
     243
     244
     245  WorldEntity::varChangeHandler( id );
     246}
     247

  • trunk/src/world_entities/npcs/space_turret.h

    r9235 r9656  
    88
    99#include "npcs/npc.h"
     10
     11#include <string>
     12#include <list>
     13
    1014
    1115class Weapon;
    … …  
    2024
    2125  virtual void loadParams(const TiXmlElement* root);
     26  virtual void varChangeHandler( std::list< int > & id );
     27
     28
     29  void setWeaponLeft(const std::string& wLeft);
     30  void setWeaponRight(const std::string& wRight);
    2231
    2332  virtual void postSpawn ();
    … …  
    3645  PNode  weaponHolder[2];
    3746  Weapon *left, *right;
     47
     48  std::string wLeft;
     49  std::string wRight;
     50  int wLeftHandle;
     51  int wRightHandle;
    3852};
    3953
Note: See TracChangeset for help on using the changeset viewer.