zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 07:12:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git@github.com:coelckers/gzdoom.git

Browse source
This commit is contained in:
Vitaly Novichkov 2018-03-25 01:20:31 +03:00
commit 6e6d1b5e97
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/d_stats.cpp
View file

@ -306,6 +306,8 @@ void D_DoAnonStats()
t1.detach();
}
void D_ConfirmSendStats()
{
if (sys_statsenabled >= 0)
@ -314,8 +316,18 @@ void D_ConfirmSendStats()
}
// TODO: texts
static const char *const MESSAGE_TEXT = "send stats?";
static const char *const TITLE_TEXT = GAMENAME;
static const char *const MESSAGE_TEXT = "In order to decide where to focus development, the GZDoom team would like to know a little bit about the hardware it is run on.\n" \
"For this we would like to ask you if we may sent three bits of information to gzstats.drdteam.org.\n" \
"The three items we would like to know about are:\n" \
"- Operating system\n" \
"- Number of processor cores\n" \
"- Currently used renderer\n\n" \
"All information sent will be anonymous. We will NOT be sending this information to any third party. It will merely be used for decisionmaking about GZDoom's future development.\n" \
"Data will only be sent at most twice per system, once for the software renderer and once for the hardware renderer.\n" \
"If you are getting this notice more than once per renderer, please let us know on the forums. Thanks!\n\n" \
"May we send this data? If you click 'no', nothing will be sent and you will not be asked again.";
static const char *const TITLE_TEXT = "GZDoom needs your help!";
UCVarValue enabled = { 0 };

6
src/gl/scene/gl_walls.cpp
View file

@ -1392,6 +1392,12 @@ void GLWall::DoFFloorBlocks(seg_t * seg, sector_t * frontsector, sector_t * back
ff_topleft = topleft;
ff_topright = topright;
}
if (ff_bottomleft < bottomleft && ff_bottomright < bottomright)
{
// the new section extends into the floor.
ff_bottomleft = bottomleft;
ff_bottomright = bottomright;
}
// do all inverse floors above the current one it there is a gap between the
// last 3D floor and this one.