mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-21 12:17:46 +00:00
Code Activity

Merge branch 'master' into matchmaking

Browse source
This commit is contained in:
Minho Kang 2017-08-15 19:48:35 +09:00
commit a730ef37aa
3 changed files with 45 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
CMakeSettings.json
View file

@ -1,37 +1,37 @@
{ {
// See https://go.microsoft.com//fwlink//?linkid=834763 for more information about this file. // See https://go.microsoft.com//fwlink//?linkid=834763 for more information about this file.
"configurations": [ "configurations": [
{ {
"name": "x86-Debug", "name": "x86-Debug",
"generator": "Visual Studio 14 2015", "generator": "Visual Studio 14 2015",
"configurationType" : "Debug", "configurationType": "Debug",
"buildRoot": "${env.LOCALAPPDATA}\\CMakeBuild\\${workspaceHash}\\build\\${name}", "buildRoot": "${env.USERPROFILE}\\CMakeBuild\\${workspaceHash}\\build\\${name}",
"cmakeCommandArgs": "", "cmakeCommandArgs": "",
"buildCommandArgs": "-m -v:minimal" "buildCommandArgs": "-m -v:minimal"
}, },
{ {
"name": "x86-Release", "name": "x86-Release",
"generator": "Visual Studio 14 2015", "generator": "Visual Studio 14 2015",
"configurationType": "Release", "configurationType": "Release",
"buildRoot": "${env.LOCALAPPDATA}\\CMakeBuild\\${workspaceHash}\\build\\${name}", "buildRoot": "${env.USERPROFILE}\\CMakeBuild\\${workspaceHash}\\build\\${name}",
"cmakeCommandArgs": "", "cmakeCommandArgs": "",
"buildCommandArgs": "-m -v:minimal" "buildCommandArgs": "-m -v:minimal"
}, },
{ {
"name": "x64-Debug", "name": "x64-Debug",
"generator": "Visual Studio 14 2015 Win64", "generator": "Visual Studio 14 2015 Win64",
"configurationType" : "Debug", "configurationType": "Debug",
"buildRoot": "${env.LOCALAPPDATA}\\CMakeBuild\\${workspaceHash}\\build\\${name}", "buildRoot": "${env.USERPROFILE}\\CMakeBuild\\${workspaceHash}\\build\\${name}",
"cmakeCommandArgs": "", "cmakeCommandArgs": "",
"buildCommandArgs": "-m -v:minimal" "buildCommandArgs": "-m -v:minimal"
}, },
{ {
"name": "x64-Release", "name": "x64-Release",
"generator": "Visual Studio 14 2015 Win64", "generator": "Visual Studio 14 2015 Win64",
"configurationType": "Release", "configurationType": "Release",
"buildRoot": "${env.LOCALAPPDATA}\\CMakeBuild\\${workspaceHash}\\build\\${name}", "buildRoot": "${env.USERPROFILE}\\CMakeBuild\\${workspaceHash}\\build\\${name}",
"cmakeCommandArgs": "", "cmakeCommandArgs": "",
"buildCommandArgs": "-m -v:minimal" "buildCommandArgs": "-m -v:minimal"
} }
] ]
} }

7
src/servers/Server_Common/Util.cpp
View file

@ -23,6 +23,13 @@ uint64_t Core::Util::getTimeMs()
return now_ms; return now_ms;
} }
uint64_t Core::Util::getTimeSeconds()
{
std::chrono::high_resolution_clock::time_point t1 = std::chrono::high_resolution_clock::now();
auto now = std::chrono::time_point_cast< std::chrono::seconds >( t1 ).time_since_epoch().count();
return now;
}
uint64_t Core::Util::getEorzeanTimeStamp() uint64_t Core::Util::getEorzeanTimeStamp()
{ {
std::chrono::high_resolution_clock::time_point t1 = std::chrono::high_resolution_clock::now(); std::chrono::high_resolution_clock::time_point t1 = std::chrono::high_resolution_clock::now();

2
src/servers/Server_Common/Util.h
View file

@ -11,6 +11,8 @@ std::string binaryToHexString( uint8_t* pBinData, uint16_t size );
uint64_t getTimeMs(); uint64_t getTimeMs();
uint64_t getTimeSeconds();
uint64_t getEorzeanTimeStamp(); uint64_t getEorzeanTimeStamp();
void valueToFlagByteIndexValue( uint32_t inVal, uint8_t& outVal, uint16_t& outIndex ); void valueToFlagByteIndexValue( uint32_t inVal, uint8_t& outVal, uint16_t& outIndex );