Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

prepend git ver. to description sent to tracker #432

Merged
merged 2 commits into from
Feb 16, 2025
Merged

prepend git ver. to description sent to tracker #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f98fe2
prepend git ver. to description sent to tracker
tra Feb 16, 2025
b7ade29
also send kAvaraNetVersion to tracker
tra Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/game/CAvaraApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
#include "Debug.h"
#include "ModernOpenGLRenderer.h"
#include "LegacyOpenGLRenderer.h"
#include "GitVersion.h" // version.git
#include "CNetManager.h" // version.net

// included while we fake things out
#include "CPlayerManager.h"
Expand Down Expand Up @@ -506,7 +508,10 @@ void CAvaraAppImpl::TrackerUpdate() {
if(trackerState["players"].empty()) {
trackerState["players"].push_back(String(kPlayerNameTag));
}
trackerState["description"] = String(kServerDescription);
std::string gitv = std::string(GIT_VERSION);
trackerState["version"]["git"] = gitv;
trackerState["version"]["net"] = kAvaraNetVersion;
trackerState["description"] = gitv.substr(0, 6) + (gitv.length() > 8 ? "\\*: " : ": ") + String(kServerDescription);
trackerState["password"] = String(kServerPassword).length() > 0 ? true : false;

DBG_Log("tracker", "%s", trackerState.dump().c_str());
Expand Down
7 changes: 0 additions & 7 deletions src/game/CNetManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,6 @@
#define HIGHERLATENCYCOUNT (0.25 * AUTOLATENCYPERIOD / itsGame->frameTime) // 25% of frames
#define DECREASELATENCYPERIOD (itsGame->TimeToFrameCount(AUTOLATENCYPERIOD*2)) // 2 consecutive votes ≈ 7.7 sec


#if ROUTE_THRU_SERVER
#define kAvaraNetVersion 666
#else
#define kAvaraNetVersion 13
#endif

#define kMessageBufferMaxAge 90
#define kMessageBufferMinAge 30
#define kMessageWaitTime 12
Expand Down
3 changes: 3 additions & 0 deletions src/game/CNetManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@

#define kMaxLatencyTolerance 8

#define kAvaraNetVersion 13


enum { kNullNet, kServerNet, kClientNet };

// Server option bits
Expand Down