MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-03-25 03:50:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added console group for the Response System

Browse Source
This commit is contained in:
Blixibon 2021-04-22 11:14:18 -05:00
parent 15d04c0b9b
commit c5ed394330
4 changed files with 66 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sp/src/responserules/runtime/criteriaset.cpp
View File

@ -9,6 +9,8 @@
#include "utlmap.h" #include "utlmap.h"
#include "tier1/mapbase_con_groups.h"
// memdbgon must be the last include file in a .cpp file!!! // memdbgon must be the last include file in a .cpp file!!!
#include <tier0/memdbgon.h> #include <tier0/memdbgon.h>
@ -34,7 +36,7 @@ const char *SplitContext( const char *raw, char *key, int keylen, char *value, i
char *colon1 = Q_strstr( raw, ":" ); char *colon1 = Q_strstr( raw, ":" );
if ( !colon1 ) if ( !colon1 )
{ {
DevMsg( "SplitContext: warning, ignoring context '%s', missing colon separator!\n", raw ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "SplitContext: warning, ignoring context '%s', missing colon separator!\n", raw );
*key = *value = 0; *key = *value = 0;
return NULL; return NULL;
} }
@ -61,7 +63,7 @@ const char *SplitContext( const char *raw, char *key, int keylen, char *value, i
char durationStartChar = *(colon2 + 1); char durationStartChar = *(colon2 + 1);
if ( durationStartChar < '0' || durationStartChar > '9' ) if ( durationStartChar < '0' || durationStartChar > '9' )
{ {
DevMsg( "SplitContext: warning, ignoring context '%s', missing comma separator! Entire context was '%s'.\n", raw, entireContext ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "SplitContext: warning, ignoring context '%s', missing comma separator! Entire context was '%s'.\n", raw, entireContext );
*key = *value = 0; *key = *value = 0;
return NULL; return NULL;
} }
@ -377,11 +379,11 @@ void CriteriaSet::Describe() const
const CritEntry_t *entry = m_TempMap.Element( i ); const CritEntry_t *entry = m_TempMap.Element( i );
if ( entry->weight != 1.0f ) if ( entry->weight != 1.0f )
{ {
DevMsg( " %20s = '%s' (weight %f)\n", name, entry->value ? entry->value : "", entry->weight ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, " %20s = '%s' (weight %f)\n", name, entry->value ? entry->value : "", entry->weight );
} }
else else
{ {
DevMsg( " %20s = '%s'\n", name, entry->value ? entry->value : "" ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, " %20s = '%s'\n", name, entry->value ? entry->value : "" );
} }
} }
@ -393,11 +395,11 @@ void CriteriaSet::Describe() const
const char *pCriteriaName = sm_CriteriaSymbols.String( entry->criterianame ); const char *pCriteriaName = sm_CriteriaSymbols.String( entry->criterianame );
if ( entry->weight != 1.0f ) if ( entry->weight != 1.0f )
{ {
DevMsg( " %20s = '%s' (weight %f)\n", pCriteriaName, entry->value ? entry->value : "", entry->weight ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, " %20s = '%s' (weight %f)\n", pCriteriaName, entry->value ? entry->value : "", entry->weight );
} }
else else
{ {
DevMsg( " %20s = '%s'\n", pCriteriaName, entry->value ? entry->value : "" ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, " %20s = '%s'\n", pCriteriaName, entry->value ? entry->value : "" );
} }
} }
*/ */

83
sp/src/responserules/runtime/response_system.cpp
View File

