kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

optionally hide closest entity filename info

Browse Source 
it gets cut off on 5:4 screens...

  hideeditslotinfo 0..2

    0: show info always
    1: only show "unassigned slot" if necessary
    2: never show info

DOCREF hideeditslotinfo
This commit is contained in:
ac-stef
2017-05-30 10:43:55 +02:00
parent 72e5b08463
commit cb2e20af98
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/menus_edit.cfg
+1
View File
@@ -1171,6 +1171,7 @@ menuitemslider "Grid/Selection style: " 0 1 "$oldselstyle" 1 [triangles "squa
menuitemcheckbox "Show mapmodel clippings: " "$showmodelclipping" [ showmodelclipping $arg1 ]
menuitemcheckbox "Show ladder entities: " "$showladderentities" [ showladderentities $arg1 ]
menuitemcheckbox "Show all playerstarts (spawn points): " "$showplayerstarts" [ showplayerstarts $arg1 ]
menuitemslider "Show closest ent slot info: " 0 2 "$hideeditslotinfo" 1 [ always "if unassigned" never ][ hideeditslotinfo $arg1 ]
menuitemcheckbox "Show edit info panel: " "(! $hideeditinfopanel)" [ hideeditinfopanel (! $arg1) ]
menuitemslider "Fly speeds multiplier: " 1 5 "$flyspeed" 1 [] [ flyspeed $arg1 ]
// opt/autosave.cfg may add some entries
config/menus_settings.cfg
+3 -3
View File
@@ -106,7 +106,7 @@ menuitemcheckbox "Ignore map override: Disable water reflection" "$ignoreoverri
menuitemcheckbox "Ignore map override: Limit water waveheight" "$ignoreoverride_limitwaveheight" [ ignoreoverride_limitwaveheight $arg1 ]
menuitemcheckbox "Ignore map override: Disable stencil shadows" "$ignoreoverride_nostencilshadows" [ ignoreoverride_nostencilshadows $arg1 ]
menuitem "" -1
menuitem [FPS Range\i\3] [ showmenu [FPS Range] ]
menuitem "FPS Range\i\3" [ showmenu [FPS Range] ]
menuitem "" -1
menuitem "\f2\t\t [ Apply now! ]" [ resetgl ]
@@ -135,8 +135,7 @@ menuitemcheckbox [ Spectator info ] "(= $hidespecthud 0)" [
menuitemcheckbox [ Quick messages ] "(= $hidehudmsgs 0)" [ hidehudmsgs (= $arg1 0) ]
menuitemcheckbox [ Damage direction indicator ] "(= $hidedamageindicator 0)" [ hidedamageindicator (= $arg1 0) ]
menuitemcheckbox [ Damage screen flash ] "$damagescreen" [ damagescreen $arg1 ]
menuitemslider [ Damage maxroll ] 0 (getvarrange max maxrolleffect) "$maxrolleffect" 1 [] [ maxrolleffect $arg1 ]
menuitemcheckbox [ Crosshair team-sign ] "$crosshairteamsign" [ crosshairteamsign $arg1 ]
menuitemslider [ Damage maxroll: ] 0 (getvarrange max maxrolleffect) "$maxrolleffect" 1 [] [ maxrolleffect $arg1 ]
menuitemcheckbox [ Team score counters ] "(= $hideteamscorehud 0)" [ hideteamscorehud (= $arg1 0) ]
menuitemcheckbox [ KTF flag direction indicator ] "(! $hidektfindicator)" [ hidektfindicator (! $arg1) ]
menuitemcheckbox [ Radar ] "(= $hideradar 0)" [ hideradar (= $arg1 0) ]
@@ -429,6 +428,7 @@ menuitemvar [ concat "Change" $__crosshairset "crosshair\i\3" ] [ showmenu
menuitem "" -1
menuitemcheckbox "Crosshair effect: change color for low health" [ (at "0 1 1 0" $crosshairfx) ] [ crosshairfx (at (if $arg1 ["2 1 2 1"] ["0 3 0 3"]) $crosshairfx) ]
menuitemcheckbox "Crosshair effect: show assault rifle spread increase" [ (at "0 1 0 1" $crosshairfx) ] [ crosshairfx (at (if $arg1 ["3 1 1 3"] ["0 2 2 0"]) $crosshairfx) ]
menuitemcheckbox "Crosshair effect: show team-sign when aiming at teammates " "$crosshairteamsign" [ crosshairteamsign $arg1 ]
//// Main > Settings > Mouse > Customize crosshairs > Crosshairs ////
source/src/editing.cpp
+4 -2
View File
@@ -96,6 +96,8 @@ bool noselection()
return !selset();
}
VARP(hideeditslotinfo, 0, 0, 2);
char *editinfo()
{
static string info;
@@ -107,7 +109,7 @@ char *editinfo()
entity &c = ents[e];
int t = c.type < MAXENTTYPES ? c.type : 0;
formatstring(info)("%s entity: %s (%s)", pinnedclosestent ? "\fs\f3pinned\fr" : "closest", entnames[t], formatentityattributes(c, true));
const char *slotinfo = "unassigned slot";
const char *unassigned = "unassigned slot", *slotinfo = unassigned;
if(t == MAPMODEL)
{
mapmodelinfo *mmi = getmminfo(c.attr2);
@@ -118,7 +120,7 @@ char *editinfo()
if(mapconfigdata.mapsoundlines.inrange(c.attr1)) slotinfo = mapconfigdata.mapsoundlines[c.attr1].name;
}
else slotinfo = "";
if(*slotinfo) concatformatstring(info, " %s", slotinfo);
if(*slotinfo && (hideeditslotinfo == 0 || (hideeditslotinfo == 1 && slotinfo == unassigned))) concatformatstring(info, " %s", slotinfo);
}
if(selset())
{