Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9757 in orxonox.OLD


Ignore:
Timestamp:
Sep 18, 2006, 10:06:19 PM (18 years ago)
Author:
bensch
Message:

new_class_id: hups… this was bad naming… confusing too.

Location:
branches/new_class_id/src
Files:
38 edited

Legend:

Unmodified
Added
Removed

  • branches/new_class_id/src/lib/coord/p_node.cc

    r9755 r9757  
    7878PNode::~PNode ()
    7979{
    80   PRINTF(0)("delete %s::%s\n", this->getClassCName(), this->getCName());
     80  PRINTF(4)("delete %s::%s\n", this->getClassCName(), this->getCName());
    8181  this->debugNode(0);
    8282  // remove the Node, delete it's children (if required).

  • branches/new_class_id/src/lib/graphics/effects/cloud_effect.cc

    r9746 r9757  
    4949
    5050
    51 CREATE_SCRIPTABLE_CLASS(CloudEffect, CloudEffect::classID(),
     51CREATE_SCRIPTABLE_CLASS(CloudEffect,
    5252                        addMethod("skyColor", Executor4<CloudEffect, lua_State*,float,float,float,float>(&CloudEffect::shellSkyColor))
    5353                        ->addMethod("cloudColor", Executor4<CloudEffect, lua_State*,float,float,float,float>(&CloudEffect::shellCloudColor))

  • branches/new_class_id/src/lib/graphics/effects/fog_effect.cc

    r9746 r9757  
    3232#include "class_id_DEPRECATED.h"
    3333
    34 CREATE_SCRIPTABLE_CLASS(FogEffect, FogEffect::classID(),
     34CREATE_SCRIPTABLE_CLASS(FogEffect,
    3535                        addMethod("fadeIn", Executor0<FogEffect, lua_State*>(&FogEffect::fadeInFog))
    3636                            ->addMethod("fadeOut", Executor0<FogEffect, lua_State*>(&FogEffect::fadeOutFog))

  • branches/new_class_id/src/lib/graphics/effects/lightning_effect.cc

    r9746 r9757  
    3535SHELL_COMMAND(deactivate, LightningEffect, deactivateLightning);
    3636
    37 CREATE_SCRIPTABLE_CLASS(LightningEffect, LightningEffect::classID(),
     37CREATE_SCRIPTABLE_CLASS(LightningEffect,
    3838                        addMethod("activate", Executor0<LightningEffect, lua_State*>(&LightningEffect::activate))
    3939                            ->addMethod("deactivate", Executor0<LightningEffect, lua_State*>(&LightningEffect::deactivate))

  • branches/new_class_id/src/lib/graphics/effects/rain_effect.cc

    r9746 r9757  
    4444
    4545
    46 CREATE_SCRIPTABLE_CLASS(RainEffect, RainEffect::classID(),
     46CREATE_SCRIPTABLE_CLASS(RainEffect,
    4747                        addMethod("startRaining", Executor0<RainEffect, lua_State*>(&RainEffect::startRaining))
    4848                            ->addMethod("stopRaining", Executor0<RainEffect, lua_State*>(&RainEffect::stopRaining))

  • branches/new_class_id/src/lib/graphics/effects/snow_effect.cc

    r9746 r9757  
    3737
    3838
    39 CREATE_SCRIPTABLE_CLASS(SnowEffect, SnowEffect::classID(),
     39CREATE_SCRIPTABLE_CLASS(SnowEffect,
    4040                            addMethod("activate", Executor0<SnowEffect, lua_State*>(&SnowEffect::activate))
    4141                            ->addMethod("deactivate", Executor0<SnowEffect, lua_State*>(&SnowEffect::deactivate))

  • branches/new_class_id/src/lib/gui/gl/glgui_box.cc

    r9715 r9757  
    150150    while (itC != this->_children.end())
    151151    {
    152       if ((*itC)->isA(GLGuiContainer::classID()))
     152      if ((*itC)->isA(GLGuiContainer::staticClassID()))
    153153        static_cast<GLGuiContainer*>(*itC)->showAll();
    154154      else
    … …  
    165165    while (itC != this->_children.end())
    166166    {
    167       if ((*itC)->isA(GLGuiContainer::classID()))
     167      if ((*itC)->isA(GLGuiContainer::staticClassID()))
    168168        static_cast<GLGuiContainer*>(*itC)->hideAll();
    169169      else

  • branches/new_class_id/src/lib/gui/gl/glgui_frame.cc

    r9715 r9757  
    7171    if (this->child != NULL)
    7272    {
    73       if (this->child->isA(GLGuiContainer::classID()))
     73      if (this->child->isA(GLGuiContainer::staticClassID()))
    7474        static_cast<GLGuiContainer*>(this->child)->showAll();
    7575      else
    … …  
    8383    if (this->child != NULL)
    8484    {
    85       if (this->child->isA(GLGuiContainer::classID()))
     85      if (this->child->isA(GLGuiContainer::staticClassID()))
    8686        static_cast<GLGuiContainer*>(this->child)->hideAll();
    8787      else

  • branches/new_class_id/src/lib/lang/class_id.h

    r9716 r9757  
    6161public:
    6262  /** @returns the NullClass' ID. */
    63   static const ClassID& classID() { return NullClass::_classID; }
     63  static const ClassID& staticClassID() { return NullClass::_classID; }
    6464  /** @param id the ID to acquire @param name the name to acquire @brief acquires the ID of this Class */
    6565  static void acquireID(const int*& id, const std::string*& name) { id = &_nullID; name = &_nullName; };
    … …  
    6969
    7070private:
    71   static ClassID         _classID;      //!< The NullClass' ID
     71  static ClassID            _classID;      //!< The NullClass' ID
    7272  static const std::string  _nullName;     //!< The NullClass' Name ("NullClass")
    7373  static int                _nullID;       //!< The NullClass' ID

  • branches/new_class_id/src/lib/lang/object_list.cc

    r9726 r9757  
    125125    return base->_identity;
    126126  else
    127     return NullClass::classID();
     127    return NullClass::staticClassID();
    128128}
    129129
    … …  
    141141    return base->_identity;
    142142  else
    143     return NullClass::classID();
     143    return NullClass::staticClassID();
    144144}
    145145

  • branches/new_class_id/src/lib/lang/object_list.h

    r9726 r9757  
    2525  public: \
    2626   static inline const ObjectList<ClassName>& objectList() { return ClassName::_objectList; }; \
    27    static inline const ClassID& classID() { return ClassName::_objectList.identity(); }; \
     27   static inline const ClassID& staticClassID() { return ClassName::_objectList.identity(); }; \
    2828  private: \
    2929   static ObjectList<ClassName> _objectList

  • branches/new_class_id/src/lib/network/network_game_manager.cc

    r9715 r9757  
    9292  assert( SharedNetworkData::getInstance()->isMasterServer());
    9393  assert( State::getGameRules() );
    94   assert( State::getGameRules()->isA( NetworkGameRules::classID()) );
     94  assert( State::getGameRules()->isA( NetworkGameRules::staticClassID()) );
    9595
    9696  NetworkGameRules & rules = *(dynamic_cast<NetworkGameRules*>(State::getGameRules()));
    … …  
    105105
    106106  assert( bo != NULL );
    107   assert( bo->isA( Playable::classID()) );
     107  assert( bo->isA( Playable::staticClassID()) );
    108108
    109109  Playable & playable = *(dynamic_cast<Playable*>(bo));
    … …  
    130130    stats->setNickName( Preferences::getInstance()->getString( "multiplayer", "nickname", "Server" ) );
    131131
    132   if ( rules.isA( MultiplayerTeamDeathmatch::classID()) )
     132  if ( rules.isA( MultiplayerTeamDeathmatch::staticClassID()) )
    133133    dynamic_cast<MultiplayerTeamDeathmatch*>(&rules)->respawnPlayable( &playable, team, 0.0f );
    134134
    … …  
    192192    if ( (*it)->getUniqueID() == uniqueId )
    193193    {
    194       if ( (*it)->isA(Playable::classID()) )
     194      if ( (*it)->isA(Playable::staticClassID()) )
    195195      {
    196196        getInstance()->playablesToDelete.push_back( dynamic_cast<Playable*>(*it) );
    … …  
    321321
    322322  assert( State::getGameRules() );
    323   assert( State::getGameRules()->isA( NetworkGameRules::classID()) );
     323  assert( State::getGameRules()->isA( NetworkGameRules::staticClassID()) );
    324324
    325325  NetworkGameRules & rules = *(dynamic_cast<NetworkGameRules*>(State::getGameRules()));

  • branches/new_class_id/src/lib/network/network_stream.cc

    r9716 r9757  
    967967
    968968      // if handshake not finished only sync handshake
    969       if ( peer->second.handshake && Handshake::classID() != sync.getLeafClassID())
     969      if ( peer->second.handshake && Handshake::staticClassID() != sync.getLeafClassID())
    970970        continue;
    971971
    … …  
    973973      if ( ( SharedNetworkData::getInstance()->isMasterServer() ||
    974974             SharedNetworkData::getInstance()->isProxyServerActive() &&  peer->second.isClient())
    975              && Handshake::classID() == sync.getLeafClassID() && sync.getUniqueID() != peer->second.userId )
     975             && Handshake::staticClassID() == sync.getLeafClassID() && sync.getUniqueID() != peer->second.userId )
    976976        continue;
    977977
    978978      /* list of synchronizeables that will never be synchronized over the network: */
    979979      // do not sync null parent
    980       if ( NullParent::classID() == sync.getLeafClassID())
     980      if ( NullParent::staticClassID() == sync.getLeafClassID())
    981981        continue;
    982982
    … …  
    11871187          /* These are some small exeptions in creation: Not all objects can/should be created via Factory */
    11881188          /* Exception 1: NullParent */
    1189           if( NullParent::classID() == leafClassId || Synchronizeable::classID() == leafClassId || NetworkGameManager::classID() == leafClassId)
     1189          if( NullParent::staticClassID() == leafClassId || Synchronizeable::staticClassID() == leafClassId || NetworkGameManager::staticClassID() == leafClassId)
    11901190          {
    11911191            PRINTF(1)("Don't create Object with ID %x, ignored!\n", (int)leafClassId);
    … …  
    12031203          }
    12041204
    1205           if ( b->isA(Synchronizeable::classID()) )
     1205          if ( b->isA(Synchronizeable::staticClassID()) )
    12061206          {
    12071207            sync = dynamic_cast<Synchronizeable*>(b);

  • branches/new_class_id/src/lib/network/synchronizeable.cc

    r9715 r9757  
    7575    // remove the message manager only by the server
    7676    if ( (SharedNetworkData::getInstance()->isMasterServer() )
    77           && this->beSynchronized() && this->getUniqueID() > 0 && !this->isA( MessageManager::classID() ) )
     77          && this->beSynchronized() && this->getUniqueID() > 0 && !this->isA( MessageManager::staticClassID() ) )
    7878      NetworkGameManager::getInstance()->removeSynchronizeable( this->getUniqueID() );
    7979  }

  • branches/new_class_id/src/lib/particles/particle_system.cc

    r9727 r9757  
    134134    if (emitter != NULL)
    135135    {
    136       if (emitter->isA(ParticleEmitter::classID()))
     136      if (emitter->isA(ParticleEmitter::staticClassID()))
    137137        this->addEmitter(dynamic_cast<ParticleEmitter*>(emitter));
    138138      else

  • branches/new_class_id/src/lib/script_engine/script.cc

    r9749 r9757  
    2525ObjectListDefinition(Script);
    2626
    27 CREATE_SCRIPTABLE_CLASS(Script, Script::classID(),
     27CREATE_SCRIPTABLE_CLASS(Script,
    2828                    addMethod("addObject", Executor2<Script, lua_State*,const std::string&, const std::string& >(&Script::addObject))
    2929                    ->addMethod("registerClass", Executor1<Script, lua_State*,const std::string&>(&Script::registerClass))

  • branches/new_class_id/src/lib/script_engine/script_class.h

    r9749 r9757  
    1818 * this should be used at the beginning of all the Classes that should be loadable (in the cc-file)
    1919 */
    20 #define CREATE_SCRIPTABLE_CLASS(CLASS_NAME, CLASS_ID, SCRIPT_METHODS) \
    21     tScriptClass<CLASS_NAME> global_##CLASS_NAME##_ScriptableClass(#CLASS_NAME, CLASS_ID, (new ScriptMethod)->SCRIPT_METHODS)
     20#define CREATE_SCRIPTABLE_CLASS(CLASS_NAME, SCRIPT_METHODS) \
     21    tScriptClass<CLASS_NAME> global_##CLASS_NAME##_ScriptableClass(#CLASS_NAME, CLASS_NAME::staticClassID(), (new ScriptMethod)->SCRIPT_METHODS)
    2222
    2323

  • branches/new_class_id/src/lib/shell/shell_completion.cc

    r9734 r9757  
    8787      if (objectList != NULL)
    8888        classID = objectList->identity();
    89       if (classID != NullClass::classID())
     89      if (classID != NullClass::staticClassID())
    9090        completeType |= ObjectCompletion;
    9191      completeType |= FunctionCompletion;

  • branches/new_class_id/src/lib/util/loading/factory.h

    r9715 r9757  
    3434 */
    3535#define CREATE_FACTORY(CLASS_NAME) \
    36     tFactory<CLASS_NAME>* global_##CLASS_NAME##_Factory = new tFactory<CLASS_NAME>(CLASS_NAME::classID())
     36    tFactory<CLASS_NAME>* global_##CLASS_NAME##_Factory = new tFactory<CLASS_NAME>(CLASS_NAME::staticClassID())
    3737
    3838//! The Factory is a loadable object handler

  • branches/new_class_id/src/lib/util/loading/fast_factory.h

    r9716 r9757  
    3939 */
    4040#define CREATE_FAST_FACTORY_STATIC(CLASS_NAME) \
    41   FastFactory* CLASS_NAME::fastFactory = tFastFactory<CLASS_NAME>::getFastFactory(CLASS_NAME::classID(), #CLASS_NAME)
     41  FastFactory* CLASS_NAME::fastFactory = tFastFactory<CLASS_NAME>::getFastFactory(CLASS_NAME::staticClassID(), #CLASS_NAME)
    4242
    4343//! A struct, that holds Lists of Objects of a certain type.

  • branches/new_class_id/src/story_entities/game_world.cc

    r9746 r9757  
    6363#include "script_class.h"
    6464ObjectListDefinition(GameWorld);
    65 CREATE_SCRIPTABLE_CLASS(GameWorld, GameWorld::classID(),
     65CREATE_SCRIPTABLE_CLASS(GameWorld,
    6666                        addMethod("setPlaymode", Executor1<GameWorld, lua_State*,const std::string&>(&GameWorld::setPlaymode))
    6767                        ->addMethod("setSoundtrack", Executor1<GameWorld, lua_State*, const std::string&>(&GameWorld::setSoundtrack))

  • branches/new_class_id/src/story_entities/game_world_data.cc

    r9727 r9757  
    213213
    214214      //todo do this more elegant
    215       if( element->Value() == "SkyBox" && created->isA(SkyBox::classID()))
     215      if( element->Value() == "SkyBox" && created->isA(SkyBox::staticClassID()))
    216216      {
    217217        this->sky = dynamic_cast<WorldEntity*>(created);
    218218        State::setSkyBox(dynamic_cast<SkyBox*>(this->sky));
    219219      }
    220       if( element->Value() == "Terrain" && created->isA(Terrain::classID()))
     220      if( element->Value() == "Terrain" && created->isA(Terrain::staticClassID()))
    221221      {
    222222        this->terrain = dynamic_cast<Terrain*>(created);
    … …  
    398398    PRINTF(2)("creating %s\n", element->Value());
    399399    BaseObject* created = Factory::fabricate(element);
    400     if (created != NULL && created->isA(GameRules::classID()))
     400    if (created != NULL && created->isA(GameRules::staticClassID()))
    401401    {
    402402      this->gameRule = dynamic_cast<GameRules*>(created);

  • branches/new_class_id/src/world_entities/creatures/fps_player.cc

    r9746 r9757  
    4646
    4747#include "script_class.h"
    48 CREATE_SCRIPTABLE_CLASS(FPSPlayer, FPSPlayer::classID(),
     48CREATE_SCRIPTABLE_CLASS(FPSPlayer,
    4949                        addMethod("setAbsCoor", Executor3<PNode, lua_State*,float,float,float>(&PNode::setAbsCoor))
    5050                            ->addMethod("getAbsCoorX", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorX))
    … …  
    167167
    168168    //subscribe to collision reaction
    169   this->subscribeReaction(CREngine::CR_PHYSICS_FULL_WALK, BspEntity::classID());
     169  this->subscribeReaction(CREngine::CR_PHYSICS_FULL_WALK, BspEntity::staticClassID());
    170170
    171171  this->initWeapon = false;

  • branches/new_class_id/src/world_entities/environments/mapped_water.cc

    r9746 r9757  
    3232SHELL_COMMAND(output, MappedWater, saveParams);
    3333
    34 CREATE_SCRIPTABLE_CLASS(MappedWater, MappedWater::classID(),
     34CREATE_SCRIPTABLE_CLASS(MappedWater,
    3535                        addMethod("waterUV", Executor2<MappedWater, lua_State*, float, float>(&MappedWater::fadeWaterUV))
    3636                        ->addMethod("waterFlow", Executor2<MappedWater, lua_State*, float, float>(&MappedWater::fadeWaterFlow))

  • branches/new_class_id/src/world_entities/npcs/attractor_mine.cc

    r9746 r9757  
    3737CREATE_FACTORY(AttractorMine);
    3838#include "script_class.h"
    39 CREATE_SCRIPTABLE_CLASS(AttractorMine, AttractorMine::classID(),
     39CREATE_SCRIPTABLE_CLASS(AttractorMine,
    4040                        addMethod("setName", Executor1<BaseObject, lua_State*,const std::string&>(&BaseObject::setName))
    4141                        //Coordinates

  • branches/new_class_id/src/world_entities/npcs/gate.cc

    r9746 r9757  
    3737
    3838#include "script_class.h"
    39 CREATE_SCRIPTABLE_CLASS(Gate, Gate::classID(),
     39CREATE_SCRIPTABLE_CLASS(Gate,
    4040                        addMethod("hide", Executor0<WorldEntity, lua_State*>(&WorldEntity::hide))
    4141                            ->addMethod("unhide", Executor0<WorldEntity, lua_State*>(&WorldEntity::unhide))

  • branches/new_class_id/src/world_entities/npcs/generic_npc.cc

    r9746 r9757  
    3737
    3838#include "script_class.h"
    39 CREATE_SCRIPTABLE_CLASS(GenericNPC, GenericNPC::classID(),
     39CREATE_SCRIPTABLE_CLASS(GenericNPC,
    4040                        // Move
    4141                        addMethod("walkTo", Executor3<GenericNPC, lua_State*,float,float,float>(&GenericNPC::walkTo))
    … …  
    9595
    9696  // collision reaction registration
    97   this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, BspEntity::classID());
     97  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, BspEntity::staticClassID());
    9898}
    9999

  • branches/new_class_id/src/world_entities/playable.cc

    r9715 r9757  
    110110{
    111111  /// FIXME TOTALLY
    112   if(powerUp->isA(WeaponPowerUp::classID()))
     112  if(powerUp->isA(WeaponPowerUp::staticClassID()))
    113113  {
    114114    return static_cast<WeaponPowerUp*>(powerUp)->process(&this->getWeaponManager());
    115115  }
    116   else if(powerUp->isA(ParamPowerUp::classID()))
     116  else if(powerUp->isA(ParamPowerUp::staticClassID()))
    117117  {
    118118    ParamPowerUp* ppu = static_cast<ParamPowerUp*>(powerUp);

  • branches/new_class_id/src/world_entities/power_ups/power_up.cc

    r9727 r9757  
    122122void PowerUp::collidesWith (WorldEntity* entity, const Vector& location)
    123123{
    124   if(this->collider != entity && entity->isA(Extendable::classID()))
     124  if(this->collider != entity && entity->isA(Extendable::staticClassID()))
    125125  {
    126126    this->collider = entity;

  • branches/new_class_id/src/world_entities/script_trigger.cc

    r9746 r9757  
    2222ObjectListDefinition(ScriptTrigger);
    2323
    24 CREATE_SCRIPTABLE_CLASS(ScriptTrigger, ScriptTrigger::classID(),
     24CREATE_SCRIPTABLE_CLASS(ScriptTrigger,
    2525            // Coordinates
    2626                        addMethod("setAbsCoor", Executor3<PNode, lua_State*,float,float,float>(&PNode::setAbsCoor))

  • branches/new_class_id/src/world_entities/space_ships/helicopter.cc

    r9746 r9757  
    3838CREATE_FACTORY(Helicopter);
    3939#include "script_class.h"
    40 CREATE_SCRIPTABLE_CLASS(Helicopter, Helicopter::classID(),
     40CREATE_SCRIPTABLE_CLASS(Helicopter,
    4141                        addMethod("moveUp", Executor1<Helicopter, lua_State*,bool>(&Helicopter::moveUp))
    4242                            ->addMethod("moveDown", Executor1<Helicopter, lua_State*,bool>(&Helicopter::moveDown))

  • branches/new_class_id/src/world_entities/space_ships/hover.cc

    r9746 r9757  
    3939
    4040#include "script_class.h"
    41 CREATE_SCRIPTABLE_CLASS(Hover, Hover::classID(),
     41CREATE_SCRIPTABLE_CLASS(Hover,
    4242                        addMethod("hasPlayer", Executor0ret<Playable, lua_State*,bool>(&Playable::hasPlayer))
    4343                        //Coordinates

  • branches/new_class_id/src/world_entities/space_ships/space_ship.cc

    r9746 r9757  
    5858
    5959#include "script_class.h"
    60 CREATE_SCRIPTABLE_CLASS(SpaceShip, SpaceShip::classID(),
     60CREATE_SCRIPTABLE_CLASS(SpaceShip,
    6161                        addMethod("hasPlayer", Executor0ret<Playable, lua_State*,bool>(&Playable::hasPlayer))
    6262                        ->addMethod("fire", Executor1<Playable, lua_State*, bool>(&Playable::fire))

  • branches/new_class_id/src/world_entities/space_ships/spacecraft_2d.cc

    r9746 r9757  
    4242CREATE_FACTORY(Spacecraft2D);
    4343
    44 CREATE_SCRIPTABLE_CLASS(Spacecraft2D, Spacecraft2D::classID(),
     44CREATE_SCRIPTABLE_CLASS(Spacecraft2D,
    4545                        addMethod("hasPlayer", Executor0ret<Playable, lua_State*,bool>(&Playable::hasPlayer))
    4646                        //Coordinates

  • branches/new_class_id/src/world_entities/test_entity.cc

    r9746 r9757  
    4040
    4141#include "script_class.h"
    42 CREATE_SCRIPTABLE_CLASS(TestEntity, TestEntity::classID(),
     42CREATE_SCRIPTABLE_CLASS(TestEntity,
    4343                        addMethod("setAbsCoor", Executor3<PNode, lua_State*,float,float,float>(&PNode::setAbsCoor))
    4444                        ->addMethod("getAbsCoorX", Executor0ret<PNode, lua_State*, float>(&PNode::getAbsCoorX))

  • branches/new_class_id/src/world_entities/weapons/aiming_system.cc

    r9727 r9757  
    6262  // registering default reactions:
    6363  this->unsubscribeReaction(CREngine::CR_OBJECT_DAMAGE);
    64   this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, WorldEntity::classID());
     64  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, WorldEntity::staticClassID());
    6565
    6666  this->range = 1000.0f;

  • branches/new_class_id/src/world_entities/weapons/weapon.cc

    r9723 r9757  
    7777  if (createdObject != NULL)
    7878  {
    79     if (createdObject->isA(Weapon::classID()))
     79    if (createdObject->isA(Weapon::staticClassID()))
    8080      return dynamic_cast<Weapon*>(createdObject);
    8181    else
    … …  
    9393  if (createdObject != NULL)
    9494  {
    95     if (createdObject->isA(Weapon::classID()))
     95    if (createdObject->isA(Weapon::staticClassID()))
    9696      return dynamic_cast<Weapon*>(createdObject);
    9797    else
    … …  
    131131  this->defaultTarget = NULL;                      //< Nothing is Targeted by default.
    132132
    133   this->projectile = NullClass::classID();         //< No Projectile Class is Connected to this weapon
     133  this->projectile = NullClass::staticClassID();         //< No Projectile Class is Connected to this weapon
    134134  this->projectileFactory = NULL;                  //< No Factory generating Projectiles is selected.
    135135

  • branches/new_class_id/src/world_entities/weapons/weapon_manager.cc

    r9755 r9757  
    298298  {
    299299    this->parentNode->addChild(weapon);
    300     if (this->parentEntity->isA(Playable::classID()))
     300    if (this->parentEntity->isA(Playable::staticClassID()))
    301301      dynamic_cast<Playable*>(this->parentEntity)->weaponConfigChanged();
    302302    weapon->setDefaultTarget(this->crosshair);
    … …  
    468468      else
    469469        this->currentSlotConfig[i].position.deactivateNode();
    470       if (this->parentEntity != NULL && this->parentEntity->isA(Playable::classID()))
     470      if (this->parentEntity != NULL && this->parentEntity->isA(Playable::staticClassID()))
    471471        dynamic_cast<Playable*>(this->parentEntity)->weaponConfigChanged();
    472472    }
Note: See TracChangeset for help on using the changeset viewer.