Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 7779 in orxonox.OLD for trunk/src/world_entities/weapons


Ignore:
Timestamp:
May 23, 2006, 10:04:17 PM (19 years ago)
Author:
bensch
Message:

3088 linews changed :): trunk: namespaces

Location:
trunk/src/world_entities/weapons
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/world_entities/weapons/weapon.cc

    r7729 r7779  
    307307}
    308308
    309 GLGuiWidget* Weapon::getEnergyWidget()
     309OrxGui::GLGuiWidget* Weapon::getEnergyWidget()
    310310{
    311311  if (this->energyWidget == NULL)
    312312  {
    313     this->energyWidget = new GLGuiBar;
     313    this->energyWidget = new OrxGui::GLGuiBar;
    314314    this->energyWidget->setSize2D( 20, 100);
    315315    this->energyWidget->setMaximum(this->getEnergyMax());
  • trunk/src/world_entities/weapons/weapon.h

    r7460 r7779  
    2525class TiXmlElement;
    2626class FastFactory;
     27namespace OrxGui{ class GLGuiWidget; }
    2728template<class T> class tFastFactory;
    28 class GLGuiWidget;
    2929
    3030//! An enumerator defining Actions a Weapon can take
     
    156156    Animation3D* copyAnimation(WeaponState from, WeaponState to);
    157157
    158     GLGuiWidget* getEnergyWidget();
     158    OrxGui::GLGuiWidget* getEnergyWidget();
    159159
    160160    // FLOW
     
    211211    float                maxCharge;                        //!< The maximal energy to be loaded onto one projectile (this is only availible if chargeable is enabled)
    212212
    213     GLGuiBar*            energyWidget;
     213    OrxGui::GLGuiBar*    energyWidget;
    214214
    215215    PNode*               defaultTarget;                    //!< A target for targeting Weapons.
Note: See TracChangeset for help on using the changeset viewer.