From 53ebd803c613949a3f30fb4a905192c85dc73851 Mon Sep 17 00:00:00 2001 From: random-geek <35757396+random-geek@users.noreply.github.com> Date: Wed, 23 Oct 2019 17:17:00 -0700 Subject: [PATCH] Change some rough/inappropriate language in comments (#9061) --- games/minimal/mods/default/init.lua | 2 +- src/constants.h | 4 ++-- src/gui/guiEditBoxWithScrollbar.cpp | 11 +++++++---- src/map.cpp | 2 +- src/mapnode.cpp | 2 +- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/games/minimal/mods/default/init.lua b/games/minimal/mods/default/init.lua index 02d195cbc..772cca881 100644 --- a/games/minimal/mods/default/init.lua +++ b/games/minimal/mods/default/init.lua @@ -1801,7 +1801,7 @@ function default.spawn_falling_node(p, nodename) spawn_falling_node(p, nodename) end --- Horrible crap to support old code +-- Horrible stuff to support old code -- Don't use this and never do what this does, it's completely wrong! -- (More specifically, the client and the C++ code doesn't get the group) function default.register_falling_node(nodename, texture) diff --git a/src/constants.h b/src/constants.h index 5ddb54656..7636b38e0 100644 --- a/src/constants.h +++ b/src/constants.h @@ -22,9 +22,9 @@ with this program; if not, write to the Free Software Foundation, Inc., /* All kinds of constants. - Cross-platform compatibility crap should go in porting.h. + Cross-platform compatibility stuff should go in porting.h. - Some things here are legacy crap. + Some things here are legacy. */ /* diff --git a/src/gui/guiEditBoxWithScrollbar.cpp b/src/gui/guiEditBoxWithScrollbar.cpp index 2f909f54f..442406688 100644 --- a/src/gui/guiEditBoxWithScrollbar.cpp +++ b/src/gui/guiEditBoxWithScrollbar.cpp @@ -1109,10 +1109,13 @@ void GUIEditBoxWithScrollBar::breakText() m_broken_text_positions.push_back(last_line_start); } -// TODO: that function does interpret VAlign according to line-index (indexed line is placed on top-center-bottom) -// but HAlign according to line-width (pixels) and not by row. -// Intuitively I suppose HAlign handling is better as VScrollPos should handle the line-scrolling. -// But please no one change this without also rewriting (and this time fucking testing!!!) autoscrolling (I noticed this when fixing the old autoscrolling). +// TODO: that function does interpret VAlign according to line-index (indexed +// line is placed on top-center-bottom) but HAlign according to line-width +// (pixels) and not by row. +// Intuitively I suppose HAlign handling is better as VScrollPos should handle +// the line-scrolling. +// But please no one change this without also rewriting (and this time +// testing!!!) autoscrolling (I noticed this when fixing the old autoscrolling). void GUIEditBoxWithScrollBar::setTextRect(s32 line) { if (line < 0) diff --git a/src/map.cpp b/src/map.cpp index ba429f877..f1911d1a7 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -179,7 +179,7 @@ void Map::setNode(v3s16 p, MapNode & n) v3s16 blockpos = getNodeBlockPos(p); MapBlock *block = getBlockNoCreate(blockpos); v3s16 relpos = p - blockpos*MAP_BLOCKSIZE; - // Never allow placing CONTENT_IGNORE, it fucks up stuff + // Never allow placing CONTENT_IGNORE, it causes problems if(n.getContent() == CONTENT_IGNORE){ bool temp_bool; errorstream<<"Map::setNode(): Not allowing to place CONTENT_IGNORE" diff --git a/src/mapnode.cpp b/src/mapnode.cpp index 557b376c3..bf7e79a71 100644 --- a/src/mapnode.cpp +++ b/src/mapnode.cpp @@ -846,7 +846,7 @@ void MapNode::deSerialize_pre22(const u8 *source, u8 version) { // In these versions, CONTENT_IGNORE and CONTENT_AIR // are 255 and 254 - // Version 19 is fucked up with sometimes the old values and sometimes not + // Version 19 is messed up with sometimes the old values and sometimes not if(param0 == 255) param0 = CONTENT_IGNORE; else if(param0 == 254)