Merge branch 'drjaska/run-genmod' into 'master'

updated _mod. files with qcsrc\tools\genmod.sh shell script

See merge request xonotic/xonotic-data.pk3dir!1006

diff --git a/qcsrc/common/_mod.inc b/qcsrc/common/_mod.inc
index 84d6789c71de598db6e228bab699f9dc02093d6a..4a45c1edb0123b87fa606dbf2d1d916a62df9717 100644 (file)
--- a/qcsrc/common/_mod.inc
+++ b/qcsrc/common/_mod.inc
@@ -7,7 +7,6 @@
 #include <common/mapinfo.qc>
 #include <common/net_notice.qc>
 #include <common/playerstats.qc>
-#include <common/resources.qc>
 #include <common/replicate.qc>
 #include <common/state.qc>
 #include <common/util.qc>

diff --git a/qcsrc/menu/xonotic/_mod.inc b/qcsrc/menu/xonotic/_mod.inc
index 103b2ea675f7c79e1dfca814f3f652ebbdb0b74e..2ee34aef81108f0da2e01c8bc1adc13150a9efb5 100644 (file)
--- a/qcsrc/menu/xonotic/_mod.inc
+++ b/qcsrc/menu/xonotic/_mod.inc
@@ -93,6 +93,7 @@
 #include <menu/xonotic/inputbox.qc>
 #include <menu/xonotic/keybinder.qc>
 #include <menu/xonotic/languagelist.qc>
+#include <menu/xonotic/leavematchbutton.qc>
 #include <menu/xonotic/listbox.qc>
 #include <menu/xonotic/mainwindow.qc>
 #include <menu/xonotic/maplist.qc>
@@ -101,7 +102,6 @@
 #include <menu/xonotic/playerlist.qc>
 #include <menu/xonotic/playermodel.qc>
 #include <menu/xonotic/playlist.qc>
-#include <menu/xonotic/leavematchbutton.qc>
 #include <menu/xonotic/radiobutton.qc>
 #include <menu/xonotic/rootdialog.qc>
 #include <menu/xonotic/screenshotimage.qc>

diff --git a/qcsrc/menu/xonotic/_mod.qh b/qcsrc/menu/xonotic/_mod.qh
index 2e0cf762bf7deee45b442ec4522b9b5cea268073..64475f6a18c4be17eb30c6c5cb563254a4a3c2ef 100644 (file)
--- a/qcsrc/menu/xonotic/_mod.qh
+++ b/qcsrc/menu/xonotic/_mod.qh
@@ -93,6 +93,7 @@
 #include <menu/xonotic/inputbox.qh>
 #include <menu/xonotic/keybinder.qh>
 #include <menu/xonotic/languagelist.qh>
+#include <menu/xonotic/leavematchbutton.qh>
 #include <menu/xonotic/listbox.qh>
 #include <menu/xonotic/mainwindow.qh>
 #include <menu/xonotic/maplist.qh>
@@ -101,7 +102,6 @@
 #include <menu/xonotic/playerlist.qh>
 #include <menu/xonotic/playermodel.qh>
 #include <menu/xonotic/playlist.qh>
-#include <menu/xonotic/leavematchbutton.qh>
 #include <menu/xonotic/radiobutton.qh>
 #include <menu/xonotic/rootdialog.qh>
 #include <menu/xonotic/screenshotimage.qh>