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

Switched getTime() to std::chrono on all platforms.

Browse Source
This commit is contained in:
dongresource 2020-09-16 20:14:00 +02:00
parent efda6673b5
commit 5efc8ac089
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/CNStructs.cpp
View File

@ -1,7 +1,5 @@
#include "CNStructs.hpp" #include "CNStructs.hpp"
#if defined _MSC_VER
#include <chrono> #include <chrono>
#endif
std::string U16toU8(char16_t* src) { std::string U16toU8(char16_t* src) {
try { try {
@ -24,13 +22,10 @@ size_t U8toU16(std::string src, char16_t* des) {
return tmp.length(); return tmp.length();
} }
uint64_t getTime() { time_t getTime() {
#ifndef _MSC_VER using namespace std::chrono;
struct timeval tp;
gettimeofday(&tp, NULL); milliseconds value = duration_cast<milliseconds>((time_point_cast<milliseconds>(high_resolution_clock::now())).time_since_epoch());
return tp.tv_sec * 1000 + tp.tv_usec / 1000;
#else return (time_t)value.count();
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());
return (uint64_t)(value.count());
#endif
} }

2
src/CNStructs.hpp
View File

@ -32,7 +32,7 @@
std::string U16toU8(char16_t* src); std::string U16toU8(char16_t* src);
size_t U8toU16(std::string src, char16_t* des); // returns number of char16_t that was written at des size_t U8toU16(std::string src, char16_t* des); // returns number of char16_t that was written at des
uint64_t getTime(); time_t getTime();
// The PROTOCOL_VERSION definition is defined by the build system. // The PROTOCOL_VERSION definition is defined by the build system.
#if !defined(PROTOCOL_VERSION) #if !defined(PROTOCOL_VERSION)

2
src/MissionManager.cpp
View File

@ -78,7 +78,7 @@ void MissionManager::taskEnd(CNSocket* sock, CNPacketData* data) {
* Yes, this is pretty stupid. * Yes, this is pretty stupid.
* *
* iSUInstancename is the number of items to give. It is usually negative at the end of * iSUInstancename is the number of items to give. It is usually negative at the end of
* a mission, so as to clean up it's quest items. * a mission, to clean up its quest items.
*/ */
for (int i = 0; i < 3; i++) for (int i = 0; i < 3; i++)
if (task["m_iSUItem"][i] != 0) if (task["m_iSUItem"][i] != 0)