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

Fixed GCC Strict aliasing warning.

Browse source
This commit is contained in:
jeefo 2018-10-30 19:19:56 +03:00
commit 39781ee17b
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
source/basecode.cpp
View file

@ -990,12 +990,14 @@ void Bot::pushRadioMessage (int message) {
if (yb_communication_type.integer () == 0 || m_numFriendsLeft == 0) { if (yb_communication_type.integer () == 0 || m_numFriendsLeft == 0) {
return; return;
} }
if (!(g_gameFlags & GAME_SUPPORT_BOT_VOICE) || g_chatterFactory[message].empty () || yb_communication_type.integer () != 2) { if (!(g_gameFlags & GAME_SUPPORT_BOT_VOICE) || g_chatterFactory[message].empty () || yb_communication_type.integer () != 2) {
m_forceRadio = true; // use radio instead voice m_forceRadio = true; // use radio instead voice
} }
else { else {
m_forceRadio = false; m_forceRadio = false;
} }
m_radioSelect = message; m_radioSelect = message;
pushMsgQueue (GAME_MSG_RADIO); pushMsgQueue (GAME_MSG_RADIO);
} }
@ -1346,7 +1348,13 @@ int Bot::pickBestWeapon (int *vec, int count, int moneySave) {
if (yb_best_weapon_picker_type.integer () == 1) { if (yb_best_weapon_picker_type.integer () == 1) {
auto pick = [] (const float factor) -> float { auto pick = [] (const float factor) -> float {
return (static_cast <int> (((unsigned int &) factor >> 23) & 0xff) - 127) * 0.3010299956639812f; union {
unsigned int u;
float f;
} cast;
cast.f = factor;
return (static_cast <int> ((cast.u >> 23) & 0xff) - 127) * 0.3010299956639812f;
}; };
float buyFactor = (m_moneyAmount - static_cast <float> (moneySave)) / (16000.0f - static_cast <float> (moneySave)) * 3.0f; float buyFactor = (m_moneyAmount - static_cast <float> (moneySave)) / (16000.0f - static_cast <float> (moneySave)) * 3.0f;