Fix compile, add todolist

diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c
index 6890f04c6d0b75b77e23316adb3a352a3cc4ee41..ab5ce21d2921f7da8a50a155c471c7cbe7afa2fe 100644 (file)
--- a/qcsrc/menu/classes.c
+++ b/qcsrc/menu/classes.c
@@ -82,6 +82,7 @@
 #include "xonotic/dialog_settings_game_hud.c"
 #include "xonotic/dialog_settings_game_hudconfirm.c"
 #include "xonotic/dialog_settings_game_model.c"
+#include "xonotic/dialog_settings_game_messages.c"
 #include "xonotic/dialog_settings_game_view.c"
 #include "xonotic/dialog_settings_game_weapons.c"
 #include "xonotic/weaponslist.c"
@@ -118,5 +119,4 @@
 #include "xonotic/dialog_hudpanel_physics.c"
 #include "xonotic/dialog_hudpanel_centerprint.c"
 #include "xonotic/slider_picmip.c"
-#include "xonotic/dialog_settings_game_notification.c"
 #include "xonotic/slider_particles.c"

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_messages.c b/qcsrc/menu/xonotic/dialog_settings_game_messages.c
index ecf68558021862370539ead2f5d861aef9620dba..840d00f4ba5579c816910e71fb0c69aae33a6cc9 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_messages.c
+++ b/qcsrc/menu/xonotic/dialog_settings_game_messages.c
@@ -29,6 +29,21 @@ void XonoticGameMessageSettingsTab_fill(entity me)
 {
        entity e;
 
+       // todo:
+       // notification_CHOICE_CTF_CAPTURE_* CTF capture record
+       // notification_CHOICE_CTF_PICKUP_* CTF pickup verbose info
+       // notification_FRAG* Frag message verbose info
+       // notification_show_location Show location of pickups in death messages
+       // notification_show_sprees Show spree information
+       // notification_INFO_ITEM_WEAPON* Show weapon notifications in console
+       // Enable con_notify
+       // notification_ANNCE_NUM_RESPAWN* Add respawning countdown slider
+       // notification_ANNCE_NUM_ROUNDSTART* Add roundstart countdown slider
+       // notification_ANNCE_NUM_KILL* Add kill countdown slider
+       // notification_ANNCE_NUM_GAMESTART* Add gamestart countdown slider
+       // notification_ANNCE_ACHIEVEMENT* achievements toggle
+       // notification_ANNCE_KILLSTREAK* killstreak toggles
+
        // General settings for the player
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("General Settings:")));

diff --git a/qcsrc/menu/xonotic/mainwindow.c b/qcsrc/menu/xonotic/mainwindow.c
index 92aa2b0c6bc6c2829e7edb09663df77865afea27..e1c9070366da95a5562dde852105de75164009a7 100644 (file)
--- a/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@ -17,7 +17,6 @@ CLASS(MainWindow) EXTENDS(ModalController)
        ATTRIB(MainWindow, mainNexposee, entity, NULL)
        ATTRIB(MainWindow, fadedAlpha, float, SKINALPHA_BEHIND)
        ATTRIB(MainWindow, dialogToShow, entity, NULL)
-       ATTRIB(MainWindow, notificationDialog, entity, NULL)
        ATTRIB(MainWindow, demostartconfirmDialog, entity, NULL)
        ATTRIB(MainWindow, demotimeconfirmDialog, entity, NULL)
 ENDCLASS(MainWindow)
@@ -179,10 +178,6 @@ void MainWindow_configureMainWindow(entity me)
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-       me.notificationDialog = i = spawnXonoticNotificationDialog();
-       i.configureDialog(i);
-       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-
 
        // mutator dialogs
        i = spawnXonoticSandboxToolsDialog();