Skip to content

Commit 9ff2a80

Browse files
committed
- Client now sets "client_id" as required by backend
- More RA tweaks
1 parent 1d64feb commit 9ff2a80

3 files changed

Lines changed: 12 additions & 3 deletions

File tree

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@
5050

5151
//#define GENERALS_ONLINE_HIGH_FPS_SERVER 1
5252

53+
#if defined(GENERALS_ONLINE_HIGH_FPS_SERVER)
54+
#define GENERALS_ONLINE_CLIENT_ID "gen_online_60hz"
55+
#else
56+
#define GENERALS_ONLINE_CLIENT_ID "gen_online_30hz"
57+
#endif
58+
5359

5460

5561
#if defined(GENERALS_ONLINE_HIGH_FPS_SERVER)

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_Auth.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ void NGMP_OnlineServices_AuthInterface::BeginLogin()
153153

154154
nlohmann::json j;
155155
j["token"] = strToken.c_str();
156+
j["client_id"] = GENERALS_ONLINE_CLIENT_ID;
156157
PrepareChallenge(j);
157158
std::string strPostData = j.dump();
158159

@@ -207,6 +208,7 @@ void NGMP_OnlineServices_AuthInterface::BeginLogin()
207208

208209
nlohmann::json j;
209210
j["token"] = strToken.c_str();
211+
j["client_id"] = GENERALS_ONLINE_CLIENT_ID;
210212
PrepareChallenge(j);
211213
std::string strPostData = j.dump();
212214

@@ -300,6 +302,7 @@ void NGMP_OnlineServices_AuthInterface::Tick()
300302

301303
nlohmann::json j;
302304
j["code"] = m_strCode.c_str();
305+
j["client_id"] = GENERALS_ONLINE_CLIENT_ID;
303306
PrepareChallenge(j);
304307
std::string strPostData = j.dump();
305308

GeneralsMD/Code/GameEngine/Source/GameNetwork/NetworkUtil.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929

3030
#if defined(GENERALS_ONLINE)
3131
#if defined(GENERALS_ONLINE_HIGH_FPS_SERVER)
32-
Int MAX_FRAMES_AHEAD = 128;
33-
Int MIN_RUNAHEAD = 5;
32+
Int MAX_FRAMES_AHEAD = 128 * 2;
33+
Int MIN_RUNAHEAD = 10;
3434
Int FRAME_DATA_LENGTH = (MAX_FRAMES_AHEAD + 1) * 2;
3535
Int FRAMES_TO_KEEP = (MAX_FRAMES_AHEAD / 2) + 1;
3636
#else
3737
Int MAX_FRAMES_AHEAD = 128;
38-
Int MIN_RUNAHEAD = 5;
38+
Int MIN_RUNAHEAD = 5;
3939
Int FRAME_DATA_LENGTH = (MAX_FRAMES_AHEAD + 1) * 2;
4040
Int FRAMES_TO_KEEP = (MAX_FRAMES_AHEAD / 2) + 1;
4141
#endif

0 commit comments

Comments
 (0)