More changes to the menu

diff --git a/data/gfx/menu/simplygoo/skinvalues.txt b/data/gfx/menu/simplygoo/skinvalues.txt
index 9f5879da1303da75f9c531b7713512e40bec94aa..96e5014993639d5d0aae1dfdbc55ccd8edeb9345 100644 (file)
--- a/data/gfx/menu/simplygoo/skinvalues.txt
+++ b/data/gfx/menu/simplygoo/skinvalues.txt
@@ -29,7 +29,7 @@ COLOR_DIALOG_USERBIND           '0.25 0.25 0.25'
 COLOR_DIALOG_SINGLEPLAYER       '0.25 0.25 0.25'\r
 COLOR_DIALOG_CREDITS            '0.25 0.25 0.25'\r
 COLOR_DIALOG_WEAPONS            '0.25 0.25 0.25'\r
-COLOR_DIALOG_RADAR              '0.25 0.25 0.25'\r
+COLOR_DIALOG_HUD              '0.25 0.25 0.25'\r
 COLOR_DIALOG_SERVERINFO         '0.25 0.25 0.25'\r
 COLOR_DIALOG_CVARS              '1 0 0'\r
 \r

diff --git a/data/qcsrc/menu/classes.c b/data/qcsrc/menu/classes.c
index 1973a202f3ade0692734cdbc66206a01f922a00a..4e46eba75aeb533096b3da1d809cef54b1ded4ca 100644 (file)
--- a/data/qcsrc/menu/classes.c
+++ b/data/qcsrc/menu/classes.c
@@ -73,7 +73,7 @@
 #include "voret/credits.c"\r
 #include "voret/dialog_multiplayer_playersetup_weapons.c"\r
 #include "voret/weaponslist.c"\r
-#include "voret/dialog_multiplayer_playersetup_radar.c"\r
+#include "voret/dialog_multiplayer_playersetup_hud.c"\r
 #include "voret/dialog_multiplayer_demo.c"\r
 #include "voret/demolist.c"\r
 #include "voret/colorpicker.c"\r

diff --git a/data/qcsrc/menu/skin-customizables.inc b/data/qcsrc/menu/skin-customizables.inc
index 2d318188911fb4e113b3731cd0132822eaee7d16..a17b7c06e140bb3cd936862a9caad4aa594751fb 100644 (file)
--- a/data/qcsrc/menu/skin-customizables.inc
+++ b/data/qcsrc/menu/skin-customizables.inc
@@ -62,7 +62,7 @@ SKINBEGIN
        SKINVECTOR(COLOR_DIALOG_SINGLEPLAYER, '1 1 0.7');\r
        SKINVECTOR(COLOR_DIALOG_CREDITS, '0.7 0.7 1');\r
        SKINVECTOR(COLOR_DIALOG_WEAPONS, '1 0.7 0.7');\r
-       SKINVECTOR(COLOR_DIALOG_RADAR, '0.7 0.7 1');\r
+       SKINVECTOR(COLOR_DIALOG_HUD, '0.7 0.7 1');\r
        SKINVECTOR(COLOR_DIALOG_SERVERINFO, '0.7 0.7 1');\r
        SKINVECTOR(COLOR_DIALOG_CVARS, '1 0 0');\r
 \r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
index 791b64908d55e8787ce43452a510fa5682954f9b..caffe5378dd8d442e9f8eb082e06c1ce3e9a0299 100644 (file)
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c
@@ -116,7 +116,7 @@ void fillVoretPlayerSettingsTab(entity me)
                me.TDempty(me, 0.4);\r
                me.TD(me, 1, 2.2, e = makeVoretButton("Radar, HUD & Waypoints...", '0 0 0'));\r
                        e.onClick = DialogOpenButton_Click;\r
-                       e.onClickEntity = main.radarDialog;\r
+                       e.onClickEntity = main.hudDialog;\r
                me.TDempty(me, 0.5);\r
        me.TR(me);\r
        #ifdef ALLOW_FORCEMODELS\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
