some fixes for color parser

2008-09-10 18:20:19 +02:00
parent cb79ecdb2a
commit 415096c067
3 changed files with 30 additions and 22 deletions
--- a/src/scrollpad.cpp
+++ b/src/scrollpad.cpp
@@ -57,15 +57,24 @@ void Scrollpad::Add(string str)
 		
 		if (BBEnabled)
 		{
-			if (s[i] == '[')
+			if (s[i] == '[' && (s[i+1] == '.' || s[i+1] == '/'))
 				collect = 1;
-		
+			
 			if (collect)
-				tmp += s[i];
-		
-			if (s[i] == ']' || tmp.length() > 10) // the longest bbcode is 10 chars long
+			{
+				if (s[i] != '[')
+				{
+					tmp += s[i];
+					if (tmp.length() > 10) // the longest bbcode is 10 chars long
+						collect = 0;
+				}
+				else
+					tmp = s[i];
+			}
+			
+			if (s[i] == ']')
 				collect = 0;
-		
+			
 			if (!collect && !tmp.empty())
 			{
 				if (IsValidColor(TO_STRING(tmp)))