From 14fa24786604cc288243f2f93d5b736ba103b270 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Sun, 29 Jan 2017 13:55:50 +0200
Subject: [PATCH] Add mp_skipdefaults and mp_coop_strongcheckpoints

---
 dlls/coop.cpp                | 2 +-
 dlls/coop_util.h             | 3 +++
 dlls/game.cpp                | 5 +++++
 dlls/multiplay_gamerules.cpp | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dlls/coop.cpp b/dlls/coop.cpp
index 732e6435..8b9313e5 100644
--- a/dlls/coop.cpp
+++ b/dlls/coop.cpp
@@ -702,7 +702,7 @@ bool UTIL_CoopConfirmMenu(CBaseEntity *pTrigger, CBaseEntity *pActivator, int co
 	}
 	if( g_GlobalMenu.m_iConfirm < count2 )
 		return false;
-	//if( mp_coop_strongpolicy.value )
+	if( mp_coop_strongcheckpoints.value )
 	{
 		// do not allow go back if there are checkpoints, but not near changelevel
 		if( g_checkpoints[0].time && (g_checkpoints[0].origin - VecBModelOrigin(pTrigger->pev)).Length() > 150 )
diff --git a/dlls/coop_util.h b/dlls/coop_util.h
index 9650c433..494de7f4 100644
--- a/dlls/coop_util.h
+++ b/dlls/coop_util.h
@@ -18,6 +18,9 @@ extern cvar_t mp_coop_changelevel;
 extern cvar_t mp_coop_nofriendlyfire;
 extern cvar_t mp_coop_disabledmap;
 extern cvar_t mp_coop_checkpoints;
+extern cvar_t mp_skipdefaults;
+extern cvar_t mp_coop_strongcheckpoints;
+
 
 extern cvar_t mp_unduck;
 extern cvar_t mp_semclip;
diff --git a/dlls/game.cpp b/dlls/game.cpp
index 03ddf7f9..00890143 100644
--- a/dlls/game.cpp
+++ b/dlls/game.cpp
@@ -57,6 +57,8 @@ cvar_t mp_coop_disabledmap = { "mp_coop_disabledmap", "", FCVAR_SERVER };
 cvar_t mp_coop_reconnect_hack = { "mp_coop_reconnect_hack", "0", FCVAR_SERVER };
 cvar_t mp_coop_noangry = { "mp_coop_noangry", "0", FCVAR_SERVER };
 cvar_t mp_coop_checkpoints = { "mp_coop_checkpoints", "1", FCVAR_SERVER };
+cvar_t mp_skipdefaults = { "mp_skipdefaults", "0", FCVAR_SERVER };
+cvar_t mp_coop_strongcheckpoints = { "mp_coop_strongcheckpoints", "0", FCVAR_SERVER };
 
 cvar_t mp_unduck = { "mp_unduck", "0", FCVAR_SERVER };
 cvar_t mp_semclip = { "mp_semclip", "0", FCVAR_SERVER };
@@ -516,6 +518,9 @@ void GameDLLInit( void )
 	CVAR_REGISTER( &mp_coop_noangry );
 	CVAR_REGISTER( &mp_spectator );
 	CVAR_REGISTER( &mp_coop_checkpoints );
+	CVAR_REGISTER( &mp_skipdefaults );
+	CVAR_REGISTER( &mp_coop_strongcheckpoints );
+	
 
 	CVAR_REGISTER( &sentences_txt );
 	CVAR_REGISTER( &materials_txt );
diff --git a/dlls/multiplay_gamerules.cpp b/dlls/multiplay_gamerules.cpp
index 3f7dbbee..395f339f 100644
--- a/dlls/multiplay_gamerules.cpp
+++ b/dlls/multiplay_gamerules.cpp
@@ -665,7 +665,7 @@ void CHalfLifeMultiplay::PlayerSpawn( CBasePlayer *pPlayer )
 
 	pPlayer->pev->weapons |= ( 1 << WEAPON_SUIT );
 
-	addDefault = TRUE;
+	addDefault = !!mp_skipdefaults.value;
 
 	while( ( pWeaponEntity = UTIL_FindEntityByClassname( pWeaponEntity, "game_player_equip" ) ) )
 	{