new file mode 100644 (file)
index 0000000..24c7b56
--- /dev/null
+++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_hud.c
@@ -0,0 +1,118 @@
+#ifdef INTERFACE\r
+CLASS(VoretHudDialog) EXTENDS(VoretDialog)\r
+       METHOD(VoretHudDialog, toString, string(entity))\r
+       METHOD(VoretHudDialog, fill, void(entity))\r
+       METHOD(VoretHudDialog, showNotify, void(entity))\r
+       ATTRIB(VoretHudDialog, title, string, "Radar, HUD & Waypoints")\r
+       ATTRIB(VoretHudDialog, color, vector, SKINCOLOR_DIALOG_HUD)\r
+       ATTRIB(VoretHudDialog, intendedWidth, float, 0.7)\r
+       ATTRIB(VoretHudDialog, rows, float, 20)\r
+       ATTRIB(VoretHudDialog, columns, float, 4)\r
+ENDCLASS(VoretHudDialog)\r
+#endif\r
+\r
+#ifdef IMPLEMENTATION\r
+void showNotifyVoretHudDialog(entity me)\r
+{\r
+        loadAllCvars(me);\r
+}\r
+string toStringVoretHudDialog(entity me)\r
+{\r
+       return "XXX";\r
+}\r
+void fillVoretHudDialog(entity me)\r
+{\r
+       entity e, sl;\r
+       me.TR(me);\r
+               me.TD(me, 1, 4, makeVoretTextLabel(0, "HUD settings:"));\r
+       me.TR(me);\r
+       me.TDempty(me, 0.2);\r
+       me.TD(me, 1, 2, e = makeVoretCheckBoxEx(100, 120, "viewsize", "Enable HUD"));\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 0.8, e = makeVoretCheckBoxEx(100, 110, "viewsize", "Background:"));\r
+                       setDependent(e, "viewsize", 0, 100);\r
+               me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "sbar_alpha_bg"));\r
+                       setDependent(e, "viewsize", 0, 100);\r
+               me.TR(me);\r
+                       me.TDempty(me, 0.2);\r
+                       me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default red:"));\r
+                       me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "sbar_color_bg_r"));\r
+                               setDependent(e, "viewsize", 0, 100);\r
+               me.TR(me);\r
+                       me.TDempty(me, 0.2);\r
+                       me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default green:"));\r
+                       me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "sbar_color_bg_g"));\r
+                               setDependent(e, "viewsize", 0, 100);\r
+               me.TR(me);\r
+                       me.TDempty(me, 0.2);\r
+                       me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default blue:"));\r
+                       me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "sbar_color_bg_b"));\r
+                               setDependent(e, "viewsize", 0, 100);\r
+               me.TR(me);\r
+                       me.TDempty(me, 0.2);\r
+                       me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Team color:"));\r
+                       me.TD(me, 1, 3, e = makeVoretSlider(0.1, 1, 0.01, "sbar_color_bg_team"));\r
+                               setDependent(e, "viewsize", 0, 100);\r
+       me.TR(me);\r
+       me.TR(me);\r
+               me.TD(me, 1, 4, makeVoretTextLabel(0, "Radar settings:"));\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Position:"));\r
+               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "0 0", "Top left"));\r
+               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "0.5 0", "Top middle"));\r
+               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "1 0", "Top right"));\r
+       me.TR(me);\r
+               me.TDempty(me, 1);\r
+               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "0 0.5", "Middle left"));\r
+               me.TDempty(me, 1);\r
+               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "1 0.5", "Middle right"));\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Size:"));\r
+               me.TD(me, 1, 3, e = makeVoretTextSlider("cl_teamradar_size"));\r
+                       e.addValue(e, "96x96", "96 96");\r
+                       e.addValue(e, "128x96", "128 96");\r
+                       e.addValue(e, "128x128", "128 128");\r
+                       e.addValue(e, "192x144", "192 144");\r
+                       e.addValue(e, "192x192", "192 192");\r
+                       e.addValue(e, "256x192", "256 192");\r
+                       e.addValue(e, "256x256", "256 256");\r
+                       e.configureVoretTextSliderValues(e);\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               sl = makeVoretSlider(0.20, 1, 0.01, "cl_teamradar_background_alpha");\r
+               me.TD(me, 1, 0.8, e = makeVoretSliderCheckBox(-1, 1, sl, "Background:"));\r
+               me.TD(me, 1, 3, sl);\r
+       me.TR(me);\r
+       me.TR(me);\r
+               me.TD(me, 1, 4, makeVoretTextLabel(0, "Waypoint settings:"));\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 3.8, e = makeVoretCheckBox(1, "cl_hidewaypoints", "Show base waypoints"));\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Waypoint scale:"));\r
+                       me.TD(me, 1, 3, e = makeVoretSlider(0.5, 1.5, 0.01, "g_waypointsprite_scale"));\r
+                               setDependent(e, "cl_hidewaypoints", 0, 0);\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Waypoint alpha:"));\r
+                       me.TD(me, 1, 3, e = makeVoretSlider(0.1, 1, 0.01, "g_waypointsprite_alpha"));\r
+                               setDependent(e, "cl_hidewaypoints", 0, 0);\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Show names:"));\r
+               me.TD(me, 1, 3, e = makeVoretTextSlider("cl_shownames"));\r
+                       e.addValue(e, "Never", "0");\r
+                       e.addValue(e, "Teammates", "1");\r
+                       e.addValue(e, "All players", "2");\r
+                       e.configureVoretTextSliderValues(e);\r
+       me.gotoRC(me, me.rows - 1, 0);\r
+               me.TD(me, 1, me.columns, e = makeVoretButton("OK", '0 0 0'));\r
+                       e.onClick = Dialog_Close;\r
+                       e.onClickEntity = me;\r
+}\r
+\r
+#endif\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_radar.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_radar.c
deleted file mode 100644 (file)
index ccbae9f..0000000
--- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_radar.c
+++ /dev/null
@@ -1,118 +0,0 @@
-#ifdef INTERFACE\r
-CLASS(VoretRadarDialog) EXTENDS(VoretDialog)\r
-       METHOD(VoretRadarDialog, toString, string(entity))\r
-       METHOD(VoretRadarDialog, fill, void(entity))\r
-       METHOD(VoretRadarDialog, showNotify, void(entity))\r
-       ATTRIB(VoretRadarDialog, title, string, "Radar, HUD & Waypoints")\r
-       ATTRIB(VoretRadarDialog, color, vector, SKINCOLOR_DIALOG_RADAR)\r
-       ATTRIB(VoretRadarDialog, intendedWidth, float, 0.7)\r
-       ATTRIB(VoretRadarDialog, rows, float, 20)\r
-       ATTRIB(VoretRadarDialog, columns, float, 4)\r
-ENDCLASS(VoretRadarDialog)\r
-#endif\r
-\r
-#ifdef IMPLEMENTATION\r
-void showNotifyVoretRadarDialog(entity me)\r
-{\r
-        loadAllCvars(me);\r
-}\r
-string toStringVoretRadarDialog(entity me)\r
-{\r
-       return "XXX";\r
-}\r
-void fillVoretRadarDialog(entity me)\r
-{\r
-       entity e, sl;\r
-       me.TR(me);\r
-               me.TD(me, 1, 4, makeVoretTextLabel(0, "Radar settings:"));\r
-       me.TR(me);\r
-               me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Position:"));\r
-               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "0 0", "Top left"));\r
-               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "0.5 0", "Top middle"));\r
-               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "1 0", "Top right"));\r
-       me.TR(me);\r
-               me.TDempty(me, 1);\r
-               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "0 0.5", "Middle left"));\r
-               me.TDempty(me, 1);\r
-               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_teamradar_position", "1 0.5", "Middle right"));\r
-       me.TR(me);\r
-               me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Size:"));\r
-               me.TD(me, 1, 3, e = makeVoretTextSlider("cl_teamradar_size"));\r
-                       e.addValue(e, "96x96", "96 96");\r
-                       e.addValue(e, "128x96", "128 96");\r
-                       e.addValue(e, "128x128", "128 128");\r
-                       e.addValue(e, "192x144", "192 144");\r
-                       e.addValue(e, "192x192", "192 192");\r
-                       e.addValue(e, "256x192", "256 192");\r
-                       e.addValue(e, "256x256", "256 256");\r
-                       e.configureVoretTextSliderValues(e);\r
-       me.TR(me);\r
-               me.TDempty(me, 0.2);\r
-               sl = makeVoretSlider(0.20, 1, 0.01, "cl_teamradar_background_alpha");\r
-               me.TD(me, 1, 0.8, e = makeVoretSliderCheckBox(-1, 1, sl, "Background:"));\r
-               me.TD(me, 1, 3, sl);\r
-       me.TR(me);\r
-       me.TR(me);\r
-               me.TD(me, 1, 4, makeVoretTextLabel(0, "HUD settings:"));\r
-       me.TR(me);\r
-       me.TDempty(me, 0.2);\r
-       me.TD(me, 1, 2, e = makeVoretCheckBoxEx(100, 120, "viewsize", "Enable HUD"));\r
-       me.TR(me);\r
-               me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 0.8, e = makeVoretCheckBoxEx(100, 110, "viewsize", "Background:"));\r
-                       setDependent(e, "viewsize", 0, 100);\r
-               me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "sbar_alpha_bg"));\r
-                       setDependent(e, "viewsize", 0, 100);\r
-               me.TR(me);\r
-                       me.TDempty(me, 0.2);\r
-                       me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default red:"));\r
-                       me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "sbar_color_bg_r"));\r
-                               setDependent(e, "viewsize", 0, 100);\r
-               me.TR(me);\r
-                       me.TDempty(me, 0.2);\r
-                       me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default green:"));\r
-                       me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "sbar_color_bg_g"));\r
-                               setDependent(e, "viewsize", 0, 100);\r
-               me.TR(me);\r
-                       me.TDempty(me, 0.2);\r
-                       me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Default blue:"));\r
-                       me.TD(me, 1, 3, e = makeVoretSlider(0, 1, 0.01, "sbar_color_bg_b"));\r
-                               setDependent(e, "viewsize", 0, 100);\r
-               me.TR(me);\r
-                       me.TDempty(me, 0.2);\r
-                       me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Team color:"));\r
-                       me.TD(me, 1, 3, e = makeVoretSlider(0.1, 1, 0.01, "sbar_color_bg_team"));\r
-                               setDependent(e, "viewsize", 0, 100);\r
-       me.TR(me);\r
-       me.TR(me);\r
-               me.TD(me, 1, 4, makeVoretTextLabel(0, "Waypoint settings:"));\r
-       me.TR(me);\r
-               me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 3.8, e = makeVoretCheckBox(1, "cl_hidewaypoints", "Show base waypoints"));\r
-       me.TR(me);\r
-               me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Waypoint scale:"));\r
-                       me.TD(me, 1, 3, e = makeVoretSlider(0.5, 1.5, 0.01, "g_waypointsprite_scale"));\r
-                               setDependent(e, "cl_hidewaypoints", 0, 0);\r
-       me.TR(me);\r
-               me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Waypoint alpha:"));\r
-                       me.TD(me, 1, 3, e = makeVoretSlider(0.1, 1, 0.01, "g_waypointsprite_alpha"));\r
-                               setDependent(e, "cl_hidewaypoints", 0, 0);\r
-       me.TR(me);\r
-               me.TDempty(me, 0.2);\r
-               me.TD(me, 1, 0.8, e = makeVoretTextLabel(0, "Show names:"));\r
-               me.TD(me, 1, 3, e = makeVoretTextSlider("cl_shownames"));\r
-                       e.addValue(e, "Never", "0");\r
-                       e.addValue(e, "Teammates", "1");\r
-                       e.addValue(e, "All players", "2");\r
-                       e.configureVoretTextSliderValues(e);\r
-       me.gotoRC(me, me.rows - 1, 0);\r
-               me.TD(me, 1, me.columns, e = makeVoretButton("OK", '0 0 0'));\r
-                       e.onClick = Dialog_Close;\r
-                       e.onClickEntity = me;\r
-}\r
-\r
-#endif\r

