OpenPunk/OpenFusion
1
0
Fork 0
mirror of https://github.com/OpenFusionProject/OpenFusion.git synced 2024-11-22 05:20:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #67 from darkredtitan/master

Browse Source 
Fix social distancing bug (name trademarked by kamilprzyb)
This commit is contained in:
CPunch 2020-09-05 20:37:53 -05:00 committed by GitHub
commit e936cb9fac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/CNStructs.cpp
View File

@ -1,4 +1,7 @@
#include "CNStructs.hpp" #include "CNStructs.hpp"
#if defined _MSC_VER
#include <chrono>
#endif
std::string U16toU8(char16_t* src) { std::string U16toU8(char16_t* src) {
try { try {
@ -27,8 +30,7 @@ uint64_t getTime() {
gettimeofday(&tp, NULL); gettimeofday(&tp, NULL);
return tp.tv_sec * 1000 + tp.tv_usec / 1000; return tp.tv_sec * 1000 + tp.tv_usec / 1000;
#else #else
time_t t; std::chrono::milliseconds value = std::chrono::duration_cast<std::chrono::milliseconds>((std::chrono::time_point_cast<std::chrono::milliseconds>(std::chrono::high_resolution_clock::now())).time_since_epoch());
time(&t); return (uint64_t)(value.count());
return (uint64_t)t;
#endif #endif
} }