Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 1704 for code/branches/gui


Ignore:
Timestamp:
Sep 4, 2008, 4:22:25 PM (16 years ago)
Author:
rgrieder
Message:

fixed a stupid bug in Timer

Location:
code/branches/gui/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/branches/gui/src/core/Exception.h

    r1670 r1704  
    101101                  : Exception(description, lineNumber, fileName, functionName)
    102102        {
    103             // let the catcher decide whether to display the message below level 3
    104             COUT(3) << this->getFullDescription() << std::endl;
     103            // let the catcher decide whether to display the message below level 4
     104            COUT(4) << this->getFullDescription() << std::endl;
    105105        }
    106106
     
    108108            : Exception(description)
    109109        {
    110             // let the catcher decide whether to display the message below level 3
    111             COUT(3) << this->getFullDescription() << std::endl;
     110            // let the catcher decide whether to display the message below level 4
     111            COUT(4) << this->getFullDescription() << std::endl;
    112112        }
    113113
  • code/branches/gui/src/orxonox/tools/Timer.h

    r1695 r1704  
    101101            /** @brief Gives the Timer some extra time. @param time The amount of extra time in seconds */
    102102            inline void addTime(float time)
    103                 { if (time > 0.0f) this->time_ += (uint64_t)(time * 1000000.0f); }
     103                { if (time > 0.0f) this->time_ += (int64_t)(time * 1000000.0f); }
    104104            /** @brief Decreases the remaining time of the Timer. @param time The amount of time to remove */
    105105            inline void removeTime(float time)
    106                 { if (time > 0.0f) this->time_ -= (uint64_t)(time * 1000000.0f); }
     106                { if (time > 0.0f) this->time_ -= (int64_t)(time * 1000000.0f); }
    107107            /** @brief Sets the interval of the Timer. @param interval The interval */
    108108            inline void setInterval(float interval)
    109                 { this->interval_ = (uint64_t)(interval * 1000000.0f); }
     109                { this->interval_ = (int64_t)(interval * 1000000.0f); }
    110110            /** @brief Sets bLoop to a given value. @param bLoop True = loop */
    111111            inline void setLoop(bool bLoop)
     
    119119            Executor* executor_; //!< The executor of the function that should be called when the time expires
    120120
    121             uint64_t interval_;  //!< The time-interval in micro seconds
     121            int64_t interval_;  //!< The time-interval in micro seconds
    122122            bool bLoop_;         //!< If true, the function gets called every 'interval' seconds
    123123            bool bActive_;       //!< If true, the Timer ticks and calls the function if the time's up
    124124
    125             uint64_t time_;      //!< Internal variable, counting the time till the next function-call
     125            int64_t time_;      //!< Internal variable, counting the time till the next function-call
    126126    };
    127127
Note: See TracChangeset for help on using the changeset viewer.