From d94d1a6775e084994e03fc7a5dac8f06e6e7f2f5 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 10 Oct 2013 19:14:28 +0200 Subject: [PATCH] sync dpdefs --- qcsrc/dpdefs/menudefs.qc | 8 ++++++-- qcsrc/menu/xonotic/serverlist.c | 5 ----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/qcsrc/dpdefs/menudefs.qc b/qcsrc/dpdefs/menudefs.qc index 52deeb12a..1f817cd20 100644 --- a/qcsrc/dpdefs/menudefs.qc +++ b/qcsrc/dpdefs/menudefs.qc @@ -18,6 +18,7 @@ void(float keynr, float ascii) m_keydown; void(float width, float height) m_draw; void(float mode) m_toggle; void() m_shutdown; +// optional: float(float) m_gethostcachecategory; ///////////////////////////////////////////////////////// // sys constants @@ -561,8 +562,11 @@ void resethostcachemasks(void) = #615; void sethostcachemaskstring(float mask, float fld, string str, float op) = #616; void sethostcachemasknumber(float mask, float fld, float num, float op) = #617; void resorthostcache(void) = #618; -void sethostcachesort(float fld, float descending) = #619; -void refreshhostcache(float do_reset) = #620; +float SLSF_DESCENDING = 1; +float SLSF_FAVORITES = 2; +float SLSF_CATEGORIES = 4; +void sethostcachesort(float fld, float slsf) = #619; +void refreshhostcache(...) = #620; // optional boolean argument "clear_list" float gethostcachenumber(float fld, float hostnr) = #621; float gethostcacheindexforkey(string key) = #622; void addwantedhostcachekey(string key) = #623; diff --git a/qcsrc/menu/xonotic/serverlist.c b/qcsrc/menu/xonotic/serverlist.c index cabaae539..181cd696d 100644 --- a/qcsrc/menu/xonotic/serverlist.c +++ b/qcsrc/menu/xonotic/serverlist.c @@ -89,11 +89,6 @@ var string autocvar_menu_slist_recommended = "76.124.107.5:26004"; SLIST_FIELDS #undef SLIST_FIELD -// sort flags -const float SLSF_DESCENDING = 1; -const float SLSF_FAVORITES = 2; -const float SLSF_CATEGORIES = 4; - const float REFRESHSERVERLIST_RESORT = 0; // sort the server list again to update for changes to e.g. favorite status, categories const float REFRESHSERVERLIST_REFILTER = 1; // ..., also update filter and sort criteria const float REFRESHSERVERLIST_ASK = 2; // ..., also suggest querying servers now -- 2.39.2