summaryrefslogtreecommitdiff
path: root/source/common.c
diff options
context:
space:
mode:
authorAndrey Nazarov <skuller@skuller.net>2009-01-19 23:48:10 +0000
committerAndrey Nazarov <skuller@skuller.net>2009-01-19 23:48:10 +0000
commitbcf4627a400251c3c3ecebfd637b8ebe1b475325 (patch)
tree5716792d60ceef99d6d3f149cb052d18720a239c /source/common.c
parentcea680b72a6a2207ea301ef9026ecda087502065 (diff)
MVD client now exports ‘mvd_channels’ and ‘mvd_players’ counters into server info.
Fixed client side event positioning on player's own entity.
Diffstat (limited to 'source/common.c')
-rw-r--r--source/common.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/source/common.c b/source/common.c
index 97ec636..5d91f12 100644
--- a/source/common.c
+++ b/source/common.c
@@ -1050,15 +1050,13 @@ static size_t Com_Date_m( char *buffer, size_t size ) {
return strftime( buffer, size, com_date_format->string, local );
}
-size_t Com_Uptime_m( char *buffer, size_t size ) {
+size_t Com_TimeDiff( char *buffer, size_t size, time_t start, time_t end ) {
int sec, min, hour, day;
- time_t clock;
- time( &clock );
- if( com_startTime > clock ) {
- com_startTime = clock;
+ if( start > end ) {
+ start = end;
}
- sec = clock - com_startTime;
+ sec = end - start;
min = sec / 60; sec %= 60;
hour = min / 60; min %= 60;
day = hour / 24; hour %= 24;
@@ -1072,6 +1070,10 @@ size_t Com_Uptime_m( char *buffer, size_t size ) {
return Q_scnprintf( buffer, size, "%02d.%02d", min, sec );
}
+size_t Com_Uptime_m( char *buffer, size_t size ) {
+ return Com_TimeDiff( buffer, size, com_startTime, time( NULL ) );
+}
+
size_t Com_Random_m( char *buffer, size_t size ) {
return Q_scnprintf( buffer, size, "%d", ( rand() ^ ( rand() >> 8 ) ) % 10 );
}