From 53fbb87c69ba3b5dc113e3d3e2fea35c228c6b0c Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Mon, 23 Dec 2013 19:54:35 -0500 Subject: [PATCH] Fix compile, add todolist --- qcsrc/menu/classes.c | 2 +- .../menu/xonotic/dialog_settings_game_messages.c | 15 +++++++++++++++ qcsrc/menu/xonotic/mainwindow.c | 5 ----- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c index 6890f04c6..ab5ce21d2 100644 --- 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 ecf685580..840d00f4b 100644 --- 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 92aa2b0c6..e1c907036 100644 --- 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(); -- 2.39.2