@ -12,6 +12,7 @@
#include "convar.h" #include "convar.h"
#include "fmtstr.h" #include "fmtstr.h"
#include "generichash.h" #include "generichash.h"
#include "tier1/mapbase_con_groups.h"
#ifdef MAPBASE #ifdef MAPBASE
#include "tier1/mapbase_matchers_base.h" #include "tier1/mapbase_matchers_base.h"
#endif #endif
@ -561,7 +562,7 @@ bool CResponseSystem::Compare( const char *setValue, Criteria *c, bool verbose /
if ( verbose ) if ( verbose )
{ {
DevMsg( "'%20s' vs. '%20s' = ", setValue, c->value ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "'%20s' vs. '%20s' = ", setValue, c->value );
{ {
//DevMsg( "\n" ); //DevMsg( "\n" );
@ -635,7 +636,7 @@ float CResponseSystem::ScoreCriteriaAgainstRuleCriteria( const CriteriaSet& set,
if ( verbose ) if ( verbose )
{ {
DevMsg( " criterion '%25s':'%15s' ", m_Criteria.GetElementName( icriterion ), CriteriaSet::SymbolToStr(c->nameSym) ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, " criterion '%25s':'%15s' ", m_Criteria.GetElementName( icriterion ), CriteriaSet::SymbolToStr(c->nameSym) );
} }
exclude = false; exclude = false;
@ -669,7 +670,7 @@ float CResponseSystem::ScoreCriteriaAgainstRuleCriteria( const CriteriaSet& set,
if ( verbose ) if ( verbose )
{ {
DevMsg( "matched, weight %4.2f (s %4.2f x c %4.2f)", CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "matched, weight %4.2f (s %4.2f x c %4.2f)",
score, w, c->weight.GetFloat() ); score, w, c->weight.GetFloat() );
} }
} }
@ -680,14 +681,14 @@ float CResponseSystem::ScoreCriteriaAgainstRuleCriteria( const CriteriaSet& set,
exclude = true; exclude = true;
if ( verbose ) if ( verbose )
{ {
DevMsg( "failed (+exclude rule)" ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "failed (+exclude rule)" );
} }
} }
else else
{ {
if ( verbose ) if ( verbose )
{ {
DevMsg( "failed" ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "failed" );
} }
} }
} }
@ -713,7 +714,7 @@ float CResponseSystem::ScoreCriteriaAgainstRule( const CriteriaSet& set, Respons
{ {
if ( bBeingWatched ) if ( bBeingWatched )
{ {
DevMsg("Rule is disabled.\n" ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "Rule is disabled.\n" );
} }
return 0.0f; return 0.0f;
} }
@ -725,7 +726,7 @@ float CResponseSystem::ScoreCriteriaAgainstRule( const CriteriaSet& set, Respons
if ( verbose ) if ( verbose )
{ {
DevMsg( "Scoring rule '%s' (%i)\n{\n", dict.GetElementName( irule ), irule+1 ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "Scoring rule '%s' (%i)\n{\n", dict.GetElementName( irule ), irule+1 );
} }
// Iterate set criteria // Iterate set criteria
@ -740,7 +741,7 @@ float CResponseSystem::ScoreCriteriaAgainstRule( const CriteriaSet& set, Respons
if ( verbose ) if ( verbose )
{ {
DevMsg( ", score %4.2f\n", score ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, ", score %4.2f\n", score );
} }
if ( exclude ) if ( exclude )
@ -752,7 +753,7 @@ float CResponseSystem::ScoreCriteriaAgainstRule( const CriteriaSet& set, Respons
if ( verbose ) if ( verbose )
{ {
DevMsg( "}\n" ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "}\n" );
} }
if ( rule->m_nForceWeight > 0 ) if ( rule->m_nForceWeight > 0 )
@ -784,7 +785,7 @@ void CResponseSystem::DebugPrint( int depth, const char *fmt, ... )
Q_vsnprintf (szText, sizeof( szText ), fmt, argptr); Q_vsnprintf (szText, sizeof( szText ), fmt, argptr);
va_end (argptr); va_end (argptr);
DevMsg( "%s%s", indent, szText ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "%s%s", indent, szText );
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -1292,7 +1293,7 @@ ResponseRulePartition::tIndex CResponseSystem::FindBestMatchingRule( const Crite
int idx = IEngineEmulator::Get()->GetRandomStream()->RandomInt( 0, bestCount - 1 ); int idx = IEngineEmulator::Get()->GetRandomStream()->RandomInt( 0, bestCount - 1 );
if ( verbose ) if ( verbose )
{ {
DevMsg( "Found %i matching rules, selecting slot %i\n", bestCount, idx ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "Found %i matching rules, selecting slot %i\n", bestCount, idx );
} }
return bestrules[ idx ] ; return bestrules[ idx ] ;
} }
@ -1474,7 +1475,7 @@ void CResponseSystem::MarkResponseAsUsed( short iGroup, short iWithinGroup )
{ {
group.MarkResponseUsed( iWithinGroup ); group.MarkResponseUsed( iWithinGroup );
Msg("Marked response %s (%i) used\n", group.group[iWithinGroup].value, iWithinGroup); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "Marked response %s (%i) used\n", group.group[iWithinGroup].value, iWithinGroup );
} }
} }
} }
@ -1526,7 +1527,7 @@ void CResponseSystem::ParseInclude()
CUtlBuffer buf; CUtlBuffer buf;
if ( !IEngineEmulator::Get()->GetFilesystem()->ReadFile( includefile, "GAME", buf ) ) if ( !IEngineEmulator::Get()->GetFilesystem()->ReadFile( includefile, "GAME", buf ) )
{ {
DevMsg( "Unable to load #included script %s\n", includefile ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "Unable to load #included script %s\n", includefile );
return; return;
} }
@ -1541,7 +1542,7 @@ void CResponseSystem::LoadFromBuffer( const char *scriptfile, const char *buffer
if( rr_dumpresponses.GetBool() ) if( rr_dumpresponses.GetBool() )
{ {
DevMsg("Reading: %s\n", scriptfile ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM,"Reading: %s\n", scriptfile );
} }
while ( 1 ) while ( 1 )
@ -1568,7 +1569,7 @@ void CResponseSystem::LoadFromBuffer( const char *scriptfile, const char *buffer
{ {
char cur[ 256 ]; char cur[ 256 ];
GetCurrentScript( cur, sizeof( cur ) ); GetCurrentScript( cur, sizeof( cur ) );
DevMsg( 1, "CResponseSystem: %s (%i rules, %i criteria, and %i responses)\n", CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "CResponseSystem: %s (%i rules, %i criteria, and %i responses)\n",
cur, m_RulePartitions.Count(), m_Criteria.Count(), m_Responses.Count() ); cur, m_RulePartitions.Count(), m_Criteria.Count(), m_Responses.Count() );
if( rr_dumpresponses.GetBool() ) if( rr_dumpresponses.GetBool() )
@ -1591,7 +1592,7 @@ void CResponseSystem::LoadRuleSet( const char *basescript )
unsigned char *buffer = (unsigned char *)IEngineEmulator::Get()->LoadFileForMe( basescript, &length ); unsigned char *buffer = (unsigned char *)IEngineEmulator::Get()->LoadFileForMe( basescript, &length );
if ( length <= 0 || !buffer ) if ( length <= 0 || !buffer )
{ {
DevMsg( 1, "CResponseSystem: failed to load %s\n", basescript ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "CResponseSystem: failed to load %s\n", basescript );
return; return;
} }
@ -2340,7 +2341,7 @@ void CResponseSystem::ParseRule( void )
} }
else else
{ {
DevMsg( "Discarded rule %s\n", ruleName ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "Discarded rule %s\n", ruleName );
delete newRule; delete newRule;
} }
} }
@ -2368,7 +2369,7 @@ void CResponseSystem::ResponseWarning( const char *fmt, ... )
char cur[ 256 ]; char cur[ 256 ];
GetCurrentScript( cur, sizeof( cur ) ); GetCurrentScript( cur, sizeof( cur ) );
DevMsg( 1, "%s(token %i) : %s", cur, GetCurrentToken(), string ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "%s(token %i) : %s", cur, GetCurrentToken(), string );
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -2546,7 +2547,7 @@ void CResponseSystem::DumpRules()
m_RulePartitions.IsValid(idx) ; m_RulePartitions.IsValid(idx) ;
idx = m_RulePartitions.Next(idx) ) idx = m_RulePartitions.Next(idx) )
{ {
Msg("%s\n", m_RulePartitions.GetElementName( idx ) ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "%s\n", m_RulePartitions.GetElementName( idx ) );
} }
} }
@ -2554,7 +2555,7 @@ void CResponseSystem::DumpRules()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void CResponseSystem::DumpDictionary( const char *pszName ) void CResponseSystem::DumpDictionary( const char *pszName )
{ {
Msg( "\nDictionary: %s\n", pszName ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "\nDictionary: %s\n", pszName );
// int nRuleCount = m_Rules.Count(); // int nRuleCount = m_Rules.Count();
// for ( int iRule = 0; iRule < nRuleCount; ++iRule ) // for ( int iRule = 0; iRule < nRuleCount; ++iRule )
@ -2562,7 +2563,7 @@ void CResponseSystem::DumpDictionary( const char *pszName )
m_RulePartitions.IsValid(idx) ; m_RulePartitions.IsValid(idx) ;
idx = m_RulePartitions.Next(idx) ) idx = m_RulePartitions.Next(idx) )
{ {
Msg(" Rule %d/%d: %s\n", m_RulePartitions.BucketFromIdx(idx), m_RulePartitions.PartFromIdx( idx ), m_RulePartitions.GetElementName( idx ) ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, " Rule %d/%d: %s\n", m_RulePartitions.BucketFromIdx( idx ), m_RulePartitions.PartFromIdx( idx ), m_RulePartitions.GetElementName( idx ) );
Rule *pRule = &m_RulePartitions[idx]; Rule *pRule = &m_RulePartitions[idx];
@ -2571,7 +2572,7 @@ void CResponseSystem::DumpDictionary( const char *pszName )
{ {
int iRuleCriteria = pRule->m_Criteria[iCriteria]; int iRuleCriteria = pRule->m_Criteria[iCriteria];
Criteria *pCriteria = &m_Criteria[iRuleCriteria]; Criteria *pCriteria = &m_Criteria[iRuleCriteria];
Msg( " Criteria %d: %s %s\n", iCriteria, CriteriaSet::SymbolToStr(pCriteria->nameSym), pCriteria->value ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, " Criteria %d: %s %s\n", iCriteria, CriteriaSet::SymbolToStr( pCriteria->nameSym ), pCriteria->value );
} }
int nResponseGroupCount = pRule->m_Responses.Count(); int nResponseGroupCount = pRule->m_Responses.Count();
@ -2580,13 +2581,13 @@ void CResponseSystem::DumpDictionary( const char *pszName )
int iRuleResponse = pRule->m_Responses[iResponseGroup]; int iRuleResponse = pRule->m_Responses[iResponseGroup];
ResponseGroup *pResponseGroup = &m_Responses[iRuleResponse]; ResponseGroup *pResponseGroup = &m_Responses[iRuleResponse];
Msg( " ResponseGroup %d: %s\n", iResponseGroup, m_Responses.GetElementName( iRuleResponse ) ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, " ResponseGroup %d: %s\n", iResponseGroup, m_Responses.GetElementName( iRuleResponse ) );
int nResponseCount = pResponseGroup->group.Count(); int nResponseCount = pResponseGroup->group.Count();
for ( int iResponse = 0; iResponse < nResponseCount; ++iResponse ) for ( int iResponse = 0; iResponse < nResponseCount; ++iResponse )
{ {
ParserResponse *pResponse = &pResponseGroup->group[iResponse]; ParserResponse *pResponse = &pResponseGroup->group[iResponse];
Msg( " Response %d: %s\n", iResponse, pResponse->value ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, " Response %d: %s\n", iResponse, pResponse->value );
} }
} }
} }
@ -2834,16 +2835,16 @@ static void CC_RR_Debug_ResponseConcept_Exclude( const CCommand &args )
case 1: case 1:
{ {
// print usage info // print usage info
Msg("Usage: rr_debugresponseconcept_exclude Concept1 Concept2 Concept3...\n"); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "Usage: rr_debugresponseconcept_exclude Concept1 Concept2 Concept3...\n");
Msg("\tseparate multiple concepts with spaces.\n"); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "\tseparate multiple concepts with spaces.\n");
Msg("\tcall with no arguments to see this message and a list of current excludes.\n"); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "\tcall with no arguments to see this message and a list of current excludes.\n");
Msg("\tto reset the exclude list, type \"rr_debugresponseconcept_exclude !\"\n"); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "\tto reset the exclude list, type \"rr_debugresponseconcept_exclude !\"\n");
// print current excludes // print current excludes
Msg("\nCurrent exclude list:\n"); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "\nCurrent exclude list:\n" );
if ( !CResponseSystem::m_DebugExcludeList.IsValidIndex( CResponseSystem::m_DebugExcludeList.Head() ) ) if ( !CResponseSystem::m_DebugExcludeList.IsValidIndex( CResponseSystem::m_DebugExcludeList.Head() ) )
{ {
Msg("\t<none>\n"); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "\t<none>\n" );
} }
else else
{ {
@ -2852,7 +2853,7 @@ static void CC_RR_Debug_ResponseConcept_Exclude( const CCommand &args )
CResponseSystem::m_DebugExcludeList.IsValidIndex(i) ; CResponseSystem::m_DebugExcludeList.IsValidIndex(i) ;
i = CResponseSystem::m_DebugExcludeList.Next(i) ) i = CResponseSystem::m_DebugExcludeList.Next(i) )
{ {
Msg( "\t%s\n", CResponseSystem::m_DebugExcludeList[i].GetStringConcept() ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "\t%s\n", CResponseSystem::m_DebugExcludeList[i].GetStringConcept() );
} }
} }
return; return;
@ -2862,7 +2863,7 @@ static void CC_RR_Debug_ResponseConcept_Exclude( const CCommand &args )
if ( args[1][0] == '!' ) if ( args[1][0] == '!' )
{ {
CResponseSystem::m_DebugExcludeList.Purge(); CResponseSystem::m_DebugExcludeList.Purge();
Msg( "Exclude list emptied.\n" ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "Exclude list emptied.\n" );
return; return;
} }
// else, FALL THROUGH: // else, FALL THROUGH:
@ -2872,7 +2873,7 @@ static void CC_RR_Debug_ResponseConcept_Exclude( const CCommand &args )
{ {
if ( !g_pRRConceptTable->Find(args[i]).IsValid() ) if ( !g_pRRConceptTable->Find(args[i]).IsValid() )
{ {
Msg( "\t'%s' is not a known concept (adding it anyway)\n", args[i] ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "\t'%s' is not a known concept (adding it anyway)\n", args[i] );
} }
CRR_Concept concept( args[i] ); CRR_Concept concept( args[i] );
CResponseSystem::m_DebugExcludeList.AddToTail( concept ); CResponseSystem::m_DebugExcludeList.AddToTail( concept );
@ -2906,16 +2907,16 @@ void ResponseRulePartition::PrintBucketInfo( CResponseSystem *pSys )
} }
nAverage /= N_RESPONSE_PARTITIONS; nAverage /= N_RESPONSE_PARTITIONS;
infos.Sort( bucktuple_t::SortCompare ); infos.Sort( bucktuple_t::SortCompare );
Msg( "%d buckets, %d total, %.2f average size\n", N_RESPONSE_PARTITIONS, Count(), nAverage ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "%d buckets, %d total, %.2f average size\n", N_RESPONSE_PARTITIONS, Count(), nAverage );
Msg( "8 shortest buckets:\n" ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "8 shortest buckets:\n" );
for ( int i = 0 ; i < 8 ; ++i ) for ( int i = 0 ; i < 8 ; ++i )
{ {
Msg("\t%d: %d\n", infos[i].nBucket, infos[i].nCount ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "\t%d: %d\n", infos[i].nBucket, infos[i].nCount );
} }
Msg( "8 longest buckets:\n" ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "8 longest buckets:\n" );
for ( int i = infos.Count() - 1 ; i >= infos.Count() - 9 ; --i ) for ( int i = infos.Count() - 1 ; i >= infos.Count() - 9 ; --i )
{ {
Msg("\t%d: %d\n", infos[i].nBucket, infos[i].nCount ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "\t%d: %d\n", infos[i].nBucket, infos[i].nCount );
} }
int nempty = 0; int nempty = 0;
for ( nempty = 0 ; nempty < infos.Count() ; ++nempty ) for ( nempty = 0 ; nempty < infos.Count() ; ++nempty )
@ -2923,15 +2924,15 @@ void ResponseRulePartition::PrintBucketInfo( CResponseSystem *pSys )
if ( infos[nempty].nCount != 0 ) if ( infos[nempty].nCount != 0 )
break; break;
} }
Msg( "%d empty buckets\n", nempty ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "%d empty buckets\n", nempty );
/* /*
Msg( " Contents of longest bucket\nwho\tconcept\n" ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, " Contents of longest bucket\nwho\tconcept\n" );
tRuleDict &bucket = m_RuleParts[infos[infos.Count()-1].nBucket]; tRuleDict &bucket = m_RuleParts[infos[infos.Count()-1].nBucket];
for ( tRuleDict::IndexType_t i = bucket.FirstInorder(); bucket.IsValidIndex(i); i = bucket.NextInorder(i) ) for ( tRuleDict::IndexType_t i = bucket.FirstInorder(); bucket.IsValidIndex(i); i = bucket.NextInorder(i) )
{ {
Rule &rule = bucket.Element(i) ; Rule &rule = bucket.Element(i) ;
Msg("%s\t%s\n", rule.GetValueForRuleCriterionByName( pSys, "who" ), rule.GetValueForRuleCriterionByName( pSys, CriteriaSet::ComputeCriteriaSymbol("concept") ) ); CGMsg( 0, CON_GROUP_RESPONSE_SYSTEM, "%s\t%s\n", rule.GetValueForRuleCriterionByName( pSys, "who" ), rule.GetValueForRuleCriterionByName( pSys, CriteriaSet::ComputeCriteriaSymbol("concept") ) );
} }
*/ */
} }

