From: terencehill Date: Sun, 16 Feb 2020 16:35:00 +0000 (+0100) Subject: Parse one bot weapon priority list as soon as its relative cvar is changed rather... X-Git-Tag: xonotic-v0.8.5~1153 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=97177a79357838fa546b5ee0fada274f0a55e12d;p=xonotic%2Fxonotic-data.pk3dir.git Parse one bot weapon priority list as soon as its relative cvar is changed rather than parsing all priority lists every 5 seconds --- diff --git a/qcsrc/server/bot/default/bot.qc b/qcsrc/server/bot/default/bot.qc index d768149e7..f367adab3 100644 --- a/qcsrc/server/bot/default/bot.qc +++ b/qcsrc/server/bot/default/bot.qc @@ -323,6 +323,10 @@ void bot_setnameandstuff(entity this) void bot_custom_weapon_priority_setup() { + static string bot_priority_far_prev; + static string bot_priority_mid_prev; + static string bot_priority_close_prev; + static string bot_priority_distances_prev; float tokens, i, w; bot_custom_weapon = false; @@ -334,35 +338,41 @@ void bot_custom_weapon_priority_setup() ) return; - // Parse distances - tokens = tokenizebyseparator(autocvar_bot_ai_custom_weapon_priority_distances," "); + if (bot_priority_distances_prev != autocvar_bot_ai_custom_weapon_priority_distances) + { + strcpy(bot_priority_distances_prev, autocvar_bot_ai_custom_weapon_priority_distances); + tokens = tokenizebyseparator(autocvar_bot_ai_custom_weapon_priority_distances," "); - if (tokens!=2) - return; + if (tokens!=2) + return; - bot_distance_far = stof(argv(0)); - bot_distance_close = stof(argv(1)); + bot_distance_far = stof(argv(0)); + bot_distance_close = stof(argv(1)); - if(bot_distance_far < bot_distance_close){ - bot_distance_far = stof(argv(1)); - bot_distance_close = stof(argv(0)); + if(bot_distance_far < bot_distance_close){ + bot_distance_far = stof(argv(1)); + bot_distance_close = stof(argv(0)); + } } int c; #define PARSE_WEAPON_PRIORITIES(dist) MACRO_BEGIN \ - tokens = tokenizebyseparator(W_NumberWeaponOrder(autocvar_bot_ai_custom_weapon_priority_##dist)," "); \ - bot_weapons_##dist[0] = -1; \ - c = 0; \ - for(i = 0; i < tokens && c < Weapons_COUNT; ++i) { \ - w = stof(argv(i)); \ - if (w >= WEP_FIRST && w <= WEP_LAST) { \ - bot_weapons_##dist[c] = w; \ - ++c; \ + if (bot_priority_##dist##_prev != autocvar_bot_ai_custom_weapon_priority_##dist) { \ + strcpy(bot_priority_##dist##_prev, autocvar_bot_ai_custom_weapon_priority_##dist); \ + tokens = tokenizebyseparator(W_NumberWeaponOrder(autocvar_bot_ai_custom_weapon_priority_##dist)," "); \ + bot_weapons_##dist[0] = -1; \ + c = 0; \ + for(i = 0; i < tokens && c < Weapons_COUNT; ++i) { \ + w = stof(argv(i)); \ + if (w >= WEP_FIRST && w <= WEP_LAST) { \ + bot_weapons_##dist[c] = w; \ + ++c; \ + } \ } \ + if (c < Weapons_COUNT) \ + bot_weapons_##dist[c] = -1; \ } \ - if (c < Weapons_COUNT) \ - bot_weapons_##dist[c] = -1; \ MACRO_END PARSE_WEAPON_PRIORITIES(far); @@ -834,10 +844,6 @@ void bot_serverframe() if (autocvar_g_waypointeditor_auto) botframe_autowaypoints(); - if(time > bot_cvar_nextthink) - { - if(currentbots>0) - bot_custom_weapon_priority_setup(); - bot_cvar_nextthink = time + 5; - } + if (currentbots > 0) + bot_custom_weapon_priority_setup(); } diff --git a/qcsrc/server/bot/default/bot.qh b/qcsrc/server/bot/default/bot.qh index 98b2ae3df..2cc20e0d3 100644 --- a/qcsrc/server/bot/default/bot.qh +++ b/qcsrc/server/bot/default/bot.qh @@ -75,7 +75,6 @@ entity bot_strategytoken; float botframe_spawnedwaypoints; float botframe_nextthink; float botframe_nextdangertime; -float bot_cvar_nextthink; int _content_type; #define IN_LAVA(pos) (_content_type = pointcontents(pos), (_content_type == CONTENT_LAVA || _content_type == CONTENT_SLIME))