Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 24, 2015, 11:54:47 AM (9 years ago)
Author:
gania
Message:

I hope that you don't code today, that version is not compilable just yet

File:
1 edited

Legend:

Unmodified
Added
Removed

  • code/branches/campaignHS15/src/orxonox/worldentities/ActionPoint.h

    r10844 r10847  
    3333*/
    3434
    35 #ifndef _ActionPoint_H__
    36 #define _ActionPoint_H__
     35#ifndef _Actionpoint_H__
     36#define _Actionpoint_H__
    3737
    3838#include "OrxonoxPrereqs.h"
    … …  
    4545{
    4646 
    47     class _OrxonoxExport ActionPoint : public StaticEntity
     47    class _OrxonoxExport Actionpoint : public StaticEntity
    4848    {
    4949        public:
    50             ActionPoint(Context* context);
    51             virtual ~ActionPoint() {}
     50            Actionpoint(Context* context);
     51            virtual ~Actionpoint() {}
    5252
    5353            //----[XML data]----
    … …  
    8787                //----[/FightAll data]----
    8888            //----[/XML data]----
    89 
     89                void setProtect( ControllableEntity* protect);
     90                ControllableEntity* getProtect();
     91                void setEnemy( ControllableEntity* enemy);
     92                ControllableEntity* getEnemy();
    9093            //----["Waypoints" data]----
    9194                void setTargetPosition(const Vector3& target);
    … …  
    98101            std::string protectName_;
    99102            std::string enemyName_;
     103            WeakPtr<ControllableEntity> protect_;
     104            WeakPtr<ControllableEntity> enemy_;
     105
    100106            bool protectMe_;
    101107            bool fightAll_;
    … …  
    104110}
    105111
    106 #endif /* _ActionPoint_H__ */
     112#endif /* _Actionpoint_H__ */
Note: See TracChangeset for help on using the changeset viewer.