Merge with develop
This commit is contained in:
parent
8bf9a665ce
commit
63b7d0f8fd
9 changed files with 31 additions and 30 deletions
|
@ -134,9 +134,9 @@ int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
Test::Suite ts;
|
Test::Suite ts;
|
||||||
|
|
||||||
ts.add(CUniquePtr<Test::Suite>(new CUTMisc));
|
ts.add(std::auto_ptr<Test::Suite>(new CUTMisc));
|
||||||
ts.add(CUniquePtr<Test::Suite>(new CUTNet));
|
ts.add(std::auto_ptr<Test::Suite>(new CUTNet));
|
||||||
ts.add(CUniquePtr<Test::Suite>(new CUTLigo));
|
ts.add(std::auto_ptr<Test::Suite>(new CUTLigo));
|
||||||
// Add a line here when adding a new test MODULE
|
// Add a line here when adding a new test MODULE
|
||||||
|
|
||||||
CUniquePtr<Test::Output> output(cmdline(argc, argv));
|
CUniquePtr<Test::Output> output(cmdline(argc, argv));
|
||||||
|
|
|
@ -26,7 +26,7 @@ struct CUTLigo : public Test::Suite
|
||||||
{
|
{
|
||||||
CUTLigo()
|
CUTLigo()
|
||||||
{
|
{
|
||||||
add(CUniquePtr<Test::Suite>(new CUTLigoPrimitive));
|
add(std::auto_ptr<Test::Suite>(new CUTLigoPrimitive));
|
||||||
// Add a line here when adding a new test CLASS
|
// Add a line here when adding a new test CLASS
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -37,20 +37,20 @@ struct CUTMisc : public Test::Suite
|
||||||
{
|
{
|
||||||
CUTMisc()
|
CUTMisc()
|
||||||
{
|
{
|
||||||
add(CUniquePtr<Test::Suite>(new CUTMiscCoTask));
|
add(std::auto_ptr<Test::Suite>(new CUTMiscCoTask));
|
||||||
add(CUniquePtr<Test::Suite>(new CUTMiscCommand));
|
add(std::auto_ptr<Test::Suite>(new CUTMiscCommand));
|
||||||
add(CUniquePtr<Test::Suite>(new CUTMiscCommon));
|
add(std::auto_ptr<Test::Suite>(new CUTMiscCommon));
|
||||||
add(CUniquePtr<Test::Suite>(new CUTMiscConfigFile));
|
add(std::auto_ptr<Test::Suite>(new CUTMiscConfigFile));
|
||||||
add(CUniquePtr<Test::Suite>(new CUTMiscDebug));
|
add(std::auto_ptr<Test::Suite>(new CUTMiscDebug));
|
||||||
add(CUniquePtr<Test::Suite>(new CUTMiscDynLibLoad));
|
add(std::auto_ptr<Test::Suite>(new CUTMiscDynLibLoad));
|
||||||
add(CUniquePtr<Test::Suite>(new CUTMiscFile));
|
add(std::auto_ptr<Test::Suite>(new CUTMiscFile));
|
||||||
add(CUniquePtr<Test::Suite>(new CUTMiscPackFile));
|
add(std::auto_ptr<Test::Suite>(new CUTMiscPackFile));
|
||||||
add(CUniquePtr<Test::Suite>(new CUTMiscSingleton));
|
add(std::auto_ptr<Test::Suite>(new CUTMiscSingleton));
|
||||||
add(CUniquePtr<Test::Suite>(new CUTMiscSString));
|
add(std::auto_ptr<Test::Suite>(new CUTMiscSString));
|
||||||
add(CUniquePtr<Test::Suite>(new CUTMiscStream));
|
add(std::auto_ptr<Test::Suite>(new CUTMiscStream));
|
||||||
add(CUniquePtr<Test::Suite>(new CUTMiscVariable));
|
add(std::auto_ptr<Test::Suite>(new CUTMiscVariable));
|
||||||
add(CUniquePtr<Test::Suite>(new CUTMiscTypes));
|
add(std::auto_ptr<Test::Suite>(new CUTMiscTypes));
|
||||||
add(CUniquePtr<Test::Suite>(new CUTMiscStringCommon));
|
add(std::auto_ptr<Test::Suite>(new CUTMiscStringCommon));
|
||||||
// Add a line here when adding a new test CLASS
|
// Add a line here when adding a new test CLASS
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -28,9 +28,9 @@ struct CUTNet : public Test::Suite
|
||||||
{
|
{
|
||||||
CUTNet()
|
CUTNet()
|
||||||
{
|
{
|
||||||
add(CUniquePtr<Test::Suite>(new CUTNetLayer3));
|
add(std::auto_ptr<Test::Suite>(new CUTNetLayer3));
|
||||||
add(CUniquePtr<Test::Suite>(new CUTNetMessage));
|
add(std::auto_ptr<Test::Suite>(new CUTNetMessage));
|
||||||
add(CUniquePtr<Test::Suite>(new CUTNetModule));
|
add(std::auto_ptr<Test::Suite>(new CUTNetModule));
|
||||||
// Add a line here when adding a new test CLASS
|
// Add a line here when adding a new test CLASS
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -84,7 +84,7 @@ uint ImpactSchemes [6][3] = { { 0, 1, 2 }, { 0, 2, 1 }, { 1, 0, 2 }, { 1, 2, 0 }
|
||||||
// Observed impact on E (/10): 6 3 1 1 3 10
|
// Observed impact on E (/10): 6 3 1 1 3 10
|
||||||
// Note: if modifying this schemes, please change FORAGE_SOURCE_IMPACT_MODE in phrase_en.txt.
|
// Note: if modifying this schemes, please change FORAGE_SOURCE_IMPACT_MODE in phrase_en.txt.
|
||||||
uint SpecialNewbieImpactSchemeD = 10;
|
uint SpecialNewbieImpactSchemeD = 10;
|
||||||
uint16 LowDangerMappings [2] = { SpecialNewbieImpactSchemeD+1, SpecialNewbieImpactSchemeD+4 };
|
uint16 LowDangerMappings [2] = { (uint16)SpecialNewbieImpactSchemeD+1, (uint16)SpecialNewbieImpactSchemeD+4 };
|
||||||
|
|
||||||
sint8 ExplosionResetPeriod = 50; // 5 s
|
sint8 ExplosionResetPeriod = 50; // 5 s
|
||||||
|
|
||||||
|
|
|
@ -61,11 +61,11 @@ extern CMissionLog MissionLog;
|
||||||
#define MISDBG if ( !VerboseMissions ){} else MISLOG
|
#define MISDBG if ( !VerboseMissions ){} else MISLOG
|
||||||
|
|
||||||
// Syntax error logged to egs_mission.log
|
// Syntax error logged to egs_mission.log
|
||||||
#define MISLOGSYNTAXERROR(_PHRASE_) MISLOG("sline:%u SYNTAX ERROR %s : "_PHRASE_, line, script[0].c_str());
|
#define MISLOGSYNTAXERROR(_PHRASE_) MISLOG("sline:%u SYNTAX ERROR %s : " _PHRASE_, line, script[0].c_str());
|
||||||
#define MISLOGSYNTAXERROR1(_PHRASE_,_PARAM_) MISLOG("sline:%u SYNTAX ERROR %s : "_PHRASE_, line, script[0].c_str(), _PARAM_);
|
#define MISLOGSYNTAXERROR1(_PHRASE_, _PARAM_) MISLOG("sline:%u SYNTAX ERROR %s : " _PHRASE_, line, script[0].c_str(), _PARAM_);
|
||||||
#define MISLOGERROR(_PHRASE_) MISLOG("sline:%u ERROR %s : "_PHRASE_, line, script[0].c_str());
|
#define MISLOGERROR(_PHRASE_) MISLOG("sline:%u ERROR %s : " _PHRASE_, line, script[0].c_str());
|
||||||
#define MISLOGERROR1(_PHRASE_,_PARAM_) MISLOG("sline:%u ERROR %s : "_PHRASE_, line, script[0].c_str(), _PARAM_);
|
#define MISLOGERROR1(_PHRASE_, _PARAM_) MISLOG("sline:%u ERROR %s : " _PHRASE_, line, script[0].c_str(), _PARAM_);
|
||||||
#define MISLOGERROR2(_PHRASE_,_PARAM1_,_PARAM2_) MISLOG("sline:%u ERROR %s : "_PHRASE_, line, script[0].c_str(), _PARAM1_, _PARAM2_);
|
#define MISLOGERROR2(_PHRASE_, _PARAM1_, _PARAM2_) MISLOG("sline:%u ERROR %s : " _PHRASE_, line, script[0].c_str(), _PARAM1_, _PARAM2_);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -80,6 +80,7 @@ void CAdminProperties::updateCSRJournal( CCharacter * user, CMission * mission,u
|
||||||
|
|
||||||
CMission* CAdminProperties::getMission(uint indexInJournal) const
|
CMission* CAdminProperties::getMission(uint indexInJournal) const
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
if (!_Data) return NULL;
|
if (!_Data) return NULL;
|
||||||
|
|
||||||
CCharacter *user = PlayerManager.getChar(_Data->MissionUser);
|
CCharacter *user = PlayerManager.getChar(_Data->MissionUser);
|
||||||
|
@ -90,7 +91,7 @@ CMission* CAdminProperties::getMission(uint indexInJournal) const
|
||||||
if (indexInJournal < user->getMissions().size())
|
if (indexInJournal < user->getMissions().size())
|
||||||
return (CMission*)user->getMissions()[indexInJournal];
|
return (CMission*)user->getMissions()[indexInJournal];
|
||||||
|
|
||||||
/*
|
|
||||||
indexInJournal -= MaxSoloMissionCount;
|
indexInJournal -= MaxSoloMissionCount;
|
||||||
CTeam * team = TeamManager.getTeam( user->getTeamId() );
|
CTeam * team = TeamManager.getTeam( user->getTeamId() );
|
||||||
if (team)
|
if (team)
|
||||||
|
|
|
@ -145,7 +145,7 @@ CQueryParser::TParserResult CQueryParser::parseQuery(const std::string &queryStr
|
||||||
return pr;
|
return pr;
|
||||||
}
|
}
|
||||||
|
|
||||||
CUniquePtr<TQueryNode> rootNode(parseExpr(first, queryStr.end()));
|
std::shared_ptr<TQueryNode> rootNode(parseExpr(first, queryStr.end()));
|
||||||
|
|
||||||
// make sure we have consumed all the stream
|
// make sure we have consumed all the stream
|
||||||
iterator rew = first;
|
iterator rew = first;
|
||||||
|
|
|
@ -1190,7 +1190,7 @@ public:
|
||||||
struct TParserResult
|
struct TParserResult
|
||||||
{
|
{
|
||||||
/// The query tree
|
/// The query tree
|
||||||
mutable CUniquePtr<TQueryNode> QueryTree;
|
mutable std::shared_ptr<TQueryNode> QueryTree;
|
||||||
|
|
||||||
/// Option to extract full context with selected logs
|
/// Option to extract full context with selected logs
|
||||||
bool FullContext;
|
bool FullContext;
|
||||||
|
|
Loading…
Reference in a new issue