Fixes announcements, and the green if someone mentions your nime

StrickenFromHistory · Mar 29, 2010 · fc8e7cf · fc8e7cf
1 parent 6207207
commit fc8e7cf
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/Client/src/org/pokenet/client/ui/frames/ChatWidget.java b/Client/src/org/pokenet/client/ui/frames/ChatWidget.java
@@ -129,17 +129,17 @@ public void scroll(int indexMod){
     			// Make system messages red
     			if (m_wrappedText.get(m_scrollIndex + i).charAt(0) == '*'){
     				m_shownChat.get(i).setForeground(Color.red);
-    //				m_wrappedText.set(m_scrollIndex + i, m_wrappedText.get(m_scrollIndex + i).replaceFirst("*",""));
+    				m_wrappedText.set(m_scrollIndex + i, m_wrappedText.get(m_scrollIndex + i).substring(1));
     			}
     			// Make announcements yellow
     			if (m_wrappedText.get(m_scrollIndex + i).charAt(0) == '%'){
     				m_shownChat.get(i).setForeground(Color.yellow);
-    //				m_wrappedText.set(m_scrollIndex + i, m_wrappedText.get(m_scrollIndex + i).replaceFirst("%",""));
+    				m_wrappedText.set(m_scrollIndex + i, m_wrappedText.get(m_scrollIndex + i).substring(1));
     			}
     			// Highlight chat when named. 
     			if (m_wrappedText.get(m_scrollIndex + i).charAt(0) == '!'){
     				m_shownChat.get(i).setForeground(Color.green);
-    //				m_wrappedText.set(m_scrollIndex + i, m_wrappedText.get(m_scrollIndex + i).replaceFirst("!",""));
+    				m_wrappedText.set(m_scrollIndex + i, m_wrappedText.get(m_scrollIndex + i).substring(1));
     			}
     			m_shownChat.get(i).setText(m_wrappedText.get(m_scrollIndex + i));
     		} catch (Exception e) {} 
@@ -202,7 +202,13 @@ public void wrap(){
 						char messageType = '\u0000';
 						if (loopLine.charAt(0) == '*')
 							messageType = '*';
-						else if (loopLine.charAt(0) == '!')
+						else if (loopLine.charAt(0) == '%')
+							messageType = '%';
+						else if (loopLine.charAt(0) == '!' || (!loopLine.contains(
+								'<' + GameClient.getInstance().getOurPlayer()
+								.getUsername() + '>') && loopLine
+								.contains(GameClient.getInstance().getOurPlayer()
+								.getUsername())))
 							messageType = '!';
 						while (GameClient.getFontSmall().getWidth(loopLine) > getWidth()){
 							int linesToDrop = 1;
@@ -220,7 +226,7 @@ else if (loopLine.charAt(0) == '!')
 									loopList.size() - 1).length());
 							loopList.add(loopLine);
 						}
-						m_wrappedText.add(loopLine);
+						m_wrappedText.add(messageType + loopLine);
 					}
 				} catch (IndexOutOfBoundsException e) {}
 				catch (Exception e) {e.printStackTrace();}