Skip to content

Commit

Permalink
Inverted registerDvars in G_InitGame
Browse files Browse the repository at this point in the history
  • Loading branch information
IceNinjaman committed Aug 29, 2018
1 parent 5b4a015 commit 59b656b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion src/asmsource/_g_main_mp.asm
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
;Edited: Inverted registerDvars in G_InitGame

;Imports of g_main_mp:
extern Cvar_RegisterBool
extern Cvar_RegisterString
Expand Down Expand Up @@ -685,7 +687,7 @@ G_InitGame:
jz G_InitGame_10
mov eax, [ebp+0x14]
test eax, eax
jz G_InitGame_10
jnz G_InitGame_10 ;Inverted registerDvars - Now it is like in BlackOps
G_InitGame_110:
mov dword [esp], _cstring_sv_cheats
call Cvar_VariableBooleanValue
Expand Down
4 changes: 2 additions & 2 deletions src/g_client_fields.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ void __cdecl ClientScr_SetScore(gclient_s *pSelf, client_fields_s *pField)
assert( (unsigned int)(pSelf - level.clients) < (unsigned int)level.maxclients);
score = Scr_GetInt(0);

score = std::max(score, -30000);
score = std::min(score, 30000);
score = std::max(score, -900000000);
score = std::min(score, 900000000);

pSelf->sess.score = score;
CalculateRanks();
Expand Down
2 changes: 1 addition & 1 deletion src/sv_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2105,7 +2105,7 @@ void SV_HeartBeatMessageLoop(msg_t* msg, qboolean authoritative, qboolean *needt
MSG_ReadString(&singlemsg, newchallenge, 65);
if(strcmp(challenge, newchallenge) == 0)
{
Com_Printf(CON_CHANNEL_SERVER, "sv_token is invalid! Abandoning master server registration\n");
Com_Printf(CON_CHANNEL_SERVER, "sv_authtoken is invalid! Abandoning master server registration\n");
svs.nextHeartbeatTime = com_uFrameTime + 3600000000; //Try again in 1 hour
}else{
Com_Printf(CON_CHANNEL_SERVER, "Bad challenge! Retrying...\n");
Expand Down

0 comments on commit 59b656b

Please sign in to comment.