nav: do not avoid anyone in narrow places

nav: increase recent-probe repeat time
bot: allow to camp with secondary weapon if enough friends alive
bot:  think runs now at minimum 50fps, instead of every frame on xash3d
bot: make multilingual system work on xash3d (except menus right now)
engine: mark xash3d engine as modern game version
engine: add xash3d-specific cvars that are not  registered on goldsrc
cfg: do not spam on logs if multilingual or chatter configs not loaded because of game version
This commit is contained in:
jeefo 2023-06-13 19:55:03 +03:00
commit 690d09a5d7
No known key found for this signature in database
GPG key ID: 927BCA0779BEA8ED
9 changed files with 39 additions and 22 deletions

View file

@ -33,7 +33,7 @@ void BotConfig::loadConfigs () {
}
void BotConfig::loadMainConfig (bool isFirstLoad) {
if (game.is (GameFlags::Legacy) && !game.is (GameFlags::Xash3D)) {
if (game.is (GameFlags::Legacy)) {
util.setNeedForWelcome (true);
}
setupMemoryFiles ();
@ -357,7 +357,7 @@ void BotConfig::loadChatterConfig () {
}
else {
cv_radio_mode.set (1);
logger.message ("Bots chatter communication disabled.");
game.print ("Bots chatter communication disabled.");
}
}
@ -464,13 +464,12 @@ void BotConfig::loadLanguageConfig () {
setupMemoryFiles ();
if (game.is (GameFlags::Legacy)) {
logger.message ("Bots multilingual system disabled.");
return; // dedicated server will use only english translation
return; // legacy versions will use only english translation
}
String line;
MemFile file;
// localizer inititalization
// localizer initialization
if (openConfig ("lang", "Specified language not found.", &file, true)) {
String temp;
Twin <String, String> lang;
@ -509,14 +508,14 @@ void BotConfig::loadLanguageConfig () {
void BotConfig::loadAvatarsConfig () {
setupMemoryFiles ();
if (game.is (GameFlags::Legacy)) {
if (game.is (GameFlags::Legacy) || game.is (GameFlags::Xash3D)) {
return;
}
String line;
MemFile file;
// avatars inititalization
// avatars initialization
if (openConfig ("avatars", "Avatars config file not found. Avatars will not be displayed.", &file)) {
m_avatars.clear ();
@ -580,7 +579,7 @@ void BotConfig::loadDifficultyConfig () {
diff->aimError.z = values[8].float_ ();
};
// avatars inititalization
// avatars initialization
if (openConfig ("difficulty", "Difficulty config file not found. Loading defaults.", &file)) {
while (file.getLine (line)) {
@ -633,7 +632,7 @@ void BotConfig::loadCustomConfig () {
m_custom["C4ModelName"] = "c4.mdl";
m_custom["AMXParachuteCvar"] = "sv_parachute";
// custom inititalization
// custom initialization
if (openConfig ("custom", "Custom config file not found. Loading defaults.", &file)) {
m_custom.clear ();
@ -664,7 +663,7 @@ void BotConfig::loadLogosConfig () {
String line;
MemFile file;
// logos inititalization
// logos initialization
if (openConfig ("logos", "Logos config file not found. Loading defaults.", &file)) {
m_logos.clear ();