Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1826 for code/trunk/src


Ignore:
Timestamp:
Sep 22, 2008, 10:11:45 PM (16 years ago)
Author:
rgrieder
Message:

TimerBase are now ticked in GSRoot to be able to use them anywhere.

Location:
code/trunk/src/orxonox/gamestates
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/src/orxonox/gamestates/GSLevel.cc

    r1819 r1826  
    3939#include "objects/Tickable.h"
    4040#include "objects/Radar.h"
    41 #include "tools/Timer.h"
    4241#include "tools/ParticleInterface.h"
    4342#include "Settings.h"
     
    116115        for (ObjectList<Tickable>::iterator it = ObjectList<Tickable>::begin(); it; ++it)
    117116            it->tick(time.getDeltaTime() * this->timeFactor_);
    118 
    119         for (ObjectList<TimerBase>::iterator it = ObjectList<TimerBase>::begin(); it; ++it)
    120             it->tick(time);
    121117    }
    122118
  • code/trunk/src/orxonox/gamestates/GSRoot.cc

    r1795 r1826  
    4444#include "core/TclBind.h"
    4545#include "core/TclThreadManager.h"
     46#include "tools/Timer.h"
    4647#include "GraphicsEngine.h"
    4748#include "Settings.h"
     
    179180    {
    180181        TclThreadManager::getInstance().tick(time.getDeltaTime());
     182
     183        for (ObjectList<TimerBase>::iterator it = ObjectList<TimerBase>::begin(); it; ++it)
     184            it->tick(time);
    181185
    182186        this->tickChild(time);
Note: See TracChangeset for help on using the changeset viewer.