conf: get decal indices during config load
combat: do not init hitbox aiming if disabled nav: reverted some last changes nav: fixed check fall on ladders chat: added %g keyword that is replaced with graph author
This commit is contained in:
parent
7157cf1b2f
commit
ecb1f20303
12 changed files with 79 additions and 106 deletions
|
|
@ -235,12 +235,13 @@ void Bot::prepareChatMessage (StringRef message) {
|
|||
if (!(client.flags & ClientFlags::Used) || !(client.flags & ClientFlags::Alive) || client.ent == ent ()) {
|
||||
continue;
|
||||
}
|
||||
const auto playerIndex = game.indexOfPlayer (client.ent);
|
||||
|
||||
if (needsEnemy && m_team != client.team) {
|
||||
return humanizedName (game.indexOfPlayer (client.ent));
|
||||
return humanizedName (playerIndex);
|
||||
}
|
||||
else if (!needsEnemy && m_team == client.team) {
|
||||
return humanizedName (game.indexOfPlayer (client.ent));
|
||||
return humanizedName (playerIndex);
|
||||
}
|
||||
}
|
||||
return getHighfragPlayer ();
|
||||
|
|
@ -290,6 +291,9 @@ void Bot::prepareChatMessage (StringRef message) {
|
|||
case 'e':
|
||||
m_chatBuffer.replace ("%e", getPlayerAlive (true));
|
||||
break;
|
||||
|
||||
case 'g':
|
||||
m_chatBuffer.replace ("%g", graph.getAuthor ());
|
||||
};
|
||||
++replaceCounter;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue