diff options
author | Robert <krzmbrzl@gmail.com> | 2020-09-11 19:29:33 +0300 |
---|---|---|
committer | Robert <krzmbrzl@gmail.com> | 2020-09-11 19:29:33 +0300 |
commit | af7dac72f4063dd8d4dac71973ea51c25896089a (patch) | |
tree | 35558695aea94d48fd9e77d164d63fd8b7c76e90 /plugins/dys | |
parent | 40b28b03c150b453e00c6bc4f8d6957caea59c51 (diff) |
FORMAT: Run clang-format 10 on all C/CXX source-files
Diffstat (limited to 'plugins/dys')
-rw-r--r-- | plugins/dys/dys.cpp | 74 |
1 files changed, 30 insertions, 44 deletions
diff --git a/plugins/dys/dys.cpp b/plugins/dys/dys.cpp index 6fee1e606..c77158653 100644 --- a/plugins/dys/dys.cpp +++ b/plugins/dys/dys.cpp @@ -16,8 +16,8 @@ static bool calcout(float *pos, float *rot, float *opos, float *front, float *to if ((v < -360.0f) || (v > 360.0f) || (h < -360.0f) || (h > 360.0f)) return false; - h *= static_cast<float>(M_PI / 180.0f); - v *= static_cast<float>(M_PI / 180.0f); + h *= static_cast< float >(M_PI / 180.0f); + v *= static_cast< float >(M_PI / 180.0f); // Seems Dystopia is in inches. INCHES?!? opos[0] = pos[0] / 39.37f; @@ -28,7 +28,7 @@ static bool calcout(float *pos, float *rot, float *opos, float *front, float *to front[1] = -sin(h); front[2] = sin(v) * cos(h); - h -= static_cast<float>(M_PI / 2.0f); + h -= static_cast< float >(M_PI / 2.0f); top[0] = cos(v) * cos(h); top[1] = -sin(h); @@ -37,8 +37,9 @@ static bool calcout(float *pos, float *rot, float *opos, float *front, float *to return true; } -static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, float *camera_pos, float *camera_front, float *camera_top, string &context, wstring &) { - for (int i=0;i<3;i++) +static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, float *camera_pos, float *camera_front, + float *camera_top, string &context, wstring &) { + for (int i = 0; i < 3; i++) avatar_pos[i] = avatar_front[i] = avatar_top[i] = camera_pos[i] = camera_front[i] = camera_top[i] = 0.0f; float ipos[3], rot[3]; @@ -49,29 +50,27 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa wostringstream new_identity; ostringstream new_context; - ok = peekProc(posptr, ipos, 12) && - peekProc(rotptr, rot, 12) && - peekProc(stateptr, &state, 1) && - peekProc(hostptr, chHostStr, 40); + ok = peekProc(posptr, ipos, 12) && peekProc(rotptr, rot, 12) && peekProc(stateptr, &state, 1) + && peekProc(hostptr, chHostStr, 40); if (!ok) return false; chHostStr[39] = 0; sHost.assign(chHostStr); - if (sHost.find(':')==string::npos) + if (sHost.find(':') == string::npos) sHost.append(":27015"); new_context << "<context>" - << "<game>dys</game>" - << "<hostport>" << sHost << "</hostport>" - << "</context>"; + << "<game>dys</game>" + << "<hostport>" << sHost << "</hostport>" + << "</context>"; context = new_context.str(); /* TODO new_identity << "<identity>" - << "<name>" << "SAS" << "</name>" - << "</identity>"; + << "<name>" << "SAS" << "</name>" + << "</identity>"; identity = new_identity.str(); */ // Check to see if you are spawned @@ -80,10 +79,10 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa ok = calcout(ipos, rot, avatar_pos, avatar_front, avatar_top); if (ok) { - for (int i=0;i<3;++i) { - camera_pos[i] = avatar_pos[i]; + for (int i = 0; i < 3; ++i) { + camera_pos[i] = avatar_pos[i]; camera_front[i] = avatar_front[i]; - camera_top[i] = avatar_top[i]; + camera_top[i] = avatar_top[i]; } return true; } @@ -91,13 +90,13 @@ static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, floa return false; } -static int trylock(const std::multimap<std::wstring, unsigned long long int> &pids) { +static int trylock(const std::multimap< std::wstring, unsigned long long int > &pids) { posptr = rotptr = 0; - if (! initialize(pids, L"hl2.exe", L"client.dll")) + if (!initialize(pids, L"hl2.exe", L"client.dll")) return false; - procptr_t mod_engine=getModuleAddr(L"engine.dll"); + procptr_t mod_engine = getModuleAddr(L"engine.dll"); if (!mod_engine) return false; @@ -111,14 +110,14 @@ static int trylock(const std::multimap<std::wstring, unsigned long long int> &pi */ // Remember addresses for later - posptr = pModule + 0x4A3330; - rotptr = pModule + 0x454E04; + posptr = pModule + 0x4A3330; + rotptr = pModule + 0x454E04; stateptr = pModule + 0x4518A0; - hostptr = mod_engine + 0x3C2A84; + hostptr = mod_engine + 0x3C2A84; - //Gamecheck + // Gamecheck char sMagic[14]; - if (!peekProc(pModule + 0x463726, sMagic, 14) || strncmp("DysObjective@@", sMagic, 14)!=0) + if (!peekProc(pModule + 0x463726, sMagic, 14) || strncmp("DysObjective@@", sMagic, 14) != 0) return false; // Check if we can get meaningful data from it @@ -143,26 +142,13 @@ static std::wstring description(L"Dystopia (Build 4104)"); static std::wstring shortname(L"Dystopia"); static int trylock1() { - return trylock(std::multimap<std::wstring, unsigned long long int>()); + return trylock(std::multimap< std::wstring, unsigned long long int >()); } -static MumblePlugin dysplug = { - MUMBLE_PLUGIN_MAGIC, - description, - shortname, - nullptr, - nullptr, - trylock1, - generic_unlock, - longdesc, - fetch -}; - -static MumblePlugin2 dysplug2 = { - MUMBLE_PLUGIN_MAGIC_2, - MUMBLE_PLUGIN_VERSION, - trylock -}; +static MumblePlugin dysplug = { MUMBLE_PLUGIN_MAGIC, description, shortname, nullptr, nullptr, trylock1, + generic_unlock, longdesc, fetch }; + +static MumblePlugin2 dysplug2 = { MUMBLE_PLUGIN_MAGIC_2, MUMBLE_PLUGIN_VERSION, trylock }; extern "C" MUMBLE_PLUGIN_EXPORT MumblePlugin *getMumblePlugin() { return &dysplug; |