Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge pull request #166 from Nick007J/master

Browse Source 
fixed wanted
This commit is contained in:
aap 2019-07-26 16:41:25 +02:00 committed by GitHub
commit 21a3db72bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/Wanted.cpp
View File

@ -40,19 +40,19 @@ CWanted::Initialise()
bool bool
CWanted::AreSwatRequired() CWanted::AreSwatRequired()
{ {
return m_nWantedLevel >= 4; return m_nWantedLevel == 4 || m_bSwatRequired;
} }
bool bool
CWanted::AreFbiRequired() CWanted::AreFbiRequired()
{ {
return m_nWantedLevel >= 5; return m_nWantedLevel == 5 || m_bFbiRequired;
} }
bool bool
CWanted::AreArmyRequired() CWanted::AreArmyRequired()
{ {
return m_nWantedLevel >= 6; return m_nWantedLevel == 6 || m_bArmyRequired;
} }
int32 int32
@ -77,6 +77,8 @@ void
CWanted::SetWantedLevel(int32 level) CWanted::SetWantedLevel(int32 level)
{ {
ClearQdCrimes(); ClearQdCrimes();
if (level > MaximumWantedLevel)
level = MaximumWantedLevel;
switch (level) { switch (level) {
case 0: case 0:
m_nChaos = 0; m_nChaos = 0;
@ -100,8 +102,6 @@ CWanted::SetWantedLevel(int32 level)
m_nChaos = 3220; m_nChaos = 3220;
break; break;
default: default:
if (level > MaximumWantedLevel)
m_nChaos = MaximumWantedLevel;
break; break;
} }
UpdateWantedLevel(); UpdateWantedLevel();