markmental/yapb-noob-edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #329 from yapb/issue-326

Browse source 
fix: wrong data type for flash level (flashbat message) (resolves #326)
This commit is contained in:
jeefo 2022-04-14 15:49:15 +03:00 • committed by GitHub
commit 98704303ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/botlib.cpp
View file

@ -2891,7 +2891,7 @@ void Bot::updateAimDir () {
void Bot::checkDarkness () {
// do not check for darkness at the start of the round
if (m_spawnTime + 5.0f > game.time () || !graph.exists (m_currentNodeIndex) || cr::fzero (m_path->light)) {
if (m_spawnTime + 5.0f > game.time () || !graph.exists (m_currentNodeIndex)) {
return;
}
@ -2900,19 +2900,20 @@ void Bot::checkDarkness () {
return;
}
auto skyColor = illum.getSkyColor ();
auto flashOn = (pev->effects & EF_DIMLIGHT);
if (mp_flashlight.bool_ () && !m_hasNVG) {
auto task = Task ();
if (!(pev->effects & EF_DIMLIGHT) && task != Task::Camp && task != Task::Attack && m_heardSoundTime + 3.0f < game.time () && m_flashLevel > 30.0f && ((skyColor > 50.0f && m_path->light < 10.0f) || (skyColor <= 50.0f && m_path->light < 40.0f))) {
if (!flashOn && task != Task::Camp && task != Task::Attack && m_heardSoundTime + 3.0f < game.time () && m_flashLevel > 30 && ((skyColor > 50.0f && m_path->light < 10.0f) || (skyColor <= 50.0f && m_path->light < 40.0f))) {
pev->impulse = 100;
}
else if ((pev->effects & EF_DIMLIGHT) && (((m_path->light > 15.0f && skyColor > 50.0f) || (m_path->light > 45.0f && skyColor <= 50.0f)) || task == Task::Camp || task == Task::Attack || m_flashLevel <= 0 || m_heardSoundTime + 3.0f >= game.time ())) {
else if (flashOn && (((m_path->light > 15.0f && skyColor > 50.0f) || (m_path->light > 45.0f && skyColor <= 50.0f)) || task == Task::Camp || task == Task::Attack || m_flashLevel <= 0 || m_heardSoundTime + 3.0f >= game.time ())) {
pev->impulse = 100;
}
}
else if (m_hasNVG) {
if (pev->effects & EF_DIMLIGHT) {
if (flashOn) {
pev->impulse = 100;
}
else if (!m_usesNVG && ((skyColor > 50.0f && m_path->light < 15.0f) || (skyColor <= 50.0f && m_path->light < 40.0f))) {

2
src/manager.cpp
View file

@ -1354,7 +1354,7 @@ void Bot::newRound () {
m_currentWeapon = 0;
m_weaponType = 0;
}
m_flashLevel = 100.0f;
m_flashLevel = 100;
m_checkDarkTime = game.time ();
m_knifeAttackTime = game.time () + rg.get (1.3f, 2.6f);

2
src/message.cpp
View file

@ -394,7 +394,7 @@ void MessageDispatcher::netMsgFlashBat () {
if (m_args.length () < min || !m_bot) {
return;
}
m_bot->m_flashLevel = m_args[value].float_;
m_bot->m_flashLevel = m_args[value].long_;
}
MessageDispatcher::MessageDispatcher () {