Revision 90fa4b4e server/src/EmotionConfig.cpp
| server/src/EmotionConfig.cpp | ||
|---|---|---|
| 27 | 27 |
*/ |
| 28 | 28 |
|
| 29 | 29 |
#include "EmotionConfig.h" |
| 30 |
using namespace boost; |
|
| 31 | 30 |
|
| 32 | 31 |
EmotionConfig::EmotionConfig() {
|
| 33 | 32 |
select_config(NEUTRAL); |
| ... | ... | |
| 41 | 40 |
} |
| 42 | 41 |
|
| 43 | 42 |
bool EmotionConfig::is_active() {
|
| 44 |
if (get_system_time() >= end_time) {
|
|
| 43 |
if (std::chrono::steady_clock::now() >= end_time) {
|
|
| 45 | 44 |
return false; |
| 46 | 45 |
} |
| 47 | 46 |
|
| ... | ... | |
| 50 | 49 |
|
| 51 | 50 |
void EmotionConfig::set_duration(unsigned long ms) {
|
| 52 | 51 |
// set a timeout: |
| 53 |
end_time = get_system_time() + posix_time::milliseconds(ms);
|
|
| 52 |
end_time = std::chrono::steady_clock::now() + std::chrono::milliseconds(ms);
|
|
| 54 | 53 |
} |
| 55 | 54 |
|
| 56 | 55 |
void EmotionConfig::select_config(EmotionType e) {
|
Also available in: Unified diff