diff options
| author | Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> | 2022-04-25 17:01:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 17:01:32 +0200 |
| commit | b2f3001e1687332ea150c693d4e8cb6566ef5687 (patch) | |
| tree | 399253ec788d274b48d1e6808dc36169cf77fa7d | |
| parent | 367a40f9c6a9310ec7cc8784943e85b8ab72f02e (diff) | |
| parent | 90c123e6beabc833e8bbf0eae89653a522cc74bb (diff) | |
| download | NorthstarLauncher-b2f3001e1687332ea150c693d4e8cb6566ef5687.tar.gz NorthstarLauncher-b2f3001e1687332ea150c693d4e8cb6566ef5687.zip | |
Merge branch 'main' into NetCon
| -rw-r--r-- | NorthstarDedicatedTest/debugoverlay.cpp | 34 | ||||
| -rw-r--r-- | NorthstarDedicatedTest/masterserver.cpp | 2 | ||||
| -rw-r--r-- | NorthstarDedicatedTest/serverauthentication.cpp | 2 |
3 files changed, 27 insertions, 11 deletions
diff --git a/NorthstarDedicatedTest/debugoverlay.cpp b/NorthstarDedicatedTest/debugoverlay.cpp index 9620609f..e29da96b 100644 --- a/NorthstarDedicatedTest/debugoverlay.cpp +++ b/NorthstarDedicatedTest/debugoverlay.cpp @@ -36,16 +36,19 @@ struct OverlayBase_t } OverlayType_t m_Type; // What type of overlay is it? - int m_nCreationTick; // Duration -1 means go away after this frame # - int m_nServerCount; // Latch server count, too - float m_flEndTime; // When does this box go away + int m_nCreationTick; // Duration -1 means go away after this frame # + int m_nServerCount; // Latch server count, too + float m_flEndTime; // When does this box go away OverlayBase_t* m_pNextOverlay; __int64 m_pUnk; }; struct OverlayLine_t : public OverlayBase_t { - OverlayLine_t() { m_Type = OVERLAY_LINE; } + OverlayLine_t() + { + m_Type = OVERLAY_LINE; + } Vector3 origin; Vector3 dest; @@ -58,7 +61,10 @@ struct OverlayLine_t : public OverlayBase_t struct OverlayBox_t : public OverlayBase_t { - OverlayBox_t() { m_Type = OVERLAY_BOX; } + OverlayBox_t() + { + m_Type = OVERLAY_BOX; + } Vector3 origin; Vector3 mins; @@ -120,14 +126,24 @@ void __fastcall DrawOverlayHook(OverlayBase_t* pOverlay) if (pCurrBox->a > 0) { RenderBox( - pCurrBox->origin, pCurrBox->angles, pCurrBox->mins, pCurrBox->maxs, - Color(pCurrBox->r, pCurrBox->g, pCurrBox->b, pCurrBox->a), false, false); + pCurrBox->origin, + pCurrBox->angles, + pCurrBox->mins, + pCurrBox->maxs, + Color(pCurrBox->r, pCurrBox->g, pCurrBox->b, pCurrBox->a), + false, + false); } if (pCurrBox->a < 255) { RenderWireframeBox( - pCurrBox->origin, pCurrBox->angles, pCurrBox->mins, pCurrBox->maxs, Color(pCurrBox->r, pCurrBox->g, pCurrBox->b, 255), - false, false); + pCurrBox->origin, + pCurrBox->angles, + pCurrBox->mins, + pCurrBox->maxs, + Color(pCurrBox->r, pCurrBox->g, pCurrBox->b, 255), + false, + false); } } break; diff --git a/NorthstarDedicatedTest/masterserver.cpp b/NorthstarDedicatedTest/masterserver.cpp index c069268a..d351fc13 100644 --- a/NorthstarDedicatedTest/masterserver.cpp +++ b/NorthstarDedicatedTest/masterserver.cpp @@ -625,7 +625,7 @@ void MasterServerManager::AuthenticateWithOwnServer(char* uid, char* playerToken goto REQUEST_END_CLEANUP; } - AuthData newAuthData; + AuthData newAuthData {}; strncpy(newAuthData.uid, authInfoJson["id"].GetString(), sizeof(newAuthData.uid)); newAuthData.uid[sizeof(newAuthData.uid) - 1] = 0; diff --git a/NorthstarDedicatedTest/serverauthentication.cpp b/NorthstarDedicatedTest/serverauthentication.cpp index c9860e02..4af18612 100644 --- a/NorthstarDedicatedTest/serverauthentication.cpp +++ b/NorthstarDedicatedTest/serverauthentication.cpp @@ -127,7 +127,7 @@ void ServerAuthenticationManager::StartPlayerAuthServer() return; } - AuthData newAuthData; + AuthData newAuthData {}; strncpy(newAuthData.uid, request.get_param_value("id").c_str(), sizeof(newAuthData.uid)); newAuthData.uid[sizeof(newAuthData.uid) - 1] = 0; |