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

new command /showclips, doc fix

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@7459 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Bukz
2013-04-08 02:55:40 +00:00
parent c180666baf
commit 18f5080ccd
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/docs.cfg
+3 -1
View File
@@ -1264,6 +1264,8 @@ docident [settex] [Set a texture for the current selection.];
docargument [T] [position of the texture to set in map cfg] [integer] [0];
docargument [t] [the type of the texture] [0 (floor), 1 (wall), 2 (ceil), 3 (upper wall)] [0];
docident [setwpyaw] [takes the current player yaw for the current waypoint];
docident [showclips] [Show clips/plclips/mapmodel clips in edit mode.];
docargument [N] [-] [min 0/max 1/default 1];
docident [showgrid] [Show editing cursor grid.];
docargument [N] [-] [min 0/max 1/default 1];
docident [showmip] [Toggles between showing what parts of the scenery are rendered.];
@@ -1699,7 +1701,7 @@ docargument [V] [] [min 0/max 10000/default 75];
docident [skyclip] [];
docargument [V] [] [min 0/max 1/default 1];
docident [spectfov] [Specifies the Field Of View when in spectating/ghost mode.];
docargument [V] [Spectate FOV size] [min 5/max 120/default 120];
docargument [V] [Spectate FOV size] [min 5/max 120/default 110];
docident [stencilbits] [];
docargument [V] [] [min 0/max 32/default 0];
docident [stencilshadow] [Sets the transparency/opacity level of stencil shadows.];
config/scripts.cfg
+2 -2
View File
@@ -411,8 +411,8 @@ switch = [
]
// cleanshot - Take a "clean" screenshot with no HUD items.
const cs_sets [clockdisplay crosshairsize hidecompass hideconsole hidectfhud hidedamageindicator hidehudequipment hidehudmsgs hideradar hidespecthud hideteam hidevote hudgun specthudgun showstats showtargetname showgrid]
const cs_newsets [0 0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0]
const cs_sets [clockdisplay crosshairsize hidecompass hideconsole hidectfhud hidedamageindicator hidehudequipment hidehudmsgs hideradar hidespecthud hideteam hidevote hudgun specthudgun showstats showtargetname showgrid showclips]
const cs_newsets [0 0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 0 0]
const disablehud [ storesets $cs_sets tmp_old_sets; loop csl (listlen $cs_sets) [ (at $cs_sets $csl) (at $cs_newsets $csl) ]; if $editing [ seteditshow 0 ] ]
const enablehud [ if (checkalias tmp_old_sets) [ loop ros (listlen $cs_sets) [ (at $cs_sets $ros) (at $tmp_old_sets $ros) ]; if $editing seteditshow ] ]
source/src/entities.cpp
+5 -4
View File
@@ -2,6 +2,9 @@
#include "cube.h"
VAR(showclips, 0, 1, 1);
VAR(showmodelclipping, 0, 0, 1);
vector<entity> ents;
vector<int> eh_ents; // edithide entities
const char *entmdlnames[] =
@@ -69,8 +72,6 @@ void rendermapmodels()
}
}
VAR(showmodelclipping, 0, 0, 1);
void showedithide()
{
loopv(eh_ents)
@@ -219,8 +220,8 @@ void renderentities()
defformatstring(path)("pickups/flags/%s", team_basestring(e.attr2));
rendermodel(path, ANIM_FLAG|ANIM_LOOP, 0, 0, vec(e.x, e.y, (float)S(e.x, e.y)->floor), (float)((e.attr1+7)-(e.attr1+7)%15), 0, 120.0f);
}
else if((e.type == CLIP || e.type == PLCLIP) && !stenciling) renderclip(e);
else if(showmodelclipping && e.type == MAPMODEL && !stenciling)
else if((e.type == CLIP || e.type == PLCLIP) && showclips && !stenciling) renderclip(e);
else if(e.type == MAPMODEL && showclips && showmodelclipping && !stenciling)
{
mapmodelinfo &mmi = getmminfo(e.attr2);
if(&mmi && mmi.h)