Updated the SDK with the latest code from the TF and HL2 branches.HEADmaster

1 files changed, 8 insertions, 2 deletions

diff --git a/mp/src/game/shared/multiplay_gamerules.h b/mp/src/game/shared/multiplay_gamerules.h
index 08e06e4a..b74dd34f 100644
--- a/mp/src/game/shared/multiplay_gamerules.h
+++ b/mp/src/game/shared/multiplay_gamerules.h
@@ -239,20 +239,26 @@ public:
 	virtual void GetNextLevelName( char *szNextMap, int bufsize, bool bRandom = false );
 
 	static void DetermineMapCycleFilename( char *pszResult, int nSizeResult, bool bForceSpew );
-	static void LoapMapCycleFileIntoVector ( const char *pszMapCycleFile, CUtlVector<char *> &mapList );
+	virtual void LoadMapCycleFileIntoVector ( const char *pszMapCycleFile, CUtlVector<char *> &mapList );
 	static void FreeMapCycleFileVector ( CUtlVector<char *> &mapList );
 
+	// LoadMapCycleFileIntoVector without the fixups inherited versions of gamerules may provide
+	static void RawLoadMapCycleFileIntoVector ( const char *pszMapCycleFile, CUtlVector<char *> &mapList );
+
 	bool IsMapInMapCycle( const char *pszName );
 
+	virtual bool IsManualMapChangeOkay( const char **pszReason ) OVERRIDE;
+
 protected:
 	virtual bool UseSuicidePenalty() { return true; }		// apply point penalty for suicide?
+ 	virtual float GetLastMajorEventTime( void ){ return -1.0f; }
 
 public:
 	virtual void ChangeLevel( void );
 
 protected:
 	virtual void GoToIntermission( void );
-	void LoadMapCycleFile( void );
+	virtual void LoadMapCycleFile( void );
 	void ChangeLevelToMap( const char *pszMap );
 
 	float m_flIntermissionEndTime;