]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into TimePath/guide
authorTimePath <andrew.hardaker1995@gmail.com>
Wed, 23 Dec 2015 03:17:21 +0000 (14:17 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Wed, 23 Dec 2015 03:32:34 +0000 (14:32 +1100)
# Conflicts:
# qcsrc/common/nades/all.qh
# qcsrc/menu/classes.inc

1  2 
qcsrc/common/mapinfo.qc
qcsrc/common/mutators/mutator/buffs/all.qh
qcsrc/common/mutators/mutator/nades/nades.inc
qcsrc/common/vehicles/vehicle.qh
qcsrc/menu/classes.inc
qcsrc/menu/progs.inc
qcsrc/menu/xonotic/guide/description.qc
qcsrc/menu/xonotic/guide/entries.qc
qcsrc/menu/xonotic/guide/pages.qh
qcsrc/menu/xonotic/guide/tab.qc
qcsrc/menu/xonotic/guide/topics.qc

Simple merge
index 0000000000000000000000000000000000000000,76ecff8be1bac913082922b65dc297de6d4ba10b..722c90b1a91636a4d5bc1d7274dacda41178c536
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,73 +1,74 @@@
+ #ifndef BUFFS_ALL_H
+ #define BUFFS_ALL_H
+ // Welcome to the stuff behind the scenes
+ // Below, you will find the list of buffs
+ // Add new buffs here!
+ // Note: Buffs also need spawnfuncs, which are set below
+ #include "../../../teams.qh"
+ #include "../../../util.qh"
++#include "../waypoints/all.qh"
+ REGISTER_WAYPOINT(Buff, _("Buff"), '1 0.5 0', 1);
+ REGISTER_RADARICON(Buff, 1);
+ REGISTRY(Buffs, BITS(4))
+ #define Buffs_from(i) _Buffs_from(i, BUFF_Null)
+ REGISTER_REGISTRY(Buffs)
+ REGISTRY_CHECK(Buffs)
+ #define REGISTER_BUFF(id) \
+     REGISTER(Buffs, BUFF_##id, m_id, NEW(Buff)); \
+     REGISTER_INIT_POST(BUFF_##id) { \
+         this.netname = this.m_name; \
+         this.m_itemid = BIT(this.m_id - 1); \
+         this.m_sprite = strzone(strcat("buff-", this.m_name)); \
+     } \
+     REGISTER_INIT(BUFF_##id)
+ #include "../../../items/item/pickup.qh"
+ CLASS(Buff, Pickup)
+       /** bit index */
+       ATTRIB(Buff, m_itemid, int, 0)
+       ATTRIB(Buff, m_name, string, "buff")
+       ATTRIB(Buff, m_color, vector, '1 1 1')
+       ATTRIB(Buff, m_prettyName, string, "Buff")
+       ATTRIB(Buff, m_skin, int, 0)
+       ATTRIB(Buff, m_sprite, string, "")
+       METHOD(Buff, display, void(entity this, void(string name, string icon) returns)) {
+               returns(this.m_prettyName, sprintf("/gfx/hud/%s/buff_%s", cvar_string("menu_skin"), this.m_name));
+       }
+ #ifdef SVQC
+       METHOD(Buff, m_time, float(Buff this))
+       { return cvar(strcat("g_buffs_", this.netname, "_time")); }
+ #endif
+ ENDCLASS(Buff)
+ #ifdef SVQC
+       // .int buffs = _STAT(BUFFS);
+       void buff_Init(entity ent);
+       void buff_Init_Compat(entity ent, entity replacement);
+       #define BUFF_SPAWNFUNC(e, b, t) spawnfunc(item_buff_##e) { \
+               self.buffs = b.m_itemid; \
+               self.team = t; \
+               buff_Init(self); \
+       }
+       #define BUFF_SPAWNFUNCS(e, b)                       \
+                       BUFF_SPAWNFUNC(e,           b,  0)          \
+                       BUFF_SPAWNFUNC(e##_team1,   b,  NUM_TEAM_1) \
+                       BUFF_SPAWNFUNC(e##_team2,   b,  NUM_TEAM_2) \
+                       BUFF_SPAWNFUNC(e##_team3,   b,  NUM_TEAM_3) \
+                       BUFF_SPAWNFUNC(e##_team4,   b,  NUM_TEAM_4)
+       #define BUFF_SPAWNFUNC_Q3TA_COMPAT(o, r) spawnfunc(item_##o) { buff_Init_Compat(self, r); }
+ #else
+       #define BUFF_SPAWNFUNC(e, b, t)
+       #define BUFF_SPAWNFUNCS(e, b)
+       #define BUFF_SPAWNFUNC_Q3TA_COMPAT(o, r)
+ #endif
+ REGISTER_BUFF(Null);
+ BUFF_SPAWNFUNCS(random, BUFF_Null)
+ #include "all.inc"
+ #endif
index 0000000000000000000000000000000000000000,d2f350c5f2bcaa3a9dcba264a541f84c305ff700..b144ad94f87e625f832f8f2967db9559ad6d72c2
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,62 +1,76 @@@
+ #ifndef MENUQC
+ #define NADE_PROJECTILE(i, projectile, trail) MACRO_BEGIN { \
+     this.m_projectile[i] = projectile; \
+     this.m_trail[i] = trail; \
+ } MACRO_END
+ #else
+ #define NADE_PROJECTILE(i, projectile, trail)
+ #endif
+ REGISTER_NADE(NORMAL) {
+     this.m_color = '1 1 1';
++#ifndef MENUQC
+     NADE_PROJECTILE(0, PROJECTILE_NADE, EFFECT_Null);
+     NADE_PROJECTILE(1, PROJECTILE_NADE_BURN, EFFECT_Null);
++#endif
+ }
+ REGISTER_NADE(NAPALM) {
+     this.m_color = '2 0.5 0';
+     this.m_name = _("Napalm grenade");
+     this.m_icon = "nade_napalm";
++#ifndef MENUQC
+     NADE_PROJECTILE(0, PROJECTILE_NADE_NAPALM, EFFECT_TR_ROCKET);
+     NADE_PROJECTILE(1, PROJECTILE_NADE_NAPALM_BURN, EFFECT_SPIDERBOT_ROCKET_TRAIL);
++#endif
+ }
+ REGISTER_NADE(ICE) {
+     this.m_color = '0 0.5 2';
+     this.m_name = _("Ice grenade");
+     this.m_icon = "nade_ice";
++#ifndef MENUQC
+     NADE_PROJECTILE(0, PROJECTILE_NADE_ICE, EFFECT_TR_NEXUIZPLASMA);
+     NADE_PROJECTILE(1, PROJECTILE_NADE_ICE_BURN, EFFECT_RACER_ROCKET_TRAIL);
++#endif
+ }
+ REGISTER_NADE(TRANSLOCATE) {
+     this.m_color = '1 0 1';
+     this.m_name = _("Translocate grenade");
+     this.m_icon = "nade_translocate";
++#ifndef MENUQC
+     NADE_PROJECTILE(0, PROJECTILE_NADE_TRANSLOCATE, EFFECT_TR_CRYLINKPLASMA);
+     NADE_PROJECTILE(1, PROJECTILE_NADE_TRANSLOCATE, EFFECT_TR_CRYLINKPLASMA);
++#endif
+ }
+ REGISTER_NADE(SPAWN) {
+     this.m_color = '1 0.9 0';
+     this.m_name = _("Spawn grenade");
+     this.m_icon = "nade_spawn";
++#ifndef MENUQC
+     NADE_PROJECTILE(0, PROJECTILE_NADE_SPAWN, EFFECT_NADE_TRAIL_YELLOW);
+     NADE_PROJECTILE(1, PROJECTILE_NADE_SPAWN, EFFECT_NADE_TRAIL_YELLOW);
++#endif
+ }
+ REGISTER_NADE(HEAL) {
+     this.m_color = '1 0 0';
+     this.m_name = _("Heal grenade");
+     this.m_icon = "nade_heal";
++#ifndef MENUQC
+     NADE_PROJECTILE(0, PROJECTILE_NADE_HEAL, EFFECT_NADE_TRAIL_RED);
+     NADE_PROJECTILE(1, PROJECTILE_NADE_HEAL_BURN, EFFECT_NADE_TRAIL_BURN_RED);
++#endif
+ }
+ REGISTER_NADE(MONSTER) {
+     this.m_color = '0.25 0.75 0';
+     this.m_name = _("Monster grenade");
+     this.m_icon = "nade_monster";
++#ifndef MENUQC
+     NADE_PROJECTILE(0, PROJECTILE_NADE_MONSTER, EFFECT_NADE_TRAIL_RED);
+     NADE_PROJECTILE(1, PROJECTILE_NADE_MONSTER_BURN, EFFECT_NADE_TRAIL_BURN_RED);
++#endif
+ }
Simple merge
index c5d60b170dc9a0509d25c82bb6e4dff621e6d0a6,3aa3e43057447ea63b43a8bb996d5881b36369f4..beb3b65688b4f5aea5c7db834e12d1d91043a476
  #include "xonotic/dialog_singleplayer_winner.qc"
  #include "xonotic/dialog_teamselect.qc"
  #include "xonotic/gametypelist.qc"
 +#include "xonotic/guide/description.qc"
 +#include "xonotic/guide/entries.qc"
 +#include "xonotic/guide/tab.qc"
 +#include "xonotic/guide/topics.qc"
+ #include "xonotic/hudskinlist.qc"
  #include "xonotic/image.qc"
  #include "xonotic/inputbox.qc"
  #include "xonotic/keybinder.qc"
Simple merge
index 5df9d2e18a6cca5d4840455f20478a4b6cb150f5,0000000000000000000000000000000000000000..02f304ec5d31e4fe963329db90ad6506e32bdf89
mode 100644,000000..100644
--- /dev/null
@@@ -1,52 -1,0 +1,52 @@@
-         super.resizeNotify(this, relOrigin, relSize, absOrigin, absSize);
 +#ifndef DIALOG_MEDIA_GUIDE_DESCRIPTION_H
 +#define DIALOG_MEDIA_GUIDE_DESCRIPTION_H
 +#include "../listbox.qc"
 +CLASS(XonoticGuideDescription, XonoticListBox)
 +      ATTRIB(XonoticGuideDescription, rowsPerItem, float, 1)
 +      ATTRIB(XonoticGuideDescription, selectionDoesntMatter, bool, true)
 +
 +    METHOD(XonoticGuideDescription, setDescription, void(entity, string));
 +    ATTRIB(XonoticGuideDescription, description, string, string_null)
 +
 +      METHOD(XonoticGuideDescription, resizeNotify, void(entity this, vector relOrigin, vector relSize, vector absOrigin, vector absSize)) {
++        SUPER(XonoticGuideDescription).resizeNotify(this, relOrigin, relSize, absOrigin, absSize);
 +
 +        this.realFontSize_y = this.fontSize / (absSize.y * this.itemHeight);
 +        this.realFontSize_x = this.fontSize / (absSize.x * (1 - this.controlWidth));
 +        this.realUpperMargin = 0.5 * (1 - this.realFontSize.y);
 +        this.setDescription(this, this.description);
 +    }
 +
 +    INIT(XonoticGuideDescription) {
 +        this.configureXonoticListBox(this);
 +    }
 +
 +    ATTRIB(XonoticGuideDescription, descriptionWrapped, string, string_null)
 +    void XonoticGuideDescription_setDescription(entity this, string desc)
 +    {
 +        string current = this.description;
 +        if (current && current != desc) strunzone(current);
 +        this.description = strzone(desc);
 +
 +        string currentWrapped = this.descriptionWrapped;
 +        if (currentWrapped) strunzone(currentWrapped);
 +        string wrapped = "";
 +        for (int i = 0, n = tokenizebyseparator(desc, "\n"); i < n; ++i) {
 +            string line = "";
 +            for (getWrappedLine_remaining = argv(i); getWrappedLine_remaining; ) {
 +                string s = getWrappedLine(1, this.realFontSize, draw_TextWidth_WithColors);
 +                line = sprintf("%s\n%s", line, s);
 +            }
 +            wrapped = strcat(wrapped, line);
 +        }
 +        this.descriptionWrapped = strzone(wrapped);
 +
 +        this.nItems = tokenizebyseparator(wrapped, "\n");
 +    }
 +
 +    METHOD(XonoticGuideDescription, drawListBoxItem, void(entity this, int i, vector absSize, bool isSelected, bool isFocused)) {
 +        tokenizebyseparator(this.descriptionWrapped, "\n");
 +        draw_Text(this.realUpperMargin * eY, argv(i), this.realFontSize, '1 1 1', 1, 0);
 +    }
 +ENDCLASS(XonoticGuideDescription)
 +#endif
index f94b56027fdbe38b049d5ea7e627609b49b011c0,0000000000000000000000000000000000000000..a65e31f08736b55a0ec6b209005395426268c892
mode 100644,000000..100644
--- /dev/null
@@@ -1,127 -1,0 +1,127 @@@
- float XonoticEntryList_keyDown(entity this, float scan, float ascii, float shift)
 +#ifndef DIALOG_MEDIA_GUIDE_ENTRIES_H
 +#define DIALOG_MEDIA_GUIDE_ENTRIES_H
 +#include "../datasource.qc"
 +#include "../listbox.qc"
 +CLASS(XonoticEntryList, XonoticListBox)
 +    ATTRIB(XonoticEntryList, alphaBG, float, 0)
 +    ATTRIB(XonoticEntryList, itemAbsSize, vector, '0 0 0')
 +    ATTRIB(XonoticEntryList, origin, vector, '0 0 0')
 +    ATTRIB(XonoticEntryList, realFontSize, vector, '0 0 0')
 +    ATTRIB(XonoticEntryList, realUpperMargin1, float, 0)
 +    ATTRIB(XonoticEntryList, realUpperMargin2, float, 0)
 +    ATTRIB(XonoticEntryList, rowsPerItem, float, 4)
 +    ATTRIB(XonoticEntryList, stringFilterBox, entity, NULL)
 +    ATTRIB(XonoticEntryList, stringFilter, string, string_null)
 +    ATTRIB(XonoticEntryList, typeToSearchString, string, string_null)
 +    ATTRIB(XonoticEntryList, typeToSearchTime, float, 0)
 +
 +    METHOD(XonoticEntryList, drawListBoxItem, void(entity, int, vector, bool, bool));
 +    METHOD(XonoticEntryList, keyDown, float(entity, float, float, float));
 +    METHOD(XonoticEntryList, refilter, void(entity));
 +    METHOD(XonoticEntryList, resizeNotify, void(entity, vector, vector, vector, vector));
 +    METHOD(XonoticEntryList, setSelected, void(entity, int));
 +
 +    ATTRIB(XonoticEntryList, source, DataSource, NULL)
 +
 +    CONSTRUCTOR(XonoticEntryList, DataSource _source) {
 +        CONSTRUCT(XonoticEntryList);
 +        this.source = _source;
 +        this.configureXonoticListBox(this);
 +        this.refilter(this);
 +    }
 +
 +ENDCLASS(XonoticEntryList)
 +#endif
 +
 +#ifdef IMPLEMENTATION
 +
 +string XonoticEntryList_cb_name, XonoticEntryList_cb_icon;
 +void XonoticEntryList_cb(string _name, string _icon) {
 +    XonoticEntryList_cb_name = _name;
 +    XonoticEntryList_cb_icon = _icon;
 +}
 +
 +void XonoticEntryList_drawListBoxItem(entity this, int i, vector absSize, bool isSelected, bool isFocused)
 +{
 +    if (!this.source) return;
 +    if (!this.source.getEntry(this.source, i, XonoticEntryList_cb)) return;
 +    string name = XonoticEntryList_cb_name;
 +    string icon = XonoticEntryList_cb_icon;
 +    if (isSelected) {
 +        draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
 +    } else if (isFocused) {
 +        this.focusedItemAlpha = getFadedAlpha(this.focusedItemAlpha, SKINALPHA_LISTBOX_FOCUSED, SKINFADEALPHA_LISTBOX_FOCUSED);
 +        draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_FOCUSED, this.focusedItemAlpha);
 +    }
 +    vector sz = draw_PictureSize(icon);
 +    if (!sz) sz = '1 1 0';
 +    float szr = sz.x / sz.y;
 +    if (strstrofs(icon, "map", 0) >= 0) szr = 4 / 3;
 +    float asr = this.itemAbsSize.x / this.itemAbsSize.y;
 +    sz.y = 1; sz.x = szr / asr;
 +    draw_Picture('0 0 0', icon, sz, '1 1 1', SKINALPHA_LISTBOX_SELECTED);
 +    string s = draw_TextShortenToWidth(strdecolorize(name), 1 - sz.x - 2 * this.realFontSize.x, 0, this.realFontSize);
 +    draw_Text(this.realUpperMargin1 * eY + (sz.x + 0.5 * this.realFontSize.x) * eX, s, this.realFontSize, '1 1 1', SKINALPHA_TEXT, 0);
 +}
 +
-         return super.keyDown(this, scan, ascii, shift);
++METHOD(XonoticEntryList, keyDown, float(entity this, float scan, float ascii, float shift))
 +{
 +    if (this.nItems <= 0) {
-     return super.keyDown(this, scan, ascii, shift);
++        return SUPER(XonoticEntryList).keyDown(this, scan, ascii, shift);
 +    } else if ((ascii >= 32 || scan == K_BACKSPACE) && this.source.indexOf) {
 +        string save;
 +        if (scan == K_BACKSPACE) {
 +            save = substring(this.typeToSearchString, 0, strlen(this.typeToSearchString) - 1);
 +        } else {
 +            string ch = chr(ascii);
 +            save = (time > this.typeToSearchTime) ? ch : strcat(this.typeToSearchString, ch);
 +        }
 +        if (this.typeToSearchString) strunzone(this.typeToSearchString);
 +        this.typeToSearchString = strzone(save);
 +        this.typeToSearchTime = time + 0.5;
 +        if (strlen(this.typeToSearchString)) {
 +            int idx = this.source.indexOf(this.source, this.typeToSearchString);
 +            if (idx >= 0) this.setSelected(this, idx);
 +        }
 +    } else if (shift & S_CTRL && scan == 'f') {
 +        this.parent.setFocus(this.parent, this.stringFilterBox);
 +    } else if (shift & S_CTRL && scan == 'u') {
 +        this.stringFilterBox.setText(this.stringFilterBox, "");
 +        if (this.stringFilter) strunzone(this.stringFilter);
 +        this.stringFilter = string_null;
 +        this.refilter(this);
 +    }
-     super.resizeNotify(this, relOrigin, relSize, absOrigin, absSize);
++    return SUPER(XonoticEntryList).keyDown(this, scan, ascii, shift);
 +}
 +
 +void XonoticEntryList_refilter(entity this)
 +{
 +    if (!this.source) {
 +        this.nItems = 0;
 +        return;
 +    }
 +    this.nItems = this.source.reload(this.source, this.stringFilter);
 +    for (int i = 0, n = this.nItems; i < n; ++i) {
 +        if (this.source.getEntry(this.source, i, XonoticEntryList_cb)) {
 +            draw_PreloadPicture(XonoticEntryList_cb_icon);
 +        }
 +    }
 +}
 +
 +void XonoticEntryList_resizeNotify(entity this, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 +{
 +    this.itemAbsSize = '0 0 0';
-     super.setSelected(this, i);
++    SUPER(XonoticEntryList).resizeNotify(this, relOrigin, relSize, absOrigin, absSize);
 +
 +    this.realFontSize_y = this.fontSize / (this.itemAbsSize_y = (absSize.y * this.itemHeight));
 +    this.realFontSize_x = this.fontSize / (this.itemAbsSize_x = (absSize.x * (1 - this.controlWidth)));
 +    this.realUpperMargin1 = 0.5 * (1 - 2.5 * this.realFontSize.y);
 +    this.realUpperMargin2 = this.realUpperMargin1 + 1.5 * this.realFontSize.y;
 +}
 +
 +void XonoticEntryList_setSelected(entity this, int i)
 +{
++    SUPER(XonoticEntryList).setSelected(this, i);
 +    this.onChange(this, this.onChangeEntity);
 +}
 +#endif
index 8654b2529f3214df3a246daa262e8c92e93d2fc5,0000000000000000000000000000000000000000..92731738b9ec71e9cb69565f971bfa890480fed8
mode 100644,000000..100644
--- /dev/null
@@@ -1,29 -1,0 +1,29 @@@
-     REGISTER(RegisterGuidePages, GUIDE_PAGE, GuidePages, id, m_id, NEW(GuidePage, title))
- REGISTER_REGISTRY(RegisterGuidePages)
 +#ifndef GUIDE_PAGES_H
 +#define GUIDE_PAGES_H
 +
 +CLASS(GuidePage, Object);
 +    ATTRIB(GuidePage, m_id, int, 0);
 +    ATTRIB(GuidePage, m_title, string, "");
 +    ATTRIB(GuidePage, m_description, string, "");
 +    METHOD(GuidePage, describe, string(GuidePage this)) {
 +        return this.m_description;
 +    }
 +    METHOD(GuidePage, display, void(GuidePage this, void(string name, string icon) returns)) {
 +        returns(this.m_title, "nopreview_map");
 +    }
 +    CONSTRUCTOR(GuidePage, string _title) {
 +        CONSTRUCT(GuidePage);
 +        this.m_title = _title;
 +    }
 +ENDCLASS(GuidePage)
 +
 +REGISTRY(GuidePages, 16)
 +#define REGISTER_GUIDE_PAGE(id, title) \
++    REGISTER(GuidePages, GUIDE_PAGE, id, m_id, NEW(GuidePage, title))
++REGISTER_REGISTRY(GuidePages)
 +
 +REGISTER_GUIDE_PAGE(0, _("Intro")) { this.m_description = _(
 +"Welcome to xonotic"
 +);}
 +
 +#endif
index 8d4b8867691e98f6b31fe83a738ce17ad5651492,0000000000000000000000000000000000000000..472132d9854208d53155dc6fab779c489910f74f
mode 100644,000000..100644
--- /dev/null
@@@ -1,230 -1,0 +1,230 @@@
-         entity e = arr[i]; \
 +#ifndef DIALOG_MEDIA_GUIDE_H
 +#define DIALOG_MEDIA_GUIDE_H
 +#include "../datasource.qc"
 +
 +#define TOPICS(X) \
 +    X(NEW(FreetextSource),  _("Guide"),     "gametype_tdm") \
 +    X(NEW(GametypeSource),  _("Gametypes"), "gametype_dm") \
 +    X(NEW(WeaponSource),    _("Weapons"),   "gametype_ka") \
 +    X(NEW(ItemSource),      _("Items"),     "gametype_kh") \
 +    X(NEW(BuffSource),      _("Buffs"),     "gametype_dom") \
 +    X(NEW(NadeSource),      _("Nades"),     "gametype_ft") \
 +    X(NEW(MonsterSource),   _("Monsters"),  "gametype_lms") \
 +    X(NEW(VehicleSource),   _("Vehicles"),  "gametype_rc") \
 +    X(NEW(TurretSource),    _("Turrets"),   "gametype_as") \
 +    X(NEW(MutatorSource),   _("Mutators"),  "gametype_nb") \
 +    X(NEW(MapSource),       _("Maps"),      "gametype_ctf") \
 +    if (cvar("developer")) X(NEW(DebugSource), _("Debug"), "gametype_ons") \
 +    /**/
 +CLASS(TopicSource, DataSource)
 +    METHOD(TopicSource, getEntry, entity(TopicSource this, int i, void(string, string) returns)) {
 +        int idx = 0;
 +        #define TOPIC(src, name, icon) if (idx++ == i) { if (returns) returns(name, icon); return DataSource_true; }
 +        TOPICS(TOPIC);
 +        #undef TOPIC
 +        if (returns) returns("undefined", "undefined");
 +        return DataSource_false;
 +    }
 +    METHOD(TopicSource, reload, int(TopicSource this, string filter)) {
 +        int n = 0;
 +        #define TOPIC(src, name, icon) n++;
 +        TOPICS(TOPIC);
 +        #undef TOPIC
 +        return n;
 +    }
 +ENDCLASS(TopicSource)
 +
 +CLASS(DebugSource, DataSource)
 +    .entity nextdebug;
 +    entity find_debug() {
 +        entity head = NULL, tail = NULL;
 +        for (entity it = NULL; (it = nextent(it)); ) {
 +            if (!it.instanceOfObject) continue;
 +            if (it.instanceOfItem) continue;
 +            if (it.instanceOfAnimHost) continue;
 +            if (it.instanceOfDataSource) continue;
 +            if (it.classname == "Object") continue;
 +            if (it.classname == "vtbl") continue;
 +            if (!tail) {
 +                tail = head = it;
 +            } else {
 +                tail.nextdebug = it;
 +                tail = it;
 +            }
 +        }
 +        return head;
 +    }
 +    string DebugSource_activeFilter = "";
 +    METHOD(DebugSource, getEntry, entity(DebugSource this, int i, void(string, string) returns)) {
 +        int idx = 0;
 +        entity e;
 +        for (e = find_debug(); e; e = e.nextdebug) {
 +            if (strstrofs(sprintf("entity %i", e), DebugSource_activeFilter, 0) < 0) continue;
 +            if (idx++ == i) break;
 +        }
 +        if (returns) e.display(e, returns);
 +        return e;
 +    }
 +    METHOD(DebugSource, reload, int(DebugSource this, string filter)) {
 +        DebugSource_activeFilter = filter;
 +        int idx = 0;
 +        entity e;
 +        for (e = find_debug(); e; e = e.nextdebug) {
 +            if (strstrofs(sprintf("entity %i", e), DebugSource_activeFilter, 0) < 0) continue;
 +            idx++;
 +        }
 +        return idx;
 +    }
 +ENDCLASS(DebugSource)
 +
 +#define REGISTRY_SOURCE(id, arr) \
 +CLASS(id, DataSource) \
 +    METHOD(id, getEntry, entity(id this, int i, void(string, string) returns)) { \
- #include "../../../common/buffs/all.qh"
++        entity e = _R_GET(_##arr, i); \
 +        if (returns) e.display(e, returns); \
 +        return e; \
 +    } \
 +    METHOD(id, reload, int(id this, string filter)) { return arr##_COUNT; } \
 +ENDCLASS(id)
 +
 +#include "pages.qh"
 +REGISTRY_SOURCE(FreetextSource, GuidePages)
 +
 +#include "../../../common/mapinfo.qh"
 +REGISTRY_SOURCE(GametypeSource, Gametypes)
 +
 +#include "../../../common/items/all.qh"
 +REGISTRY_SOURCE(ItemSource, Items)
 +
- #include "../../../common/nades/all.qh"
++#include "../../../common/mutators/mutator/buffs/all.qh"
 +REGISTRY_SOURCE(BuffSource, Buffs)
 +
- REGISTRY_SOURCE(MutatorSource, MUTATORS)
++#include "../../../common/mutators/mutator/nades/nades.qh"
 +REGISTRY_SOURCE(NadeSource, Nades)
 +
 +#include "../../../common/weapons/all.qh"
 +REGISTRY_SOURCE(WeaponSource, Weapons)
 +
 +#include "../../../common/monsters/all.qh"
 +REGISTRY_SOURCE(MonsterSource, Monsters)
 +
 +#include "../../../common/vehicles/all.qh"
 +REGISTRY_SOURCE(VehicleSource, Vehicles)
 +
 +#include "../../../common/turrets/all.qh"
 +REGISTRY_SOURCE(TurretSource, Turrets)
 +
 +#include "../../../common/mutators/base.qh"
++REGISTRY_SOURCE(MutatorSource, Mutators)
 +
 +CLASS(MapSource, DataSource)
 +    METHOD(MapSource, getEntry, entity(MapSource this, int i, void(string, string) returns)) {
 +        if (!MapInfo_Get_ByID(i)) return DataSource_false;
 +        string path = strcat("/maps/", MapInfo_Map_bspname);
 +        string img = draw_PictureSize(path) ? path : "nopreview_map";
 +        if (returns) returns(MapInfo_Map_titlestring, img);
 +        MapInfo_ClearTemps();
 +        return DataSource_true;
 +    }
 +    METHOD(MapSource, indexOf, int(MapSource this, string s)) {
 +        MapInfo_FindName(s);
 +        return MapInfo_FindName_firstResult;
 +    }
 +    METHOD(MapSource, reload, int(MapSource this, string s)) {
 +        MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, 0, 0);
 +        if (s) MapInfo_FilterString(s);
 +        return MapInfo_count;
 +    }
 +    METHOD(MapSource, destroy, void(MapSource this)) { MapInfo_Shutdown(); }
 +ENDCLASS(MapSource)
 +
 +#include "topics.qc"
 +#include "entries.qc"
 +#include "description.qc"
 +#include "../tab.qc"
 +CLASS(XonoticGuideTab, XonoticTab)
 +    ATTRIB(XonoticGuideTab, rows, float, 21)
 +    ATTRIB(XonoticGuideTab, columns, float, 6)
 +      ATTRIB(XonoticGuideTab, intendedWidth, float, 1)
 +    METHOD(XonoticGuideTab, fill, void(entity));
 +    METHOD(XonoticGuideTab, topicChangeNotify, void(entity, entity));
 +    METHOD(XonoticGuideTab, entryChangeNotify, void(entity, entity));
 +
 +    ATTRIB(XonoticGuideTab, topicList, entity, NEW(XonoticTopicList, NEW(TopicSource)))
 +    ATTRIB(XonoticGuideTab, entryList, entity, NEW(XonoticEntryList, NULL))
 +    ATTRIB(XonoticGuideTab, descriptionPane, entity, NEW(XonoticGuideDescription))
 +
 +    INIT(XonoticGuideTab) {
 +        this.configureDialog(this);
 +    }
 +ENDCLASS(XonoticGuideTab)
 +#endif
 +
 +#ifdef IMPLEMENTATION
 +
 +void XonoticGuideTab_fill(entity this)
 +{
 +    entity topics = this.topicList;
 +        topics.onChange = XonoticGuideTab_topicChangeNotify;
 +        topics.onChangeEntity = this;
 +    entity entries = this.entryList;
 +        entries.onChange = XonoticGuideTab_entryChangeNotify;
 +        entries.onChangeEntity = this;
 +    entity filter = entries.stringFilterBox = makeXonoticInputBox(false, string_null);
 +        filter.keyDown = MapList_StringFilterBox_keyDown;
 +        filter.onChange = MapList_StringFilterBox_Change;
 +        filter.onChangeEntity = entries;
 +    entries.controlledTextbox = filter;
 +    entity description = this.descriptionPane;
 +
 +    int
 +    col = 0, width = 1.5;
 +    this.gotoRC(this, 0, col);
 +        this.TD(this, 1, width, makeXonoticHeaderLabel(_("Topic")));
 +    this.TR(this);
 +        this.TD(this, this.rows - 1, width, topics);
 +
 +    col += width, width = 2;
 +    this.gotoRC(this, 0, col); this.setFirstColumn(this, this.currentColumn);
 +        this.TD(this, 1, width, makeXonoticHeaderLabel(_("Entry")));
 +    this.TR(this);
 +        this.TD(this, this.rows - 1 - 1, width, entries);
 +    this.gotoRC(this, this.rows - 1, col);
 +        this.TD(this, 1, 0.3, makeXonoticTextLabel(0, _("Filter:")));
 +        this.TD(this, 1, width - 0.3, filter);
 +
 +    col += width, width = 2.5;
 +    this.gotoRC(this, 0, col); this.setFirstColumn(this, this.currentColumn);
 +        this.TD(this, 1, width, makeXonoticHeaderLabel(_("Description")));
 +    this.TR(this);
 +        this.TD(this, this.rows - 1, width, description);
 +
 +    this.topicChangeNotify(topics, this);
 +}
 +
 +void XonoticGuideTab_topicChangeNotify(entity, entity this)
 +{
 +    entity topics = this.topicList;
 +    entity entries = this.entryList;
 +    int i = topics.selectedItem;
 +    int idx = 0;
 +    entity found = NULL;
 +    #define TOPIC(src, name, icon) if (idx++ == i) { static entity e; if (!e) e = src; found = e; break; }
 +    do { TOPICS(TOPIC); } while (0);
 +    #undef TOPIC
 +    entries.source = found;
 +    entries.refilter(entries);
 +    entries.setSelected(entries, 0);
 +}
 +
 +void XonoticGuideTab_entryChangeNotify(entity, entity this)
 +{
 +    entity desc = this.descriptionPane;
 +    entity entries = this.entryList;
 +    entity e = entries.source.getEntry(entries.source, entries.selectedItem, func_null);
 +    string s = e.describe(e);
 +    if (cvar("developer")) { s = sprintf("entity %i\n%s", e, s); }
 +    desc.setDescription(desc, s);
 +}
 +
 +#endif
index 68d7f96fa58207527d0b0db22cc45dedc20bce18,0000000000000000000000000000000000000000..f1b6408cbdb424f2106ae78276ca4d1a4cae8da9
mode 100644,000000..100644
--- /dev/null
@@@ -1,94 -1,0 +1,94 @@@
-     return super.keyDown(this, scan, ascii, shift);
 +#ifndef DIALOG_MEDIA_GUIDE_TOPICS_H
 +#define DIALOG_MEDIA_GUIDE_TOPICS_H
 +#include "../datasource.qc"
 +#include "../listbox.qc"
 +CLASS(XonoticTopicList, XonoticListBox)
 +    ATTRIB(XonoticTopicList, columnIconOrigin, float, 0)
 +    ATTRIB(XonoticTopicList, columnIconSize, float, 0)
 +    ATTRIB(XonoticTopicList, columnNameOrigin, float, 0)
 +    ATTRIB(XonoticTopicList, columnNameSize, float, 0)
 +    ATTRIB(XonoticTopicList, realFontSize, vector, '0 0 0')
 +    ATTRIB(XonoticTopicList, realUpperMargin, float, 0)
 +    ATTRIB(XonoticTopicList, rowsPerItem, float, 3)
 +
 +    METHOD(XonoticTopicList, clickListBoxItem, void(entity, float, vector));
 +    METHOD(XonoticTopicList, drawListBoxItem, void(entity, int, vector, bool, bool));
 +    METHOD(XonoticTopicList, keyDown, bool(entity, float, float, float));
 +    METHOD(XonoticTopicList, resizeNotify, void(entity, vector, vector, vector, vector));
 +    METHOD(XonoticTopicList, setSelected, void(entity, int));
 +
 +    ATTRIB(XonoticTopicList, source, DataSource, NULL)
 +
 +    CONSTRUCTOR(XonoticTopicList, DataSource _source) {
 +      CONSTRUCT(XonoticTopicList);
 +      this.source = _source;
 +      this.nItems = _source.reload(_source, "");
 +      this.configureXonoticListBox(this);
 +    }
 +ENDCLASS(XonoticTopicList)
 +#endif
 +
 +#ifdef IMPLEMENTATION
 +
 +void XonoticTopicList_clickListBoxItem(entity this, float i, vector where)
 +{
 +    m_play_click_sound(MENU_SOUND_SELECT);
 +}
 +
 +string XonoticTopicList_cb_name, XonoticTopicList_cb_icon;
 +void XonoticTopicList_cb(string _name, string _icon) {
 +    XonoticTopicList_cb_name = _name;
 +    XonoticTopicList_cb_icon = _icon;
 +}
 +
 +void XonoticTopicList_drawListBoxItem(entity this, int i, vector absSize, bool isSelected, bool isFocused)
 +{
 +    if (!this.source) return;
 +    if (!this.source.getEntry(this.source, i, XonoticTopicList_cb)) return;
 +    string icon = XonoticTopicList_cb_icon;
 +    string name = XonoticTopicList_cb_name;
 +    if (isSelected) {
 +        draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
 +    } else if (isFocused) {
 +        this.focusedItemAlpha = getFadedAlpha(this.focusedItemAlpha, SKINALPHA_LISTBOX_FOCUSED, SKINFADEALPHA_LISTBOX_FOCUSED);
 +        draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_FOCUSED, this.focusedItemAlpha);
 +    }
 +    draw_Picture(this.columnIconOrigin * eX, icon, this.columnIconSize * eX + eY, '1 1 1', SKINALPHA_LISTBOX_SELECTED);
 +    vector save_fontscale = draw_fontscale;
 +    float f = draw_CondensedFontFactor(name, false, this.realFontSize, 1);
 +    draw_fontscale.x *= f;
 +    vector fs = this.realFontSize;
 +    fs.x *= f;
 +    draw_Text(this.realUpperMargin * eY + this.columnNameOrigin * eX, name, fs, '1 1 1', SKINALPHA_TEXT, 0);
 +    draw_fontscale = save_fontscale;
 +}
 +
 +bool XonoticTopicList_keyDown(entity this, float scan, float ascii, float shift)
 +{
 +    if (scan == K_ENTER || scan == K_KP_ENTER) {
 +        m_play_click_sound(MENU_SOUND_EXECUTE);
 +        return true;
 +    }
-     super.resizeNotify(this, relOrigin, relSize, absOrigin, absSize);
++    return SUPER(XonoticEntryList).keyDown(this, scan, ascii, shift);
 +}
 +
 +void XonoticTopicList_resizeNotify(entity this, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 +{
 +    this.itemAbsSize = '0 0 0';
-     super.setSelected(this, i);
++    SUPER(XonoticEntryList).resizeNotify(this, relOrigin, relSize, absOrigin, absSize);
 +
 +    this.realFontSize_y = this.fontSize / (this.itemAbsSize_y = (absSize.y * this.itemHeight));
 +    this.realFontSize_x = this.fontSize / (this.itemAbsSize_x = (absSize.x * (1 - this.controlWidth)));
 +    this.realUpperMargin = 0.5 * (1 - this.realFontSize.y);
 +    this.columnIconOrigin = 0;
 +    this.columnIconSize = this.itemAbsSize.y / this.itemAbsSize.x;
 +    this.columnNameOrigin = this.columnIconOrigin + this.columnIconSize + (0.5 * this.realFontSize.x);
 +    this.columnNameSize = 1 - this.columnIconSize - (1.5 * this.realFontSize.x);
 +}
 +
 +void XonoticTopicList_setSelected(entity this, int i)
 +{
++    SUPER(XonoticEntryList).setSelected(this, i);
 +    this.onChange(this, this.onChangeEntity);
 +}
 +#endif