From: terencehill Date: Thu, 2 Aug 2018 13:23:28 +0000 (+0200) Subject: Bot waypoints: add timestamps to waypoint and link files: if they don't match automat... X-Git-Tag: xonotic-v0.8.5~1935^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e2aede34646d8011679217e7f5081bce57d77304;p=xonotic%2Fxonotic-data.pk3dir.git Bot waypoints: add timestamps to waypoint and link files: if they don't match automatically update links. It will prevent use of previously autogenerated links on external waypoints installation --- diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc index 4c7cb350d..32bfde96e 100644 --- a/qcsrc/server/bot/default/waypoints.qc +++ b/qcsrc/server/bot/default/waypoints.qc @@ -718,6 +718,7 @@ bool waypoint_load_links() bool parse_comments = true; float ver = 0; + string links_time = string_null; while ((s = fgets(file))) { @@ -727,13 +728,18 @@ bool waypoint_load_links() { if(substring(s, 2, 17) == "WAYPOINT_VERSION ") ver = stof(substring(s, 19, -1)); + else if(substring(s, 2, 14) == "WAYPOINT_TIME ") + links_time = substring(s, 16, -1); continue; } else { - if(ver < WAYPOINT_VERSION) + if(ver < WAYPOINT_VERSION || links_time != waypoint_time) { - LOG_TRACE("waypoint links for this map are outdated."); + if (links_time != waypoint_time) + LOG_TRACE("waypoint links for this map are not made for these waypoints."); + else + LOG_TRACE("waypoint links for this map are outdated."); if (g_assault) { LOG_TRACE("Assault waypoint links need to be manually updated in the editor"); @@ -996,6 +1002,8 @@ void waypoint_save_links() } fputs(file, strcat("//", "WAYPOINT_VERSION ", ftos_decimals(WAYPOINT_VERSION, 2), "\n")); + if (waypoint_time != "") + fputs(file, strcat("//", "WAYPOINT_TIME ", waypoint_time, "\n")); int c = 0; IL_EACH(g_waypoints, true, @@ -1063,7 +1071,12 @@ void waypoint_saveall() // (they are read as a waypoint with origin '0 0 0' and flag 0 though) fputs(file, strcat("//", "WAYPOINT_VERSION ", ftos_decimals(WAYPOINT_VERSION, 2), "\n")); fputs(file, strcat("//", "WAYPOINT_SYMMETRY ", sym_str, "\n")); - fputs(file, strcat("//", "\n")); + + strcpy(waypoint_time, strftime(true, "%Y-%m-%d %H:%M:%S")); + fputs(file, strcat("//", "WAYPOINT_TIME ", waypoint_time, "\n")); + //fputs(file, strcat("//", "\n")); + //fputs(file, strcat("//", "\n")); + //fputs(file, strcat("//", "\n")); int c = 0; IL_EACH(g_waypoints, true, @@ -1135,6 +1148,8 @@ float waypoint_loadall() if (tokens > 2) { sym_param2 = stof(argv(2)); } if (tokens > 3) { sym_param3 = stof(argv(3)); } } + else if(substring(s, 2, 14) == "WAYPOINT_TIME ") + strcpy(waypoint_time, substring(s, 16, -1)); continue; } else diff --git a/qcsrc/server/bot/default/waypoints.qh b/qcsrc/server/bot/default/waypoints.qh index fa552d883..34372fe96 100644 --- a/qcsrc/server/bot/default/waypoints.qh +++ b/qcsrc/server/bot/default/waypoints.qh @@ -7,6 +7,7 @@ // increase by 1 when changes require to manually edit waypoints // max 2 decimal places, always specified const float WAYPOINT_VERSION = 1.01; +string waypoint_time; // fields you can query using prvm_global server to get some statistics about waypoint linking culling float relink_total, relink_walkculled, relink_pvsculled, relink_lengthculled;