12
sp/src/responserules/runtime/response_types.cpp
View File

@ -7,6 +7,8 @@
#include "rrbase.h" #include "rrbase.h"
#include "tier1/mapbase_con_groups.h"
// memdbgon must be the last include file in a .cpp file!!! // memdbgon must be the last include file in a .cpp file!!!
#include "tier0/memdbgon.h" #include "tier0/memdbgon.h"
@ -48,7 +50,7 @@ void Matcher::Describe( void )
{ {
if ( !valid ) if ( !valid )
{ {
DevMsg( " invalid!\n" ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, " invalid!\n" );
return; return;
} }
char sz[ 128 ]; char sz[ 128 ];
@ -75,25 +77,25 @@ void Matcher::Describe( void )
if ( minmaxcount >= 1 ) if ( minmaxcount >= 1 )
{ {
DevMsg( " matcher: %s\n", sz ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, " matcher: %s\n", sz );
return; return;
} }
#ifdef MAPBASE #ifdef MAPBASE
if ( isbit ) if ( isbit )
{ {
DevMsg( " matcher: &%s%s\n", notequal ? "~" : "", GetToken() ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, " matcher: &%s%s\n", notequal ? "~" : "", GetToken() );
return; return;
} }
#endif #endif
if ( notequal ) if ( notequal )
{ {
DevMsg( " matcher: !=%s\n", GetToken() ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, " matcher: !=%s\n", GetToken() );
return; return;
} }
DevMsg( " matcher: ==%s\n", GetToken() ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, " matcher: ==%s\n", GetToken() );
} }
void Matcher::SetToken( char const *s ) void Matcher::SetToken( char const *s )

