diff options
author | Stijn Buys <ingar@osirion.org> | 2011-02-09 16:01:17 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2011-02-09 16:01:17 +0000 |
commit | a255dbc032d15a4f5024bc60baa19c45ebceecc6 (patch) | |
tree | ca5517aae243957b824767169674248c70f7b1d3 /src/sys/sys.cc | |
parent | 38eb51c26ab0d9dbebc974c7a21f96a429ce3098 (diff) |
added sv_collisionmargin Cvar and applied the value to mesh collisions,
added seconds parameter to sys::get_datetime(),
added con_timestamps Cvar,
enabled console timestamps on the dedicated server by default.
Diffstat (limited to 'src/sys/sys.cc')
-rw-r--r-- | src/sys/sys.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/sys/sys.cc b/src/sys/sys.cc index f4e915d..39700b9 100644 --- a/src/sys/sys.cc +++ b/src/sys/sys.cc @@ -180,7 +180,7 @@ void sleep(float seconds) #endif } -void get_datetime(int &year, int & month, int & day, int & hours, int & minutes) +void get_datetime(int &year, int & month, int & day, int & hours, int & minutes, int &seconds) { #ifndef _WIN32 struct ::tm localtime; @@ -193,6 +193,7 @@ void get_datetime(int &year, int & month, int & day, int & hours, int & minutes) hours = localtime.tm_hour; minutes = localtime.tm_min; + seconds = localtime.tm_sec; #else SYSTEMTIME localtime; ::GetLocalTime(&localtime); @@ -203,6 +204,7 @@ void get_datetime(int &year, int & month, int & day, int & hours, int & minutes) hours = localtime.wHour; minutes = localtime.wMinute; + seconds = localtime.wSecond; #endif } |