remove playermodel descriptions

Model description has been moved to a keyword field, which limits
them to a single line but lets us keep the text around.
(Additional multiline descriptions at the end of the file are still
 possible, but won't look good with the model name moved to the bottom)

diff --git a/models/player/erebus.iqm_0.txt b/models/player/erebus.iqm_0.txt
index 3b8198a6d30b4f308a84f7f4aa6df8b061b0fe70..103276d0be776e382b738f48d2b264912eea07f0 100644 (file)
--- a/models/player/erebus.iqm_0.txt
+++ b/models/player/erebus.iqm_0.txt
@@ -3,6 +3,7 @@ species human
 sex Male
 weight 105
 age 26
+description Heavyweight Xonotic Soldier
 bone_upperbody spine2
 bone_aim0 0.25 spine2
 bone_aim1 0.4 spine4
@@ -10,5 +11,3 @@ bone_aim2 0.2 upperarm_L
 bone_aim3 0.35 bip01 r hand
 bone_weapon bip01 r hand
 fixbone 1
-
-Heavyweight Xonotic Solider

diff --git a/models/player/gak.iqm_0.txt b/models/player/gak.iqm_0.txt
index 2f864a686e7887ae788d7718d742a3df7b4528e8..27b579027f93063f207b8fbf849e538a7ea4dff3 100644 (file)
--- a/models/player/gak.iqm_0.txt
+++ b/models/player/gak.iqm_0.txt
@@ -3,11 +3,10 @@ species alien
 sex Male
 weight 85
 age 16
+description Lightweight Xonotic Soldier
 bone_upperbody spine2
 bone_aim0 0.25 spine2
 bone_aim1 0.4 spine4
 bone_aim2 0.35 bip01 r hand
 bone_weapon bip01 r hand
 fixbone 1
-
-Lightweight Xonotic Solider

diff --git a/models/player/gakarmored.iqm_0.txt b/models/player/gakarmored.iqm_0.txt
index d561d64800c737dbd56f117de3fcee61d8a7db69..46977b885488e8214865814686a7293dca180f15 100644 (file)
--- a/models/player/gakarmored.iqm_0.txt
+++ b/models/player/gakarmored.iqm_0.txt
@@ -3,11 +3,10 @@ species alien
 sex Male
 weight 90
 age 20
+description Heavyweight Xonotic Soldier
 bone_upperbody spine2
 bone_aim0 0.25 spine2
 bone_aim1 0.4 spine4
 bone_aim2 0.35 bip01 r hand
 bone_weapon bip01 r hand
 fixbone 1
-
-Heavyweight Xonotic Solider

diff --git a/models/player/gakmasked.iqm_0.txt b/models/player/gakmasked.iqm_0.txt
index 10aeee8e16808386ba2318d3e446d07cee30e92b..44843b7058baf5ccd13a0e37c88694b99620f9a1 100644 (file)
--- a/models/player/gakmasked.iqm_0.txt
+++ b/models/player/gakmasked.iqm_0.txt
@@ -3,11 +3,10 @@ species alien
 sex Male
 weight 87
 age 18
+description Mediumweight Xonotic Soldier
 bone_upperbody spine2
 bone_aim0 0.25 spine2
 bone_aim1 0.4 spine4
 bone_aim2 0.35 bip01 r hand
 bone_weapon bip01 r hand
 fixbone 1
-
-Mediumweight Xonotic Solider

diff --git a/models/player/ignis.iqm_0.txt b/models/player/ignis.iqm_0.txt
index 6744e652a56af85d517bfb2ef39a77a7b0dabb28..981562cfcf28bbcb5784ed3a4a3c9f31c5eaf794 100644 (file)
--- a/models/player/ignis.iqm_0.txt
+++ b/models/player/ignis.iqm_0.txt
@@ -3,6 +3,7 @@ species human
 sex Male
 weight 88
 age 31
+description Heavyweight Xonotic Soldier
 bone_upperbody spine2
 bone_aim0 0.25 spine2
 bone_aim1 0.4 spine4
@@ -10,5 +11,3 @@ bone_aim2 0.2 upperarm_L
 bone_aim3 0.35 bip01 r hand
 bone_weapon bip01 r hand
 fixbone 1
-
-Heavyweight Xonotic Solider

diff --git a/models/player/ignishalfmasked.iqm_0.txt b/models/player/ignishalfmasked.iqm_0.txt
index c956630f33bb961f2f237497e9700c3f4ac7fbaf..01c99adf0b7dacce11a5f34b67f52b6c5fb23b12 100644 (file)
--- a/models/player/ignishalfmasked.iqm_0.txt
+++ b/models/player/ignishalfmasked.iqm_0.txt
@@ -3,6 +3,7 @@ species human
 sex Male
 weight 90
 age 31
+description Heavyweight Xonotic Soldier
 bone_upperbody spine2
 bone_aim0 0.25 spine2
 bone_aim1 0.4 spine4
@@ -10,5 +11,3 @@ bone_aim2 0.2 upperarm_L
 bone_aim3 0.35 bip01 r hand
 bone_weapon bip01 r hand
 fixbone 1
-
-Heavyweight Xonotic Solider

diff --git a/models/player/ignismasked.iqm_0.txt b/models/player/ignismasked.iqm_0.txt
index e89ead1dab4bdaa4d725868d4180b4c44971aab7..2610d2b92db356797a22a0b52605efc304c05f41 100644 (file)
--- a/models/player/ignismasked.iqm_0.txt
+++ b/models/player/ignismasked.iqm_0.txt
@@ -3,6 +3,7 @@ species human
 sex Male
 weight 92
 age 31
+description Heavyweight Xonotic Soldier
 bone_upperbody spine2
 bone_aim0 0.25 spine2
 bone_aim1 0.4 spine4
@@ -10,5 +11,3 @@ bone_aim2 0.2 upperarm_L
 bone_aim3 0.35 bip01 r hand
 bone_weapon bip01 r hand
 fixbone 1
-
-Heavyweight Xonotic Solider

diff --git a/models/player/megaerebus.iqm_0.txt b/models/player/megaerebus.iqm_0.txt
index c2d811779c83544114b45874844d3698edbb0898..f75a15fb8ef55b3cf7b06abeaec7ba451ae9ab9f 100644 (file)
--- a/models/player/megaerebus.iqm_0.txt
+++ b/models/player/megaerebus.iqm_0.txt
@@ -3,6 +3,7 @@ species human
 sex Male
 weight 210
 age 26
+description Heavyweight Xonotic Soldier
 bone_upperbody spine2
 bone_aim0 0.25 spine2
 bone_aim1 0.4 spine4
@@ -10,5 +11,3 @@ bone_aim2 0.2 upperarm_L
 bone_aim3 0.35 bip01 r hand
 bone_weapon bip01 r hand
 fixbone 1
-
-Heavyweight Xonotic Solider

diff --git a/models/player/nyx.iqm_0.txt b/models/player/nyx.iqm_0.txt
index 50f41f35e5dbe3344d6d2a9645903e9fd8cf6c9e..ba14c232a63c85f3cf6071d35ce218884dadf33f 100644 (file)
--- a/models/player/nyx.iqm_0.txt
+++ b/models/player/nyx.iqm_0.txt
@@ -3,11 +3,10 @@ species human
 sex Female
 weight 100
 age 24
+description Heavyweight Xonotic Soldier
 bone_upperbody spine2
 bone_aim0 0.25 spine2
 bone_aim1 0.4 spine4
 bone_aim2 0.35 bip01 r hand
 bone_weapon bip01 r hand
 fixbone 1
-
-Heavyweight Xonotic Soldier

diff --git a/models/player/pyria.iqm_0.txt b/models/player/pyria.iqm_0.txt
index 489571a91a51998e0519c863be828442d82283cb..e8a6c90446eb9192a7c7ce5ae58e5c622896ae22 100644 (file)
--- a/models/player/pyria.iqm_0.txt
+++ b/models/player/pyria.iqm_0.txt
@@ -3,11 +3,10 @@ species human
 sex Female
 weight 57
 age 53
+description Necro Warrior
 bone_upperbody spine2
 bone_aim0 0.25 spine2
 bone_aim1 0.4 spine4
 bone_aim2 0.35 bip01 r hand
 bone_weapon bip01 r hand
 fixbone 1
-
-Necro Warrior

diff --git a/models/player/seraphina.iqm_0.txt b/models/player/seraphina.iqm_0.txt
index fc5a62b248af63bbd1884718cff76a5e94d66db7..f7b07b0e67cca74072b7d92eadf8b525348c628c 100644 (file)
--- a/models/player/seraphina.iqm_0.txt
+++ b/models/player/seraphina.iqm_0.txt
@@ -3,11 +3,10 @@ species human
 sex Female
 weight 89
 age 31
+description Heavyweight Xonotic Soldier
 bone_upperbody spine2
 bone_aim0 0.25 spine2
 bone_aim1 0.4 spine4
 bone_aim2 0.35 bip01 r hand
 bone_weapon bip01 r hand
 fixbone 1
-
-Heavyweight Xonotic Solider

diff --git a/models/player/seraphinamasked.iqm_0.txt b/models/player/seraphinamasked.iqm_0.txt
index 2a48e8d4e552144d7a9a65ee4ddb3f21dc2f9d69..c997d01f36488d7771766fe38956f883b8bcc9bc 100644 (file)
--- a/models/player/seraphinamasked.iqm_0.txt
+++ b/models/player/seraphinamasked.iqm_0.txt
@@ -3,11 +3,10 @@ species human
 sex Female
 weight 90
 age 31
+description Heavyweight Xonotic Soldier
 bone_upperbody spine2
 bone_aim0 0.25 spine2
 bone_aim1 0.4 spine4
 bone_aim2 0.35 bip01 r hand
 bone_weapon bip01 r hand
 fixbone 1
-
-Heavyweight Xonotic Solider

diff --git a/models/player/umbra.iqm_0.txt b/models/player/umbra.iqm_0.txt
index c5933c1ab601576e6929efbac9ed42a70cbc72ee..25ce2d07c6698f856bd2a79c891645df8ccae3a9 100644 (file)
--- a/models/player/umbra.iqm_0.txt
+++ b/models/player/umbra.iqm_0.txt
@@ -3,11 +3,10 @@ species human
 sex Female
 weight 61
 age 25
+description Lightweight Xonotic Soldier
 bone_upperbody spine2
 bone_aim0 0.25 spine2
 bone_aim1 0.4 spine4
 bone_aim2 0.35 bip01 r hand
 bone_weapon bip01 r hand
 fixbone 1
-
-Lightweight Xonotic Solider

diff --git a/qcsrc/common/util.qc b/qcsrc/common/util.qc
index c50a3ba5350d3b1fd1bdb394bc0b3ca5852026dd..2c6636a3b9a8bd8169ba0cacbc3c9b47cf9d6b92 100644 (file)
--- a/qcsrc/common/util.qc
+++ b/qcsrc/common/util.qc
@@ -2106,6 +2106,8 @@ float get_model_parameters(string m, float sk)
                        get_model_parameters_weight = stof(s);
                if(c == "age")
                        get_model_parameters_age = stof(s);
+               if(c == "description")
+                       get_model_parameters_description = s;
                if(c == "bone_upperbody")
                        get_model_parameters_bone_upperbody = s;
                if(c == "bone_weapon")

diff --git a/qcsrc/common/util.qh b/qcsrc/common/util.qh
index 9b969134a56ef21ed1968505b3008aae94bd37ac..9ddc925795b8add1c3fef863aff21c2f8a37b8c7 100644 (file)
--- a/qcsrc/common/util.qh
+++ b/qcsrc/common/util.qh
@@ -273,6 +273,7 @@ float get_model_parameters_species;
 string get_model_parameters_sex;
 float get_model_parameters_weight;
 float get_model_parameters_age;
+string get_model_parameters_description;
 string get_model_parameters_bone_upperbody;
 string get_model_parameters_bone_weapon;
 #define MAX_AIM_BONES 4

diff --git a/qcsrc/menu/xonotic/playermodel.c b/qcsrc/menu/xonotic/playermodel.c
index a09d85e0d14f5602c2063b49488353fd0f6827de..652c581c00f6110e3cc66785d009adcb6cb89319 100644 (file)
--- a/qcsrc/menu/xonotic/playermodel.c
+++ b/qcsrc/menu/xonotic/playermodel.c
@@ -43,6 +43,8 @@ entity makeXonoticPlayerModelSelector()
 #define BUFMODELS_DESC 4
 #define BUFMODELS_COUNT 5
 
+#define XONVOTE186 1 // (nyov) removal of model text description
+
 void XonoticPlayerModelSelector_configureXonoticPlayerModelSelector(entity me)
 {
        float sortbuf, glob, i;
@@ -77,9 +79,14 @@ void XonoticPlayerModelSelector_configureXonoticPlayerModelSelector(entity me)
                bufstr_set(me.bufModels, BUFMODELS_COUNT*i+BUFMODELS_MODEL, get_model_parameters_modelname);
                bufstr_set(me.bufModels, BUFMODELS_COUNT*i+BUFMODELS_SKIN, ftos(get_model_parameters_modelskin));
                get_model_parameters_desc = strcat(get_model_parameters_desc, "\n");
+#if XONVOTE186
+               if(get_model_parameters_sex)
+                       get_model_parameters_desc = strcat(get_model_parameters_desc, sprintf("\n%s", get_model_parameters_sex));
+#else
+               if(get_model_parameters_description)
+                       get_model_parameters_desc = strcat(get_model_parameters_desc, sprintf("\n%s\n", get_model_parameters_description));
                if(get_model_parameters_sex)
                        get_model_parameters_desc = strcat(get_model_parameters_desc, sprintf("\nSex: %s", get_model_parameters_sex));
-#if 0 // (nyov) disabling the display of these has been voted on
                if(get_model_parameters_weight)
                        get_model_parameters_desc = strcat(get_model_parameters_desc, sprintf("\nWeight: %g kg", get_model_parameters_weight));
                if(get_model_parameters_age)
@@ -186,7 +193,11 @@ void XonoticPlayerModelSelector_draw(entity me)
 
        draw_beginBoldFont();
 
+#if XONVOTE186 // (nyov) lower name display looks better when there is no description text
+       draw_CenterText('0.5 0.8 0', me.currentModelTitle, me.realFontSize * (me.titleFontSize / me.fontSize), SKINCOLOR_MODELTITLE, SKINALPHA_MODELTITLE, FALSE);
+#else
        draw_CenterText('0.5 0 0', me.currentModelTitle, me.realFontSize * (me.titleFontSize / me.fontSize), SKINCOLOR_MODELTITLE, SKINALPHA_MODELTITLE, FALSE);
+#endif
 
        draw_endBoldFont();