summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Blocks/BlockSponge.h2
-rw-r--r--src/Blocks/CMakeLists.txt1
-rw-r--r--src/ChatColor.cpp4
-rwxr-xr-xsrc/CheckBasicStyle.lua3
-rw-r--r--src/Items/ItemFishingRod.h4
5 files changed, 9 insertions, 5 deletions
diff --git a/src/Blocks/BlockSponge.h b/src/Blocks/BlockSponge.h
index 7df5d69ff..41102f148 100644
--- a/src/Blocks/BlockSponge.h
+++ b/src/Blocks/BlockSponge.h
@@ -113,7 +113,7 @@ public:
if (seed.m_Depth > 0)
{
// If this block was water, and we haven't yet gone too far away,
- // add itś neighbors to the queue to check.
+ // add its neighbors to the queue to check.
for (unsigned int i = 0; i < 6; i++)
{
Seeds.emplace(checkRel + WaterCheck[i], seed.m_Depth - 1);
diff --git a/src/Blocks/CMakeLists.txt b/src/Blocks/CMakeLists.txt
index ae451a3ad..24d0a20a6 100644
--- a/src/Blocks/CMakeLists.txt
+++ b/src/Blocks/CMakeLists.txt
@@ -84,6 +84,7 @@ SET (HDRS
BlockSignPost.h
BlockSlab.h
BlockSnow.h
+ BlockSponge.h
BlockStairs.h
BlockStems.h
BlockStone.h
diff --git a/src/ChatColor.cpp b/src/ChatColor.cpp
index e1317c287..73658408b 100644
--- a/src/ChatColor.cpp
+++ b/src/ChatColor.cpp
@@ -2,8 +2,8 @@
#include "ChatColor.h"
-const char * cChatColor::Color = "\xc2\xa7"; // or in other words: "§" in UTF-8
-const char * cChatColor::Delimiter = "\xc2\xa7"; // or in other words: "§" in UTF-8
+const char * cChatColor::Color = "\xc2\xa7"; // The paragraph / section symbol in UTF-8
+const char * cChatColor::Delimiter = "\xc2\xa7"; // The paragraph / section symbol in UTF-8
const char * cChatColor::Black = "\xc2\xa7""0";
const char * cChatColor::Navy = "\xc2\xa7""1";
const char * cChatColor::Green = "\xc2\xa7""2";
diff --git a/src/CheckBasicStyle.lua b/src/CheckBasicStyle.lua
index 4376d460a..df25c64ca 100755
--- a/src/CheckBasicStyle.lua
+++ b/src/CheckBasicStyle.lua
@@ -202,6 +202,9 @@ local g_ViolationPatterns =
-- Check if "else" is on the same line as a brace.
{"}%s*else", "else has to be on a separate line"},
{"else%s*{", "else has to be on a separate line"},
+
+ -- Don't allow characters other than ASCII 0 - 127:
+ {"[" .. string.char(128) .. "-" .. string.char(255) .. "]", "Character in the extended ASCII range (128 - 255) not allowed"},
}
diff --git a/src/Items/ItemFishingRod.h b/src/Items/ItemFishingRod.h
index ecd04bcfd..8c2be3ad3 100644
--- a/src/Items/ItemFishingRod.h
+++ b/src/Items/ItemFishingRod.h
@@ -154,7 +154,7 @@ public:
}
else if (Junk < 12) // 2 / 83 chance of spawning a fishing rod
{
- // Fishing Rods caught from the Junk category will be 10%–100% damaged, and always unenchanted.
+ // Fishing Rods caught from the Junk category will be 10%-100% damaged, and always unenchanted.
Drops.Add(cItem(E_ITEM_FISHING_ROD, 1, Random.RandInt<short>(7, 65)));
}
else if (Junk < 22) // 10 / 83 chance of spawning leather
@@ -163,7 +163,7 @@ public:
}
else if (Junk < 32) // 10 / 83 chance of spawning leather boots
{
- // Leather boots caught from the Junk category will be 10%–100% damaged, and always unenchanted.
+ // Leather boots caught from the Junk category will be 10%-100% damaged, and always unenchanted.
Drops.Add(cItem(E_ITEM_LEATHER_BOOTS, 1, Random.RandInt<short>(7, 66)));
}
else if (Junk < 42) // 10 / 83 chance of spawning rotten flesh