immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disallow firendly fire in ScoreboardKillRule

1008-fix
krzys-h 2018-05-08 23:57:13 +02:00
parent 0baf9f8077
commit a3def6d683
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/level/scoreboard.cpp
View File

@ -41,6 +41,7 @@ void CScoreboard::CScoreboardKillRule::Read(CLevelParserLine* line)
{ {
CScoreboardRule::Read(line); CScoreboardRule::Read(line);
CObjectCondition::Read(line); CObjectCondition::Read(line);
this->friendlyFire = line->GetParam("friendlyFire")->AsBool(false);
} }
void CScoreboard::CScoreboardObjectRule::Read(CLevelParserLine* line) void CScoreboard::CScoreboardObjectRule::Read(CLevelParserLine* line)
@ -82,6 +83,8 @@ void CScoreboard::ProcessKill(CObject* target, CObject* killer)
killer->GetTeam() != 0 && killer->GetTeam() != 0 &&
rule->CheckForObject(target)) rule->CheckForObject(target))
{ {
if (killer->GetTeam() == target->GetTeam() && !rule->friendlyFire)
continue;
AddPoints(killer->GetTeam(), rule->score); AddPoints(killer->GetTeam(), rule->score);
} }
} }

2
src/level/scoreboard.h
View File

@ -99,6 +99,8 @@ public:
class CScoreboardKillRule final : public CScoreboardRule, public CObjectCondition class CScoreboardKillRule final : public CScoreboardRule, public CObjectCondition
{ {
public: public:
bool friendlyFire = false;
//! Read from line in scene file //! Read from line in scene file
void Read(CLevelParserLine* line) override; void Read(CLevelParserLine* line) override;
}; };