From a33ad3c99eff7fcdc99967aee72b0ead5027e4c4 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 24 Mar 2018 22:42:10 +0100 Subject: [PATCH 1/2] - fixed: 3D floor that extend into the real sector's floor were not clipped properly. The only check being done on this was done after processing for the renderer which simply is too late. --- src/gl/scene/gl_walls.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/gl/scene/gl_walls.cpp b/src/gl/scene/gl_walls.cpp index 5db32de04..7b9d47c3f 100644 --- a/src/gl/scene/gl_walls.cpp +++ b/src/gl/scene/gl_walls.cpp @@ -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. From 95d7101e26fbcf4d1737abf94252568bfb756ac8 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 24 Mar 2018 23:16:21 +0100 Subject: [PATCH 2/2] - stats sending message. --- src/d_stats.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/d_stats.cpp b/src/d_stats.cpp index e6c0e196b..8012b10ef 100644 --- a/src/d_stats.cpp +++ b/src/d_stats.cpp @@ -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 };