Rename dialog_multiplayer_media_guide.* to dialog_singleplayer_guide.*

diff --git a/qcsrc/menu/xonotic/_mod.inc b/qcsrc/menu/xonotic/_mod.inc
index 7249d3de4d8653897977e7e9412f8fab4a6c46f4..9ed1c3db2a631e05ed14903ab08a8be6156b324b 100644 (file)
--- a/qcsrc/menu/xonotic/_mod.inc
+++ b/qcsrc/menu/xonotic/_mod.inc
@@ -56,7 +56,6 @@
 #include <menu/xonotic/dialog_multiplayer_media_demo.qc>
 #include <menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qc>
 #include <menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qc>
-#include <menu/xonotic/dialog_multiplayer_media_guide.qc>
 #include <menu/xonotic/dialog_multiplayer_media_musicplayer.qc>
 #include <menu/xonotic/dialog_multiplayer_media_screenshot.qc>
 #include <menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qc>
@@ -84,6 +83,7 @@
 #include <menu/xonotic/dialog_settings_user_languagewarning.qc>
 #include <menu/xonotic/dialog_settings_video.qc>
 #include <menu/xonotic/dialog_singleplayer.qc>
+#include <menu/xonotic/dialog_singleplayer_guide.qc>
 #include <menu/xonotic/dialog_singleplayer_winner.qc>
 #include <menu/xonotic/dialog_teamselect.qc>
 #include <menu/xonotic/dialog_termsofservice.qc>

diff --git a/qcsrc/menu/xonotic/_mod.qh b/qcsrc/menu/xonotic/_mod.qh
index b8d1e5ca5695c6731473928de3fe97c948294b8e..40a4632283c8190cbc7a515390a40f84d582a789 100644 (file)
--- a/qcsrc/menu/xonotic/_mod.qh
+++ b/qcsrc/menu/xonotic/_mod.qh
@@ -56,7 +56,6 @@
 #include <menu/xonotic/dialog_multiplayer_media_demo.qh>
 #include <menu/xonotic/dialog_multiplayer_media_demo_startconfirm.qh>
 #include <menu/xonotic/dialog_multiplayer_media_demo_timeconfirm.qh>
-#include <menu/xonotic/dialog_multiplayer_media_guide.qh>
 #include <menu/xonotic/dialog_multiplayer_media_musicplayer.qh>
 #include <menu/xonotic/dialog_multiplayer_media_screenshot.qh>
 #include <menu/xonotic/dialog_multiplayer_media_screenshot_viewer.qh>
@@ -84,6 +83,7 @@
 #include <menu/xonotic/dialog_settings_user_languagewarning.qh>
 #include <menu/xonotic/dialog_settings_video.qh>
 #include <menu/xonotic/dialog_singleplayer.qh>
