From: terencehill Date: Mon, 7 Aug 2017 11:38:10 +0000 (+0200) Subject: Replace 2 simple functions with macros X-Git-Tag: xonotic-v0.8.5~2378^2~91 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c9913646c45b32b7d00c73d83a84110e8f2e55ad;p=xonotic%2Fxonotic-data.pk3dir.git Replace 2 simple functions with macros --- diff --git a/qcsrc/server/bot/default/waypoints.qc b/qcsrc/server/bot/default/waypoints.qc index 7c9711a38..657933989 100644 --- a/qcsrc/server/bot/default/waypoints.qc +++ b/qcsrc/server/bot/default/waypoints.qc @@ -864,9 +864,6 @@ void waypoint_load_or_remove_links_hardwired(bool removal_mode) LOG_TRACE("loaded ", ftos(c), " waypoint links from maps/", mapname, ".waypoints.hardwired"); } -void waypoint_load_links_hardwired() { waypoint_load_or_remove_links_hardwired(false); } -void waypoint_remove_links_hardwired() { waypoint_load_or_remove_links_hardwired(true); } - entity waypoint_get_link(entity w, float i) { switch(i) diff --git a/qcsrc/server/bot/default/waypoints.qh b/qcsrc/server/bot/default/waypoints.qh index e78ed55cc..6eab8a4d5 100644 --- a/qcsrc/server/bot/default/waypoints.qh +++ b/qcsrc/server/bot/default/waypoints.qh @@ -46,7 +46,6 @@ void waypoint_updatecost_foralllinks(); void waypoint_remove_fromeditor(entity pl); void waypoint_remove(entity wp); void waypoint_schedulerelinkall(); -void waypoint_load_links_hardwired(); void waypoint_save_links(); void waypoint_saveall(); @@ -58,6 +57,9 @@ void botframe_showwaypointlinks(); float waypoint_loadall(); bool waypoint_load_links(); +#define waypoint_load_links_hardwired() waypoint_load_or_remove_links_hardwired(false) +#define waypoint_remove_links_hardwired() waypoint_load_or_remove_links_hardwired(true) +void waypoint_load_or_remove_links_hardwired(bool removal_mode); void waypoint_spawn_fromeditor(entity pl); entity waypoint_spawn(vector m1, vector m2, float f);