From c99a051a2aaad2c8800fb12470857d476ae1bd9b Mon Sep 17 00:00:00 2001
From: Edoardo Prezioso <edward.san.dev@gmail.com>
Date: Sun, 27 Nov 2016 10:42:03 +0100
Subject: [PATCH 1/2] - Added lambda feature to FString::(Strip|Replace)Chars.

Use it in the other (Strip|Replace)Chars methods to show how it would work.
---
 src/zstring.cpp | 58 +++++++++++--------------------------------------
 src/zstring.h   | 36 +++++++++++++++++++++++++++++-
 2 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/src/zstring.cpp b/src/zstring.cpp
index 1999f54fe..70ce9dc68 100644
--- a/src/zstring.cpp
+++ b/src/zstring.cpp
@@ -863,66 +863,34 @@ void FString::Insert (size_t index, const char *instr, size_t instrlen)
 
 void FString::ReplaceChars (char oldchar, char newchar)
 {
-	size_t i, j;
+	if (oldchar == '\0')
+		return;
 
-	LockBuffer();
-	for (i = 0, j = Len(); i < j; ++i)
-	{
-		if (Chars[i] == oldchar)
-		{
-			Chars[i] = newchar;
-		}
-	}
-	UnlockBuffer();
+	ReplaceChars([&oldchar](char c){ return c == oldchar; }, newchar);
 }
 
 void FString::ReplaceChars (const char *oldcharset, char newchar)
 {
-	size_t i, j;
+	if (oldcharset == NULL || oldcharset[0] == '\0')
+		return;
 
-	LockBuffer();
-	for (i = 0, j = Len(); i < j; ++i)
-	{
-		if (strchr (oldcharset, Chars[i]) != NULL)
-		{
-			Chars[i] = newchar;
-		}
-	}
-	UnlockBuffer();
+	ReplaceChars([&oldcharset](char c){ return strchr(oldcharset, c) != NULL; }, newchar);
 }
 
 void FString::StripChars (char killchar)
 {
-	size_t read, write, mylen;
+	if (killchar == '\0')
+		return;
 
-	LockBuffer();
-	for (read = write = 0, mylen = Len(); read < mylen; ++read)
-	{
-		if (Chars[read] != killchar)
-		{
-			Chars[write++] = Chars[read];
-		}
-	}
-	Chars[write] = '\0';
-	ReallocBuffer (write);
-	UnlockBuffer();
+	StripChars([&killchar](char c){ return c == killchar; });
 }
 
-void FString::StripChars (const char *killchars)
+void FString::StripChars (const char *killcharset)
 {
-	size_t read, write, mylen;
+	if (killcharset == NULL || killcharset[0] == '\0')
+		return;
 
-	LockBuffer();
-	for (read = write = 0, mylen = Len(); read < mylen; ++read)
-	{
-		if (strchr (killchars, Chars[read]) == NULL)
-		{
-			Chars[write++] = Chars[read];
-		}
-	}
-	Chars[write] = '\0';
-	ReallocBuffer (write);
-	UnlockBuffer();
+	StripChars([&killcharset](char c){ return strchr(killcharset, c) != NULL; });
 }
 
 void FString::MergeChars (char merger)
diff --git a/src/zstring.h b/src/zstring.h
index ba9208719..6138f38aa 100644
--- a/src/zstring.h
+++ b/src/zstring.h
@@ -236,11 +236,45 @@ public:
 	void Insert (size_t index, const char *instr);
 	void Insert (size_t index, const char *instr, size_t instrlen);
 
+	template<typename Func>
+	void ReplaceChars (Func IsOldChar, char newchar)
+	{
+		size_t i, j;
+
+		LockBuffer();
+		for (i = 0, j = Len(); i < j; ++i)
+		{
+			if (IsOldChar(Chars[i]))
+			{
+				Chars[i] = newchar;
+			}
+		}
+		UnlockBuffer();
+	}
+
 	void ReplaceChars (char oldchar, char newchar);
 	void ReplaceChars (const char *oldcharset, char newchar);
 
+	template<typename Func>
+	void StripChars (Func IsKillChar)
+	{
+		size_t read, write, mylen;
+
+		LockBuffer();
+		for (read = write = 0, mylen = Len(); read < mylen; ++read)
+		{
+			if (!IsKillChar(Chars[read]))
+			{
+				Chars[write++] = Chars[read];
+			}
+		}
+		Chars[write] = '\0';
+		ReallocBuffer (write);
+		UnlockBuffer();
+	}
+
 	void StripChars (char killchar);
-	void StripChars (const char *killchars);
+	void StripChars (const char *killcharset);
 
 	void MergeChars (char merger);
 	void MergeChars (char merger, char newchar);

From 0cff4439450ac48e6ea37e9c9b29e242819220b9 Mon Sep 17 00:00:00 2001
From: Edoardo Prezioso <edward.san.dev@gmail.com>
Date: Wed, 30 Nov 2016 20:59:09 +0100
Subject: [PATCH 2/2] - Fixed missing linebreak in 'currentpos' error message.

---
 src/c_cmds.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/c_cmds.cpp b/src/c_cmds.cpp
index f9cea4005..56739502e 100644
--- a/src/c_cmds.cpp
+++ b/src/c_cmds.cpp
@@ -1144,7 +1144,7 @@ CCMD(currentpos)
 	}
 	else
 	{
-		Printf("You are not in game!");
+		Printf("You are not in game!\n");
 	}
 }