Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 5, 2008, 7:57:16 PM (16 years ago)
Author:
polakma
Message:

added firemodes and a lot of other things

Location:
code/branches/weapon2/src/orxonox/objects/worldentities/pawns
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.cc

    r2106 r2145  
    3535#include "objects/infos/PlayerInfo.h"
    3636#include "objects/gametypes/Gametype.h"
    37 #include "objects/weaponSystem/WeaponSystem.h"
     37
    3838
    3939namespace orxonox
     
    5454        this->weaponSystem_ = 0;
    5555
     56        //WeaponSystem
     57        weaponSystem_ = new WeaponSystem(this);
    5658        /*
    57         //WeaponSystem
    58         weaponSystem_ = new WeaponSystem();
    5959        WeaponSet * weaponSet1 = new WeaponSet(1);
    6060        this->weaponSystem_->attachWeaponSet(weaponSet1);
     
    137137    }
    138138
    139     void Pawn::fire()
     139    void Pawn::fire(WeaponMode::Enum fireMode)
    140140    {
    141141        if (this->weaponSystem_)
    142             this->weaponSystem_->fire();
     142            this->weaponSystem_->fire(fireMode);
    143143    }
    144144
  • code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Pawn.h

    r2098 r2145  
    3333
    3434#include "objects/worldentities/ControllableEntity.h"
     35#include "objects/weaponSystem/WeaponSystem.h"
    3536
    3637namespace orxonox
     
    7475            virtual void kill();
    7576
    76             virtual void fire();
     77            virtual void fire(WeaponMode::Enum fireMode);
    7778
    7879            virtual void postSpawn();
Note: See TracChangeset for help on using the changeset viewer.