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

conf: get decal indices during config load

Browse source 
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:
jeefo 2025-02-05 21:28:29 +03:00
commit ecb1f20303
No known key found for this signature in database
GPG key ID: D696786B81B667C8
12 changed files with 79 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/config.cpp
View file

@ -735,19 +735,32 @@ void BotConfig::loadLogosConfig () {
String line {};
MemFile file {};
auto addLogoIndex = [&] (StringRef logo) {
const auto index = engfuncs.pfnDecalIndex (logo.chars ());
if (index > 0) {
m_logosIndices.push (index);
}
};
m_logosIndices.clear ();
// logos initialization
if (openConfig ("logos", "Logos config file not found. Loading defaults.", &file)) {
m_logos.clear ();
while (file.getLine (line)) {
if (isCommentLine (line)) {
continue;
}
m_logos.push (cr::move (line.trim ()));
addLogoIndex (line);
}
}
else {
m_logos = cr::move (String { "{biohaz;{graf003;{graf004;{graf005;{lambda06;{target;{hand1;{spit2;{bloodhand6;{foot_l;{foot_r" }.split (";"));
// use defaults
if (m_logosIndices.empty ()) {
auto defaults = String { "{biohaz;{graf003;{graf004;{graf005;{lambda06;{target;{hand1;{spit2;{bloodhand6;{foot_l;{foot_r" }.split (";");
for (const auto &logo : defaults) {
addLogoIndex (logo);
}
}
}