Rim/iw5-mod
Rim/iw5-mod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix indentation

Browse Source
This commit is contained in:
momo5502 2018-12-27 17:28:12 +01:00
parent 071dbfa5fc
commit a120591be3
7 changed files with 367 additions and 360 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/game/demonware/i_service.hpp
View File

@ -30,8 +30,8 @@ namespace demonware
printf("DW: Handling subservice of type %d\n", this->sub_type_); printf("DW: Handling subservice of type %d\n", this->sub_type_);
const auto callback = this->callbacks.find(this->sub_type_); const auto callback = this->callbacks_.find(this->sub_type_);
if (callback != this->callbacks.end()) if (callback != this->callbacks_.end())
{ {
callback->second(server, &buffer); callback->second(server, &buffer);
} }
@ -42,12 +42,12 @@ namespace demonware
} }
protected: protected:
std::map<uint8_t, callback> callbacks{}; std::map<uint8_t, callback> callbacks_{};
template <typename Class, typename T, typename... Args> template <typename Class, typename T, typename... Args>
void register_service(const uint8_t type, T (Class::*callback)(Args ...) const) void register_service(const uint8_t type, T (Class::*callback)(Args ...) const)
{ {
this->callbacks[type] = [this, callback](Args... args) -> T this->callbacks_[type] = [this, callback](Args ... args) -> T
{ {
return (reinterpret_cast<Class*>(this)->*callback)(args...); return (reinterpret_cast<Class*>(this)->*callback)(args...);
}; };
@ -56,7 +56,7 @@ namespace demonware
template <typename Class, typename T, typename... Args> template <typename Class, typename T, typename... Args>
void register_service(const uint8_t type, T (Class::*callback)(Args ...)) void register_service(const uint8_t type, T (Class::*callback)(Args ...))
{ {
this->callbacks[type] = [this, callback](Args... args) -> T this->callbacks_[type] = [this, callback](Args ... args) -> T
{ {
return (reinterpret_cast<Class*>(this)->*callback)(args...); return (reinterpret_cast<Class*>(this)->*callback)(args...);
}; };

3
src/game/demonware/service_server.hpp
View File

@ -8,7 +8,8 @@ namespace demonware
public: public:
explicit service_server(std::string name); explicit service_server(std::string name);
template <typename T> void register_service() template <typename T>
void register_service()
{ {
static_assert(std::is_base_of<i_service, T>::value, "Service must inherit from IService"); static_assert(std::is_base_of<i_service, T>::value, "Service must inherit from IService");

3
src/game/demonware/services/bdSteamAuth.cpp
View File

@ -44,7 +44,8 @@ namespace demonware
const auto iv = utils::cryptography::tiger::compute(std::string(reinterpret_cast<char*>(&seed), 4)); const auto iv = utils::cryptography::tiger::compute(std::string(reinterpret_cast<char*>(&seed), 4));
const std::string enc_key(reinterpret_cast<char*>(&ticket[32]), 24); const std::string enc_key(reinterpret_cast<char*>(&ticket[32]), 24);
auto enc_ticket = utils::cryptography::des3::encrypt(std::string(reinterpret_cast<char*>(&auth_ticket), sizeof(auth_ticket)), iv,enc_key ); auto enc_ticket = utils::cryptography::des3::encrypt(
std::string(reinterpret_cast<char*>(&auth_ticket), sizeof(auth_ticket)), iv, enc_key);
bit_buffer response; bit_buffer response;
response.set_use_data_types(false); response.set_use_data_types(false);

11
src/game/demonware/stun_server.cpp
View File

@ -60,9 +60,14 @@ namespace demonware
switch (type) switch (type)
{ {
case 30: this->ip_discovery(s, to, tolen); break; case 30:
case 20: this->nat_discovery(s, to, tolen); break; this->ip_discovery(s, to, tolen);
default: break; break;
case 20:
this->nat_discovery(s, to, tolen);
break;
default:
break;
} }
return len; return len;