diff --git a/data/qcsrc/menu/voret/mainwindow.c b/data/qcsrc/menu/voret/mainwindow.c
index efee18845d25f434a7b6baadcfbbf47fd9ae4637..56a0dd7dac2d4faf58566f56f85eafa8f6795d30 100644 (file)
--- a/data/qcsrc/menu/voret/mainwindow.c
+++ b/data/qcsrc/menu/voret/mainwindow.c
@@ -7,7 +7,7 @@ CLASS(MainWindow) EXTENDS(ModalController)
        ATTRIB(MainWindow, mapInfoDialog, entity, NULL)\r
        ATTRIB(MainWindow, userbindEditDialog, entity, NULL)\r
        ATTRIB(MainWindow, winnerDialog, entity, NULL)\r
-       ATTRIB(MainWindow, radarDialog, entity, NULL)\r
+       ATTRIB(MainWindow, hudDialog, entity, NULL)\r
        ATTRIB(MainWindow, serverInfoDialog, entity, NULL)\r
        ATTRIB(MainWindow, cvarsDialog, entity, NULL)\r
        ATTRIB(MainWindow, mainNexposee, entity, NULL)\r
@@ -57,7 +57,7 @@ void configureMainWindowMainWindow(entity me)
        i.configureDialog(i);\r
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);\r
 \r
-       me.radarDialog = i = spawnVoretRadarDialog();\r
+       me.hudDialog = i = spawnVoretHudDialog();\r
        i.configureDialog(i);\r
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);\r
        \r