From c708a29f90d269bc654dd45a70dc020ab633e759 Mon Sep 17 00:00:00 2001 From: nyov Date: Tue, 18 Nov 2014 14:54:28 +0000 Subject: [PATCH] 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) --- models/player/erebus.iqm_0.txt | 3 +-- models/player/gak.iqm_0.txt | 3 +-- models/player/gakarmored.iqm_0.txt | 3 +-- models/player/gakmasked.iqm_0.txt | 3 +-- models/player/ignis.iqm_0.txt | 3 +-- models/player/ignishalfmasked.iqm_0.txt | 3 +-- models/player/ignismasked.iqm_0.txt | 3 +-- models/player/megaerebus.iqm_0.txt | 3 +-- models/player/nyx.iqm_0.txt | 3 +-- models/player/pyria.iqm_0.txt | 3 +-- models/player/seraphina.iqm_0.txt | 3 +-- models/player/seraphinamasked.iqm_0.txt | 3 +-- models/player/umbra.iqm_0.txt | 3 +-- qcsrc/common/util.qc | 2 ++ qcsrc/common/util.qh | 1 + qcsrc/menu/xonotic/playermodel.c | 13 ++++++++++++- 16 files changed, 28 insertions(+), 27 deletions(-) diff --git a/models/player/erebus.iqm_0.txt b/models/player/erebus.iqm_0.txt index 3b8198a6d..103276d0b 100644 --- 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 2f864a686..27b579027 100644 --- 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 d561d6480..46977b885 100644 --- 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 10aeee8e1..44843b705 100644 --- 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 6744e652a..981562cfc 100644 --- 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 c956630f3..01c99adf0 100644 --- 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 e89ead1da..2610d2b92 100644 --- 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 c2d811779..f75a15fb8 100644 --- 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 50f41f35e..ba14c232a 100644 --- 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 489571a91..e8a6c9044 100644 --- 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 fc5a62b24..f7b07b0e6 100644 --- 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 2a48e8d4e..c997d01f3 100644 --- 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 c5933c1ab..25ce2d07c 100644 --- 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 c50a3ba53..2c6636a3b 100644 --- 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 9b969134a..9ddc92579 100644 --- 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 a09d85e0d..652c581c0 100644 --- 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(); -- 2.39.2