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

some more cosmetics

Browse source
This commit is contained in:
Dmitriy 2015-07-24 15:10:51 +03:00
commit 174b3e1eb6
10 changed files with 334 additions and 324 deletions
Download patch file Download diff file Expand all files Collapse all files

28
source/netmsg.cpp
View file

@ -255,7 +255,7 @@ void NetworkMsg::Execute (void *p)
break;
case 2:
botMgr.SetDeathMsgState (true);
bots.SetDeathMsgState (true);
if (killerIndex != 0 && killerIndex != victimIndex)
{
@ -270,7 +270,7 @@ void NetworkMsg::Execute (void *p)
// need to send congrats on well placed shot
for (int i = 0; i < GetMaxClients (); i++)
{
Bot *bot = botMgr.GetBot (i);
Bot *bot = bots.GetBot (i);
if (bot != NULL && IsAlive (bot->GetEntity ()) && killer != bot->GetEntity () && bot->EntityIsVisible (victim->v.origin) && GetTeam (killer) == GetTeam (bot->GetEntity ()) && GetTeam (killer) != GetTeam (victim))
{
@ -287,7 +287,7 @@ void NetworkMsg::Execute (void *p)
// notice nearby to victim teammates, that attacker is near
for (int i = 0; i < GetMaxClients (); i++)
{
Bot *bot = botMgr.GetBot (i);
Bot *bot = bots.GetBot (i);
if (bot != NULL && IsAlive (bot->GetEntity ()) && GetTeam (bot->GetEntity ()) == GetTeam (victim) && IsVisible (killer->v.origin, bot->GetEntity ()) && IsEntityNull (bot->m_enemy) && GetTeam (killer) != GetTeam (victim))
{
@ -299,7 +299,7 @@ void NetworkMsg::Execute (void *p)
}
}
Bot *bot = botMgr.GetBot (killer);
Bot *bot = bots.GetBot (killer);
// is this message about a bot who killed somebody?
if (bot != NULL)
@ -307,7 +307,7 @@ void NetworkMsg::Execute (void *p)
else // did a human kill a bot on his team?
{
Bot *target = botMgr.GetBot (victim);
Bot *target = bots.GetBot (victim);
if (target != NULL)
{
@ -393,11 +393,11 @@ void NetworkMsg::Execute (void *p)
if (FStrEq (PTR_TO_STR (p), "#CTs_Win"))
{
botMgr.SetLastWinner (TEAM_CF); // update last winner for economics
bots.SetLastWinner (TEAM_CF); // update last winner for economics
if (yb_communication_type.GetInt () == 2)
{
Bot *bot = botMgr.FindOneValidAliveBot ();
Bot *bot = bots.FindOneValidAliveBot ();
if (bot != NULL && IsAlive (bot->GetEntity ()))
bot->HandleChatterMessage (PTR_TO_STR (p));
@ -406,23 +406,23 @@ void NetworkMsg::Execute (void *p)
if (FStrEq (PTR_TO_STR (p), "#Game_will_restart_in"))
{
botMgr.CheckTeamEconomics (TEAM_CF, true);
botMgr.CheckTeamEconomics (TEAM_TF, true);
bots.CheckTeamEconomics (TEAM_CF, true);
bots.CheckTeamEconomics (TEAM_TF, true);
}
if (FStrEq (PTR_TO_STR (p), "#Terrorists_Win"))
{
botMgr.SetLastWinner (TEAM_TF); // update last winner for economics
bots.SetLastWinner (TEAM_TF); // update last winner for economics
if (yb_communication_type.GetInt () == 2)
{
Bot *bot = botMgr.FindOneValidAliveBot ();
Bot *bot = bots.FindOneValidAliveBot ();
if (bot != NULL && IsAlive (bot->GetEntity ()))
bot->HandleChatterMessage (PTR_TO_STR (p));
}
}
waypoint.SetBombPosition (true);
waypoints.SetBombPosition (true);
}
else if (!g_bombPlanted && FStrEq (PTR_TO_STR (p), "#Bomb_Planted"))
{
@ -431,7 +431,7 @@ void NetworkMsg::Execute (void *p)
for (int i = 0; i < GetMaxClients (); i++)
{
Bot *bot = botMgr.GetBot (i);
Bot *bot = bots.GetBot (i);
if (bot != NULL && IsAlive (bot->GetEntity ()))
{
@ -442,7 +442,7 @@ void NetworkMsg::Execute (void *p)
bot->ChatterMessage (Chatter_WhereIsTheBomb);
}
}
waypoint.SetBombPosition ();
waypoints.SetBombPosition ();
}
else if (m_bot != NULL && FStrEq (PTR_TO_STR (p), "#Switch_To_BurstFire"))
m_bot->m_weaponBurstMode = BM_ON;