summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2013-10-30 20:23:34 +0100
committerHaru <haru@dotalux.com>2013-10-30 20:23:34 +0100
commitbd04c6c566902d03d633b4dfee5335361155a79e (patch)
tree715f3b80d75cab3a9c2a3abd04ae4461165e8854
parent1fd89646ff234ce74f35f9fb759c6b503a14bc6c (diff)
downloadhercules-bd04c6c566902d03d633b4dfee5335361155a79e.tar.gz
hercules-bd04c6c566902d03d633b4dfee5335361155a79e.tar.bz2
hercules-bd04c6c566902d03d633b4dfee5335361155a79e.tar.xz
hercules-bd04c6c566902d03d633b4dfee5335361155a79e.zip
Follow-up to 44c33fda3614d588e6bf6cee1cf884e98f1531f0
Corrected some leftover 32bit typecasts. Special thanks to Ind. Signed-off-by: Haru <haru@dotalux.com>
-rw-r--r--src/common/timer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/timer.c b/src/common/timer.c
index ccd91f9c7..e5cf5df2a 100644
--- a/src/common/timer.c
+++ b/src/common/timer.c
@@ -355,17 +355,17 @@ int64 timer_settick(int tid, int64 tick) {
return -1;
}
- if( (int)tick == -1 )
- tick = 0;// add 1ms to avoid the error value -1
+ if( tick == -1 )
+ tick = 0; // add 1ms to avoid the error value -1
if( timer_data[tid].tick == tick )
- return (int)tick;// nothing to do, already in propper position
+ return tick; // nothing to do, already in proper position
// pop and push adjusted timer
BHEAP_POPINDEX(timer_heap, i, DIFFTICK_MINTOPCMP, swap);
timer_data[tid].tick = tick;
BHEAP_PUSH(timer_heap, tid, DIFFTICK_MINTOPCMP, swap);
- return (int)tick;
+ return tick;
}
/// Executes all expired timers.