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

docref offset if showeditingsettings==0

Browse Source
This commit is contained in:
flowtron
2021-08-18 14:04:02 +02:00
parent 3f6384219d
commit a08f2da24b
2 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/entities.cpp
+21 -18
View File
@@ -5,30 +5,33 @@
VARP(showclips, 0, 1, 1);
VARP(showmodelclipping, 0, 0, 1);
VARP(showladderentities, 0, 0, 1);
VARP(showplayerstarts, 0, 0, 1);
VARP(showplayerstarts, 0, 0, 1); // render player models with spawn-type appropriate skins (CLA:red,RVSF:blue,FFA:green)
void toucheditingsettings(bool forcerestart){
if(keepshowingeditingsettingsfrom == 0 || forcerestart)
if(showeditingsettings)
{
keepshowingeditingsettingsfrom = lastmillis;
keepshowingeditingsettingstill = lastmillis + editingsettingsvisibletime;
}
else
{
int deltat_a = keepshowingeditingsettingstill - lastmillis;
int deltat_b = lastmillis - keepshowingeditingsettingsfrom;
int showfrac = editingsettingsvisibletime / 5;
if( deltat_b >= showfrac )// we ignore quick-changes inside the slide-in period
if(keepshowingeditingsettingsfrom == 0 || forcerestart)
{
if( deltat_a <= showfrac )// changes in the slide-out period take that slide back and stay for almost the entire visibletime longer
keepshowingeditingsettingsfrom = lastmillis;
keepshowingeditingsettingstill = lastmillis + editingsettingsvisibletime;
}
else
{
int deltat_a = keepshowingeditingsettingstill - lastmillis;
int deltat_b = lastmillis - keepshowingeditingsettingsfrom;
int showfrac = editingsettingsvisibletime / 5;
if( deltat_b >= showfrac )// we ignore quick-changes inside the slide-in period
{
keepshowingeditingsettingsfrom = lastmillis - deltat_a;
if( deltat_a <= showfrac )// changes in the slide-out period take that slide back and stay for almost the entire visibletime longer
{
keepshowingeditingsettingsfrom = lastmillis - deltat_a;
}
else // a touch during the regular showing duration
{
keepshowingeditingsettingsfrom = lastmillis - showfrac;
}
keepshowingeditingsettingstill = keepshowingeditingsettingsfrom + editingsettingsvisibletime;
}
else // a touch during the regular showing duration
{
keepshowingeditingsettingsfrom = lastmillis - showfrac;
}
keepshowingeditingsettingstill = keepshowingeditingsettingsfrom + editingsettingsvisibletime;
}
}
}
source/src/renderhud.cpp
+1 -1
View File
@@ -968,7 +968,7 @@ void gl_drawhud(int w, int h, int curfps, int nquads, int curvert, bool underwat
if(menu) rendermenu();
else if(command)
{
int offsetx = 40 + (editmode ? ((showeditingsettings == 3 || keepshowingeditingsettingstill) ? VIRTW/4 : (showeditingsettings == 2 ? 2*VIRTW/32 : 0)) : 0);
int offsetx = 40 + ((editmode && (showeditingsettings >= 2 || keepshowingeditingsettingstill)) ? ((showeditingsettings == 2 && keepshowingeditingsettingstill == 0) ? 2*VIRTW/32 : VIRTW/4) : 0);
renderdoc(offsetx, VIRTH, max(commandh*2 - VIRTH, 0));
}