17
sp/src/responserules/runtime/rr_response.cpp
View File

@ -8,6 +8,7 @@
#include "rrbase.h" #include "rrbase.h"
#include <tier1/interval.h> #include <tier1/interval.h>
#include "tier1/mapbase_con_groups.h"
/* /*
#include "AI_Criteria.h" #include "AI_Criteria.h"
@ -151,32 +152,32 @@ void CRR_Response::Describe( const CriteriaSet *pDebugCriteria )
{ {
if ( pDebugCriteria ) if ( pDebugCriteria )
{ {
DevMsg( "Search criteria:\n" ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "Search criteria:\n" );
pDebugCriteria->Describe(); pDebugCriteria->Describe();
} }
if ( m_szMatchingRule[ 0 ] ) if ( m_szMatchingRule[ 0 ] )
{ {
DevMsg( "Matched rule '%s', ", m_szMatchingRule ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "Matched rule '%s', ", m_szMatchingRule );
} }
if ( m_szContext ) if ( m_szContext )
{ {
#ifdef MAPBASE #ifdef MAPBASE
DevMsg( "Contexts to set '%s' on ", m_szContext ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "Contexts to set '%s' on ", m_szContext );
if (m_iContextFlags & APPLYCONTEXT_WORLD) if (m_iContextFlags & APPLYCONTEXT_WORLD)
DevMsg( "world, " ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "world, " );
else if (m_iContextFlags & APPLYCONTEXT_SQUAD) else if (m_iContextFlags & APPLYCONTEXT_SQUAD)
DevMsg( "squad, " ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "squad, " );
else if (m_iContextFlags & APPLYCONTEXT_ENEMY) else if (m_iContextFlags & APPLYCONTEXT_ENEMY)
DevMsg( "enemy, " ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "enemy, " );
else else
DevMsg( "speaker, " ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "speaker, " );
#else #else
DevMsg( "Contexts to set '%s' on %s, ", m_szContext, m_bApplyContextToWorld ? "world" : "speaker" ); DevMsg( "Contexts to set '%s' on %s, ", m_szContext, m_bApplyContextToWorld ? "world" : "speaker" );
#endif #endif
} }
DevMsg( "response %s = '%s'\n", DescribeResponse( (ResponseType_t)m_Type ), m_szResponseName ); CGMsg( 1, CON_GROUP_RESPONSE_SYSTEM, "response %s = '%s'\n", DescribeResponse( (ResponseType_t)m_Type ), m_szResponseName );
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------