Changeset 1704 for code/branches/gui

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:

• core/Exception.h (modified) (2 diffs)
• orxonox/tools/Timer.h (modified) (2 diffs)

code/branches/gui/src/core/Exception.h

@@ -101 +101 @@
                   : Exception(description, lineNumber, fileName, functionName)
         {
-            // let the catcher decide whether to display the message below level 3
-            COUT(3) << this->getFullDescription() << std::endl;
+            // let the catcher decide whether to display the message below level 4
+            COUT(4) << this->getFullDescription() << std::endl;
         }
 
@@ -108 +108 @@
             : Exception(description)
         {
-            // let the catcher decide whether to display the message below level 3
-            COUT(3) << this->getFullDescription() << std::endl;
+            // let the catcher decide whether to display the message below level 4
+            COUT(4) << this->getFullDescription() << std::endl;
         }
 

code/branches/gui/src/orxonox/tools/Timer.h

@@ -101 +101 @@
             /** @brief Gives the Timer some extra time. @param time The amount of extra time in seconds */
             inline void addTime(float time)
-                { if (time > 0.0f) this->time_ += (uint64_t)(time * 1000000.0f); }
+                { if (time > 0.0f) this->time_ += (int64_t)(time * 1000000.0f); }
             /** @brief Decreases the remaining time of the Timer. @param time The amount of time to remove */
             inline void removeTime(float time)
-                { if (time > 0.0f) this->time_ -= (uint64_t)(time * 1000000.0f); }
+                { if (time > 0.0f) this->time_ -= (int64_t)(time * 1000000.0f); }
             /** @brief Sets the interval of the Timer. @param interval The interval */
             inline void setInterval(float interval)
-                { this->interval_ = (uint64_t)(interval * 1000000.0f); }
+                { this->interval_ = (int64_t)(interval * 1000000.0f); }
             /** @brief Sets bLoop to a given value. @param bLoop True = loop */
             inline void setLoop(bool bLoop)
@@ -119 +119 @@
             Executor* executor_; //!< The executor of the function that should be called when the time expires
 
-            uint64_t interval_;  //!< The time-interval in micro seconds
+            int64_t interval_;  //!< The time-interval in micro seconds
             bool bLoop_;         //!< If true, the function gets called every 'interval' seconds
             bool bActive_;       //!< If true, the Timer ticks and calls the function if the time's up
 
-            uint64_t time_;      //!< Internal variable, counting the time till the next function-call
+            int64_t time_;      //!< Internal variable, counting the time till the next function-call
     };