diff options
author | Andrey Nazarov <skuller@skuller.net> | 2009-05-23 13:09:36 +0000 |
---|---|---|
committer | Andrey Nazarov <skuller@skuller.net> | 2009-05-23 13:09:36 +0000 |
commit | 454fc2e2eb975e359696850f07c071aa0736aac7 (patch) | |
tree | caccd779d07d3e30dc3a7cac85ea8969d670519b /source/common.c | |
parent | d7423ceb1f3f699ce36bbd405f240d45f3dda4d4 (diff) |
Fixed scrolling in MVD clients menu.
Implemented automatic chasecam hack for MVD observers.
Correctly handle ICMP errors resluting in sendto() failing on Linux.
Added ‘--disable-icmp’ option to configure script.
Implemented ‘net_stats’ console command.
Diffstat (limited to 'source/common.c')
-rw-r--r-- | source/common.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/source/common.c b/source/common.c index 7e47f4c..de80f6c 100644 --- a/source/common.c +++ b/source/common.c @@ -1087,13 +1087,10 @@ static size_t Com_Date_m( char *buffer, size_t size ) { return strftime( buffer, size, com_date_format->string, local ); } -size_t Com_TimeDiff( char *buffer, size_t size, time_t start, time_t end ) { +size_t Com_FormatTime( char *buffer, size_t size, time_t t ) { int sec, min, hour, day; - if( start > end ) { - start = end; - } - sec = end - start; + sec = (int)t; min = sec / 60; sec %= 60; hour = min / 60; min %= 60; day = hour / 24; hour %= 24; @@ -1107,6 +1104,16 @@ size_t Com_TimeDiff( char *buffer, size_t size, time_t start, time_t end ) { return Q_scnprintf( buffer, size, "%02d.%02d", min, sec ); } +size_t Com_TimeDiff( char *buffer, size_t size, time_t start, time_t end ) { + time_t diff; + + if( start > end ) { + start = end; + } + diff = end - start; + return Com_FormatTime( buffer, size, diff ); +} + size_t Com_Uptime_m( char *buffer, size_t size ) { return Com_TimeDiff( buffer, size, com_startTime, time( NULL ) ); } |