Final adjustments

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 68e27589302af4da9330650932507a6adb393b0c..9fb6b83192307219939e8f605a9218a9927f0fe6 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -848,38 +848,44 @@ void CSQC_UpdateView(float w, float h)
                        {
                                local float x = getstati(STAT_HEALTH);
                                
-                               //This part was shamelessly stolen from Nexuiz sources
-                               //Do not want to put this into a function because it's used just in one place and is called too often
+                               //x = red
+                               //y = green
+                               //z = blue
                                
-                               if(x > 200) {
+                               wcross_color_z = 0;
+                               
+                               if(x > 200)
+                               {
                                        wcross_color_x = 0;
                                        wcross_color_y = 1;
-                                       wcross_color_z = 0;
                                }
-                               else if(x > 150) {
-                                       wcross_color_x = 0.4 - (x-150)*0.02 * 0.4; //red value between 0.4 -> 0
-                                       wcross_color_y = 0.9 + (x-150)*0.02 * 0.1; // green value between 0.9 -> 1
-                                       wcross_color_z = 0;
+                               else if(x > 150)
+                               {
+                                       wcross_color_x = 0.4 - (x-150)*0.02 * 0.4;
+                                       wcross_color_y = 0.9 + (x-150)*0.02 * 0.1;
                                }
-                               else if(x > 100) {
-                                       wcross_color_x = 1 - (x-100)*0.02 * 0.6; //red value between 1 -> 0.4
-                                       wcross_color_y = 1 - (x-100)*0.02 * 0.1; // green value between 1 -> 0.9
-                                       wcross_color_z = 1 - (x-100)*0.02; // blue value between 1 -> 0
+                               else if(x > 100)
+                               {
+                                       wcross_color_x = 1 - (x-100)*0.02 * 0.6;
+                                       wcross_color_y = 1 - (x-100)*0.02 * 0.1;
+                                       wcross_color_z = 1 - (x-100)*0.02;
                                }
-                               else if(x > 50) {
+                               else if(x > 50)
+                               {
                                        wcross_color_x = 1;
                                        wcross_color_y = 1;
-                                       wcross_color_z = 0.2 + (x-50)*0.02 * 0.8; // blue value between 0.2 -> 1
+                                       wcross_color_z = 0.2 + (x-50)*0.02 * 0.8;  
                                }
-                               else if(x > 20) {
+                               else if(x > 20)
+                               {
                                        wcross_color_x = 1;
-                                       wcross_color_y = (x-20)*90/27/100; // green value between 0 -> 1
-                                       wcross_color_z = (x-20)*90/27/100 * 0.2; // blue value between 0 -> 0.2
+                                       wcross_color_y = (x-20)*90/27/100;
+                                       wcross_color_z = (x-20)*90/27/100 * 0.2;
                                }
-                               else {
+                               else
+                               {
                                        wcross_color_x = 1;
                                        wcross_color_y = 0;
-                                       wcross_color_z = 0;
                                }
                        }
                        else

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
index 3d7fecc4fcb5cd5d9cc920a13feb117ef8b3acea..5cb714f522762b6e30b28fcc049c40c3ba7aa0b0 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c
@@ -140,7 +140,7 @@ void XonoticPlayerSettingsTab_fill(entity me)
                me.TD(me, 1, 2/3, e = makeXonoticCheckBox(0, "crosshair_color_by_health", "By health"));
                setDependent(e, "crosshair_color_per_weapon", 0, 0);
        me.TR(me);
-               me.TDempty(me, 0.5);
+               me.TDempty(me, 0.4);
                me.TD(me, 2, 1.8, e = makeXonoticColorpickerString("crosshair_color", "crosshair_color"));
                setDependentAND(e, "crosshair_color_per_weapon", 0, 0, "crosshair_color_by_health", 0, 0);
        me.TR(me);