+#include <menu/xonotic/dialog_singleplayer_guide.qh>
 #include <menu/xonotic/dialog_singleplayer_winner.qh>
 #include <menu/xonotic/dialog_teamselect.qh>
 #include <menu/xonotic/dialog_termsofservice.qh>

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_guide.qc b/qcsrc/menu/xonotic/dialog_multiplayer_media_guide.qc
deleted file mode 100644 (file)
index ebf2454..0000000
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_guide.qc
+++ /dev/null
@@ -1,75 +0,0 @@
-#include "dialog_multiplayer_media_guide.qh"
-
-#include "inputbox.qh"
-#include "textlabel.qh"
-#include <menu/xonotic/guide/entries.qh>
-
-void XonoticGuideDialog_fill(entity me)
-{
-       entity e;
-
-       int col = 0, width = 1.5;
-       me.gotoRC(me, 0, col);
-               me.TD(me, 1, width, makeXonoticHeaderLabel(_("Topic")));
-       me.TR(me);
-               me.TD(me, me.rows - 1, width, e = me.topicList);
-                       e.onChange = XonoticGuideDialog_topicChangeNotify;
-                       e.onChangeEntity = me;
-
-       col += width, width = 2;
-       me.gotoRC(me, 0, col); me.setFirstColumn(me, me.currentColumn);
-               me.TD(me, 1, width, makeXonoticHeaderLabel(_("Entry")));
-       me.TR(me);
-               me.TD(me, me.rows - 1 - 1, width, e = me.entryList);
-                       e.onChange = XonoticGuideDialog_entryChangeNotify;
-                       e.onChangeEntity = me;
-       me.gotoRC(me, me.rows - 1, col);
-               me.entryList.stringFilterBox = makeXonoticInputBox_T(false, string_null,
-                       _("Click here or Ctrl-F to provide a keyword to narrow down the map list. Ctrl-Delete to clear; Enter when done."));
-               me.TD(me, 1, 0.3, makeXonoticTextLabel(0, _("Filter:")));
-               me.TD(me, 1, width - 0.3, e = me.entryList.stringFilterBox);
-                       e.onChange = EntryList_StringFilterBox_Change;
-                       e.keyDown = EntryList_StringFilterBox_keyDown;
-                       e.onChangeEntity = me.entryList;
-
-       col += width, width = 2.5;
-       me.gotoRC(me, 0, col); me.setFirstColumn(me, me.currentColumn);
-               me.TD(me, 1, width, makeXonoticHeaderLabel(_("Description")));
-       me.TR(me);
-               me.TD(me, me.rows - 1, width, me.descriptionPane);
-
-       me.topicChangeNotify(me.topicList, me);
-}
-
-void XonoticGuideDialog_topicChangeNotify(entity, entity me)
-{
-       entity topics = me.topicList;
-       entity entries = me.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 XonoticGuideDialog_entryChangeNotify(entity, entity me)
-{
-       entity desc = me.descriptionPane;
-       entity entries = me.entryList;
-       entity e = entries.source.getEntry(entries.source, entries.selectedItem, func_null);
-       string s = e.describe(e);
-       if (gamestatus & GAME_DEVELOPER)
-               s = sprintf("entity %i\n\n%s", e, s);
-       desc.setDescription(desc, s);
-}

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_media_guide.qh b/qcsrc/menu/xonotic/dialog_multiplayer_media_guide.qh
deleted file mode 100644 (file)
index 311935c..0000000
--- a/qcsrc/menu/xonotic/dialog_multiplayer_media_guide.qh
+++ /dev/null
@@ -1,20 +0,0 @@
-#pragma once
-
-#include <menu/xonotic/guide/_mod.qh>
-
-#include "dialog.qh"
-CLASS(XonoticGuideDialog, XonoticDialog)
-       ATTRIB(XonoticGuideDialog, title, string, _("Guide"));
-       ATTRIB(XonoticGuideDialog, name, string, "guide");
-       ATTRIB(XonoticGuideDialog, color, vector, SKINCOLOR_DIALOG_GUIDE);
-       ATTRIB(XonoticGuideDialog, rows, float, 21);
-       ATTRIB(XonoticGuideDialog, columns, float, 6);
-       ATTRIB(XonoticGuideDialog, intendedWidth, float, 0.9);
-       METHOD(XonoticGuideDialog, fill, void(entity));
-       METHOD(XonoticGuideDialog, topicChangeNotify, void(entity, entity));
-       METHOD(XonoticGuideDialog, entryChangeNotify, void(entity, entity));
-
-       ATTRIB(XonoticGuideDialog, topicList, entity, NEW(XonoticTopicList, NEW(TopicSource)));
-       ATTRIB(XonoticGuideDialog, entryList, entity, NEW(XonoticEntryList, NULL));
-       ATTRIB(XonoticGuideDialog, descriptionPane, entity, NEW(XonoticGuideDescription));
-ENDCLASS(XonoticGuideDialog)

diff --git a/qcsrc/menu/xonotic/dialog_singleplayer_guide.qc b/qcsrc/menu/xonotic/dialog_singleplayer_guide.qc
new file mode 100644 (file)
index 0000000..7fcc095
--- /dev/null
+++ b/qcsrc/menu/xonotic/dialog_singleplayer_guide.qc
@@ -0,0 +1,75 @@
+#include "dialog_singleplayer_guide.qh"
+
+#include "inputbox.qh"
+#include "textlabel.qh"
+#include <menu/xonotic/guide/entries.qh>
+
+void XonoticGuideDialog_fill(entity me)
+{
+       entity e;
+
+       int col = 0, width = 1.5;
+       me.gotoRC(me, 0, col);
+               me.TD(me, 1, width, makeXonoticHeaderLabel(_("Topic")));
+       me.TR(me);
+               me.TD(me, me.rows - 1, width, e = me.topicList);
+                       e.onChange = XonoticGuideDialog_topicChangeNotify;
+                       e.onChangeEntity = me;
+
+       col += width, width = 2;
+       me.gotoRC(me, 0, col); me.setFirstColumn(me, me.currentColumn);
+               me.TD(me, 1, width, makeXonoticHeaderLabel(_("Entry")));
+       me.TR(me);
+               me.TD(me, me.rows - 1 - 1, width, e = me.entryList);
+                       e.onChange = XonoticGuideDialog_entryChangeNotify;
+                       e.onChangeEntity = me;
+       me.gotoRC(me, me.rows - 1, col);
+               me.entryList.stringFilterBox = makeXonoticInputBox_T(false, string_null,
+                       _("Click here or Ctrl-F to provide a keyword to narrow down the map list. Ctrl-Delete to clear; Enter when done."));
+               me.TD(me, 1, 0.3, makeXonoticTextLabel(0, _("Filter:")));
+               me.TD(me, 1, width - 0.3, e = me.entryList.stringFilterBox);
+                       e.onChange = EntryList_StringFilterBox_Change;
+                       e.keyDown = EntryList_StringFilterBox_keyDown;
+                       e.onChangeEntity = me.entryList;
+
+       col += width, width = 2.5;
+       me.gotoRC(me, 0, col); me.setFirstColumn(me, me.currentColumn);
+               me.TD(me, 1, width, makeXonoticHeaderLabel(_("Description")));
+       me.TR(me);
+               me.TD(me, me.rows - 1, width, me.descriptionPane);
+
+       me.topicChangeNotify(me.topicList, me);
+}
+
+void XonoticGuideDialog_topicChangeNotify(entity, entity me)
+{
+       entity topics = me.topicList;
+       entity entries = me.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 XonoticGuideDialog_entryChangeNotify(entity, entity me)
+{
+       entity desc = me.descriptionPane;
+       entity entries = me.entryList;
+       entity e = entries.source.getEntry(entries.source, entries.selectedItem, func_null);
+       string s = e.describe(e);
+       if (gamestatus & GAME_DEVELOPER)
+               s = sprintf("entity %i\n\n%s", e, s);
+       desc.setDescription(desc, s);
+}

diff --git a/qcsrc/menu/xonotic/dialog_singleplayer_guide.qh b/qcsrc/menu/xonotic/dialog_singleplayer_guide.qh
new file mode 100644 (file)
index 0000000..311935c
--- /dev/null
+++ b/qcsrc/menu/xonotic/dialog_singleplayer_guide.qh
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <menu/xonotic/guide/_mod.qh>
+
+#include "dialog.qh"
+CLASS(XonoticGuideDialog, XonoticDialog)
+       ATTRIB(XonoticGuideDialog, title, string, _("Guide"));
+       ATTRIB(XonoticGuideDialog, name, string, "guide");
+       ATTRIB(XonoticGuideDialog, color, vector, SKINCOLOR_DIALOG_GUIDE);
+       ATTRIB(XonoticGuideDialog, rows, float, 21);
+       ATTRIB(XonoticGuideDialog, columns, float, 6);
+       ATTRIB(XonoticGuideDialog, intendedWidth, float, 0.9);
+       METHOD(XonoticGuideDialog, fill, void(entity));
+       METHOD(XonoticGuideDialog, topicChangeNotify, void(entity, entity));
+       METHOD(XonoticGuideDialog, entryChangeNotify, void(entity, entity));
+
+       ATTRIB(XonoticGuideDialog, topicList, entity, NEW(XonoticTopicList, NEW(TopicSource)));
+       ATTRIB(XonoticGuideDialog, entryList, entity, NEW(XonoticEntryList, NULL));
+       ATTRIB(XonoticGuideDialog, descriptionPane, entity, NEW(XonoticGuideDescription));
+ENDCLASS(XonoticGuideDialog)

diff --git a/qcsrc/menu/xonotic/mainwindow.qc b/qcsrc/menu/xonotic/mainwindow.qc
index 7ebd9d3ebde6da151dfa1db1759e0c5e849b05ee..e94ae5a9d46732f3916ebdbe6d236378e6d06c4d 100644 (file)
--- a/qcsrc/menu/xonotic/mainwindow.qc
+++ b/qcsrc/menu/xonotic/mainwindow.qc
@@ -35,9 +35,9 @@
 #include "dialog_settings_misc_reset.qh"
 #include "dialog_settings_user_languagewarning.qh"
 #include "dialog_settings_game_hudconfirm.qh"
+#include "dialog_singleplayer_guide.qh"
 #include "dialog_singleplayer_winner.qh"
 #include "dialog_multiplayer_join_serverinfo.qh"
-#include "dialog_multiplayer_media_guide.qh"
 #include "dialog_multiplayer_media_demo_startconfirm.qh"
 #include "dialog_multiplayer_media_demo_timeconfirm.qh"
 #include "dialog_multiplayer_media_screenshot_viewer.qh"