fix missing schema workarounds and use VALVE_PURE better

Author: mastercoms

src/game/client/tf/vgui/quest_item_panel.cpp

@@ -1270,6 +1270,10 @@ void CQuestItemPanel::OnThink()
 //-----------------------------------------------------------------------------
 void CQuestItemPanel::FireGameEvent( IGameEvent *event )
 {
+#ifndef VALVE_PURE
+	// FIXME(mastercoms): disable quests
+	return;
+#endif
 	tmZone( TELEMETRY_LEVEL0, TMZF_NONE, "%s", __FUNCTION__ );
 	if( FStrEq( event->GetName(), "quest_objective_completed" ) )
 	{

src/game/client/tf/vgui/quest_log_panel.cpp

@@ -809,6 +809,10 @@ void CQuestLogPanel::OnCommand( const char *pCommand )
 //-----------------------------------------------------------------------------
 void CQuestLogPanel::FireGameEvent( IGameEvent *event )
 {
+#ifndef VALVE_PURE
+	// FIXME(mastercoms): disable quests
+	return;
+#endif
 	tmZone( TELEMETRY_LEVEL0, TMZF_NONE, "%s", __FUNCTION__ );
 	// Listen for inventory updates in case our item gets changed while the user
 	// is looking at us.  We want to re-do our entire layout since a quest might

src/game/shared/schemainitutils.h

@@ -13,7 +13,7 @@
 
 // used for initialization functions. Adds an error message if we're recording
 // them or returns false if we're not
-#ifdef DEBUG
+#if defined(DEBUG) || defined(VALVE_PURE)
 #define SCHEMA_INIT_CHECK( expr, ... )							\
 	if ( false == ( expr ) )											\
 	{																	\
@@ -25,12 +25,14 @@
 		}																\
 		else															\
 		{																\
+#ifndef VALVE_PURE														\
 			Warning( "%s\n", msg.String() );							\
 			/*
 				todo(maximsmol):
 				we do not support upstream item schema
 			*/															\
 			return false;												\
+#endif																	\
 			pVecErrors->AddToTail( msg );								\
 		}																\
 		return false;													\

src/game/shared/tf/tf_item_schema.cpp

@@ -2587,9 +2587,12 @@ bool CTFItemSchema::BInitQuestObjectiveConditions( KeyValues *pKVConditionsBlock
 	FOR_EACH_TRUE_SUBKEY( pKVConditionsBlock, pKVCondition )
 	{
 		CTFQuestObjectiveConditionsDefinition *pNewCondition = new CTFQuestObjectiveConditionsDefinition();
-		//SCHEMA_INIT_SUBSTEP( pNewCondition->BInitFromKV( pKVCondition, pVecErrors ) );
 
+#ifdef VALVE_PURE
+		SCHEMA_INIT_SUBSTEP( pNewCondition->BInitFromKV( pKVCondition, pVecErrors ) );
+#else
 		if (pNewCondition->BInitFromKV(pKVCondition, pVecErrors))
+#endif
 		{
 			m_mapQuestObjectiveConditions.Insert( pNewCondition->GetDefIndex(), pNewCondition );
 		}

src/game/shared/tf/tf_quest_restriction.cpp

@@ -474,7 +474,9 @@ class CTFQuestOperatorRestriction: public CTFQuestRestriction
 			CTFQuestRestriction *pNewRestriction = CreateRestrictionByName( pszType, this );
 			SCHEMA_INIT_CHECK( pNewRestriction != NULL, "%s", CFmtStr( "Failed to create quest restriction name '%s' for '%s'", pszType, GetConditionName() ).Get() );
 
+#ifndef VALVE_PURE
 			if (pNewRestriction != NULL)
+#endif
 			{
 				SCHEMA_INIT_CHECK( pNewRestriction->BInitFromKV( pSubKey, pVecErrors ), "Failed to init from KeyValues" );
 
@@ -2308,12 +2310,17 @@ class CTFQuestEventListener : public CTFQuestEvaluator, public CGameEventListene
 
 		FOR_EACH_TRUE_SUBKEY( pKVItem, pSubKey )
 		{
-			//SCHEMA_INIT_CHECK( !m_pRestrictions, "%s", CFmtStr( "Too many input for operator '%s'.", GetConditionName() ).Get() );
+#ifdef VALVE_PURE
+			SCHEMA_INIT_CHECK( !m_pRestrictions, "%s", CFmtStr( "Too many input for operator '%s'.", GetConditionName() ).Get() );
+#endif
 
 			const char *pszType = pSubKey->GetString( "type" );
 			m_pRestrictions = CreateRestrictionByName( pszType, this );
-			//SCHEMA_INIT_CHECK( m_pRestrictions != NULL, "%s", CFmtStr( "Failed to create quest restriction name '%s' for '%s'", pszType, GetConditionName() ).Get() );
+#ifdef VALVE_PURE
+			SCHEMA_INIT_CHECK( m_pRestrictions != NULL, "%s", CFmtStr( "Failed to create quest restriction name '%s' for '%s'", pszType, GetConditionName() ).Get() );
+#else
 			if (m_pRestrictions != NULL)
+#endif
 			{
 				SCHEMA_INIT_CHECK( m_pRestrictions->BInitFromKV( pSubKey, pVecErrors ), "Failed to init from KeyValues" );
 			}
@@ -2355,6 +2362,10 @@ class CTFQuestEventListener : public CTFQuestEvaluator, public CGameEventListene
 
 	virtual void FireGameEvent( IGameEvent *pEvent ) OVERRIDE
 	{
+#ifndef VALVE_PURE
+		// FIXME(mastercoms): disable quest restrictions
+		return;
+#endif
 		// This can happen when the player's SteamID isn't setup yet after a 
 		// disconnect -> reconnect
 		if ( GetQuestOwner() == NULL )
@@ -2521,9 +2532,11 @@ class CTFQuestCountEvaluator : public CTFQuestEvaluator
 		{
 			const char *pszType = pSubKey->GetString( "type" );
 			CTFQuestEvaluator *pNewCond = assert_cast< CTFQuestEvaluator* >( CreateEvaluatorByName( pszType, this ) );
-			//SCHEMA_INIT_CHECK( pNewCond && pNewCond->BInitFromKV( pSubKey, pVecErrors ), "Failed to init from KeyValues" );
-
+#ifdef VALVE_PURE
+			SCHEMA_INIT_CHECK( pNewCond && pNewCond->BInitFromKV( pSubKey, pVecErrors ), "Failed to init from KeyValues" );
+#else
 			if (pNewCond && pNewCond->BInitFromKV(pSubKey, pVecErrors))
+#endif
 			{
 				const char *pszAction = pSubKey->GetString( "action", NULL );
 				SCHEMA_INIT_CHECK( pszAction != NULL, "Missing action key" );