Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11058


Ignore:
Timestamp:
Jan 10, 2016, 8:01:09 PM (8 years ago)
Author:
landauf
Message:

removed empty tick functions

Location:
code/branches/cpp11_v3/src
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.cc

    r11057 r11058  
    5353    }
    5454
    55     void JumpPlatformDisappear::tick(float dt)
    56     {
    57         SUPER(JumpPlatformDisappear, tick, dt);
    58     }
    59 
    6055    void JumpPlatformDisappear::setProperties(bool active)
    6156    {

  • code/branches/cpp11_v3/src/modules/jump/JumpPlatformDisappear.h

    r11057 r11058  
    4646            JumpPlatformDisappear(Context* context);
    4747            virtual ~JumpPlatformDisappear();
    48             virtual void tick(float dt) override;
    4948            virtual void setProperties(bool active);
    5049            virtual bool isActive();

  • code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.cc

    r11057 r11058  
    4949
    5050    }
    51 
    52     void JumpPlatformFake::tick(float dt)
    53     {
    54         SUPER(JumpPlatformFake, tick, dt);
    55     }
    56 
    5751}

  • code/branches/cpp11_v3/src/modules/jump/JumpPlatformFake.h

    r11057 r11058  
    4646            JumpPlatformFake(Context* context);
    4747            virtual ~JumpPlatformFake();
    48             virtual void tick(float dt) override;
    4948    };
    5049}

  • code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.cc

    r11057 r11058  
    5252    }
    5353
    54     void JumpPlatformStatic::tick(float dt)
    55     {
    56         SUPER(JumpPlatformStatic, tick, dt);
    57     }
    58 
    5954    void JumpPlatformStatic::touchFigure()
    6055    {

  • code/branches/cpp11_v3/src/modules/jump/JumpPlatformStatic.h

    r11057 r11058  
    4141            virtual ~JumpPlatformStatic();
    4242
    43             virtual void tick(float dt) override;
    44 
    4543            virtual void touchFigure() override;
    4644    };

  • code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameAI.cc

    r11054 r11058  
    112112        return possibleMoves;
    113113    }
    114 
    115     /**
    116     @brief
    117         Is called each tick.
    118         Implements the behavior of the PongAI (i.e. its intelligence).
    119     @param dt
    120         The time that has elapsed since the last tick.
    121     */
    122     void Mini4DgameAI::tick(float dt)
    123     {
    124 
    125     }
    126114}

  • code/branches/cpp11_v3/src/modules/mini4dgame/Mini4DgameAI.h

    r11054 r11058  
    3939#include <list>
    4040
    41 #include "tools/interfaces/Tickable.h"
    42 
    4341#include "controllers/Controller.h"
    4442#include "Mini4DgameCenterpoint.h"
    … …  
    5553        Oliver Richter
    5654    */
    57     class _Mini4DgameExport Mini4DgameAI : public Controller, public Tickable
     55    class _Mini4DgameExport Mini4DgameAI : public Controller
    5856    {
    5957        public:
    … …  
    7270            */
    7371            Vector4 makeMove(float timeout);
    74 
    75 
    76             virtual void tick(float dt);
    7772
    7873            void setCenterpoint(Mini4DgameCenterpoint* center)

  • code/branches/cpp11_v3/src/modules/objects/triggers/TriggerBase.cc

    r11054 r11058  
    104104    /**
    105105    @brief
    106         A method that is executed each tick.
    107     @param dt
    108         The duration of the last tick.
    109     */
    110     void TriggerBase::tick(float dt)
    111     {
    112         SUPER(TriggerBase, tick, dt);
    113     }
    114 
    115     /**
    116     @brief
    117106        Set the mode of the trigger.
    118107    @param modeName

  • code/branches/cpp11_v3/src/modules/objects/triggers/TriggerBase.h

    r9667 r11058  
    7878
    7979            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);  //!< Method for creating a TriggerBase object through XML.
    80             virtual void tick(float dt); //!< A method that is executed each tick.
    8180
    8281            /**

  • code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseEnemy.cc

    r11054 r11058  
    3838    }
    3939
    40     void TowerDefenseEnemy::tick(float dt)
    41     {   
    42         //orxout() << "TDE tick1" << endl;
    43         SUPER(TowerDefenseEnemy, tick, dt);
    44         //orxout() << "TDE tick2" << endl;
    45     }
    46 
    4740    WeakPtr<TowerDefense> TowerDefenseEnemy::getGame()
    4841    {

  • code/branches/cpp11_v3/src/modules/towerdefense/TowerDefenseEnemy.h

    r11054 r11058  
    3737        //health gibt es unter: health_
    3838
    39         virtual void tick(float dt) override;
    4039        virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override;
    4140

  • code/branches/cpp11_v3/src/modules/weapons/IceGunFreezer.cc

    r11054 r11058  
    6363    /**
    6464    @brief
    65         The controlling happens here. This method defines what the controller has to do each tick.
    66     @param dt
    67         The duration of the tick.
    68     */
    69     void IceGunFreezer::tick(float dt)
    70     {
    71         SUPER(IceGunFreezer, tick, dt);
    72 
    73 
    74     }
    75 
    76     /**
    77     @brief
    7865        Sets the freeze time variable to the passed value.
    7966    */

  • code/branches/cpp11_v3/src/modules/weapons/IceGunFreezer.h

    r11054 r11058  
    3737#include "weapons/WeaponsPrereqs.h"
    3838
    39 #include "tools/interfaces/Tickable.h"
    4039#include "worldentities/StaticEntity.h"
    4140#include "graphics/Model.h"
    … …  
    5049    @ingroup Weapons
    5150    */
    52     class _WeaponsExport IceGunFreezer : public StaticEntity, public Tickable
     51    class _WeaponsExport IceGunFreezer : public StaticEntity
    5352    {
    5453        public:
    5554            IceGunFreezer(Context* context);
    5655            virtual ~IceGunFreezer();
    57             virtual void tick(float dt) override;
    5856            virtual void startFreezing();
    5957            virtual void stopFreezing();

  • code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.cc

    r11057 r11058  
    5555        this->actionpoints_.clear();
    5656    }
    57     void DivisionController::tick(float dt)
    58     {   
    59         if (!this->isActive())
    60             return;   
    61        
    62         SUPER(DivisionController, tick, dt);
    63        
    64     }
    6557    void DivisionController::action()
    6658    {   

  • code/branches/cpp11_v3/src/orxonox/controllers/DivisionController.h

    r11057 r11058  
    5050            //----[/language demanded functions]----           
    5151
    52             //----[orxonox demanded functions]----
    53                 virtual void tick(float dt);
    54             //----[orxonox demanded functions]----
    55 
    5652            //----[own functions]----
    5753                virtual bool setFollower(ActionpointController* newFollower);

  • code/branches/cpp11_v3/src/orxonox/controllers/SectionController.cc

    r11057 r11058  
    5555        this->parsedActionpoints_.clear();
    5656        this->actionpoints_.clear();
    57     }
    58 
    59     //----in tick, move (or look) and shoot----
    60     void SectionController::tick(float dt)
    61     {
    62         if (!this->isActive())
    63             return;
    64    
    65         SUPER(SectionController, tick, dt);
    66        
    6757    }
    6858

  • code/branches/cpp11_v3/src/orxonox/controllers/SectionController.h

    r11057 r11058  
    4949            //----[/language demanded functions]----
    5050           
    51             //----[orxonox demanded functions]----
    52                 virtual void tick(float dt);
    53             //----[/orxonox demanded functions]----
    54            
    5551            //----[own functions]----
    5652                ActionpointController* findNewDivisionLeader();

  • code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.cc

    r11057 r11058  
    5353        this->parsedActionpoints_.clear();
    5454        this->actionpoints_.clear();
    55     }
    56  
    57     //----in tick, move (or look) and shoot----
    58     void WingmanController::tick(float dt)
    59     {   
    60         if (!this->isActive())
    61             return;
    62        
    63         SUPER(WingmanController, tick, dt);
    64 
    6555    }
    6656   

  • code/branches/cpp11_v3/src/orxonox/controllers/WingmanController.h

    r11057 r11058  
    5151           
    5252            //----[orxonox demanded functions]----
    53                 virtual void tick(float dt);
    5453                virtual bool hasWingman()
    5554                    { return false; }
Note: See TracChangeset for help on using the changeset viewer.