From eca4acbe49f0b77d9f9f0d2fd10fa59ad1d01b9b Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Sun, 7 Nov 2010 18:51:39 +0100
Subject: [PATCH] Changed: #1135 Reverted some changes from next Ryzom patch

---
 .../data/gamedev/interfaces_v3/config.xml     |  6 --
 .../gamedev/interfaces_v3/game_config.xml     | 35 +---------
 .../client/src/interface_v3/chat_filter.cpp   |  2 +-
 .../client/src/interface_v3/chat_window.cpp   | 70 ++-----------------
 .../interface_v3/filtered_chat_summary.cpp    | 10 +--
 .../src/interface_v3/filtered_chat_summary.h  |  1 -
 .../src/interface_v3/interface_manager.cpp    | 20 +++---
 .../src/interface_v3/people_interraction.cpp  | 46 ++----------
 code/ryzom/client/src/net_manager.cpp         |  2 +-
 9 files changed, 29 insertions(+), 163 deletions(-)

diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/config.xml b/code/ryzom/client/data/gamedev/interfaces_v3/config.xml
index e1b5be456..88306afc5 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/config.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/config.xml
@@ -2960,18 +2960,12 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:CHAT:COLORS:TELL"
             type="rgba"
             value="170 170 170 255" />
-  <variable entry="UI:SAVE:CHAT:COLORS:DYN"
-            type="rgba"
-            value="162 255 173 255" />
   <variable entry="UI:SAVE:CHAT:ENTER_DONT_QUIT_CB"
             type="bool"
             value="false" />
   <variable entry="UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB"
              type="bool"
              value="false" />
-  <variable entry="UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
-             type="bool"
-             value="false" />
   <!-- ***************************** -->
   <!-- *    SYSTEM INFO COLORS     * -->
   <!-- ***************************** -->
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml b/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
index bd4b7ed40..f15f3adc9 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
@@ -1605,23 +1605,14 @@
                   posparent="cc_univ"
                   x="0"
                   y="-4" />
-        <instance template="tgcw_color"
-                  id="cc_dyn"
-                  text="uiDynColor"
-                  title="uiCCDDyn"
-                  tooltip="uittChooseDynColor"
-                  posref="BL TL"
-                  posparent="cc_shout"
-                  x="0"
-                  y="-4" />
         <instance template="tgcw_checkbox"
                   id="enter_dontquit_cb"
                   text="uiEnterDontQuitCB"
                   tooltip="uittChatEnter"
-                  posparent="cc_dyn"
+                  posparent="cc_univ"
                   posref="BL TL"
                   x="0"
-                  y="-8" />
+                  y="-25" />
         <instance template="tgcw_checkbox"
                   id="show_times_in_chat_cb"
                   text="uiShowTimesInChatCB"
@@ -1630,27 +1621,17 @@
                   posref="BL TL"
                   x="0"
                   y="-8" />
-        <instance template="tgcw_checkbox"
-                  id="show_dyn_channel_name_in_chat_cb"
-                  text="uiShowDynChannelNameInChatCB"
-                  tooltip="uittShowDynChannelNameInChat"
-                  posparent="show_times_in_chat_cb"
-                  posref="BL TL"
-                  x="0"
-                  y="-8" />
         <instance template="tgcw_scrollbarint"
                   id="font_size"
                   text="uiFontSize"
                   posref="BL TL"
-                  posparent="show_dyn_channel_name_in_chat_cb"
+                  posparent="show_times_in_chat_cb"
                   x="0"
                   y="-8" />
         <link expr="@UI:SAVE:CHAT:ENTER_DONT_QUIT_CB"
               target="enter_dontquit_cb:c:pushed" />
         <link expr="@UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB"
               target="show_times_in_chat_cb:c:pushed" />
-        <link expr="@UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
-              target="show_dyn_channel_name_in_chat_cb:c:pushed" />
       </group>
       <ctrl style="skin_scroll"
             id="sb_chat_colors"
@@ -3081,11 +3062,6 @@
                widget="colbut"
                link="UI:SAVE:CHAT:COLORS:SHOUT"
                realtime="true" />
-        <param ui="chat_colors:cc_dyn:c"
-               type="db"
-               widget="colbut"
-               link="UI:SAVE:CHAT:COLORS:DYN"
-               realtime="true" />
         <!--
                         <param ui="chat_colors:cc_shout:c"              type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:SHOUT" realtime="true" />
                         <param ui="chat_colors:cc_civi:c"               type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:CIVILIZATION" realtime="true" />
@@ -3101,11 +3077,6 @@
                widget="boolbut"
                link="UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB"
                realtime="true" />
-        <param ui="chat_colors:show_dyn_channel_name_in_chat_cb:c"
-               type="db"
-               widget="boolbut"
-               link="UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
-               realtime="true" />
         <param ui="chat_colors:font_size:c"
                type="db"
                widget="sbint"
diff --git a/code/ryzom/client/src/interface_v3/chat_filter.cpp b/code/ryzom/client/src/interface_v3/chat_filter.cpp
index 8c937d982..da0645ed6 100644
--- a/code/ryzom/client/src/interface_v3/chat_filter.cpp
+++ b/code/ryzom/client/src/interface_v3/chat_filter.cpp
@@ -379,7 +379,7 @@ void CChatTargetFilter::setTargetGroup(CChatGroup::TGroupType groupType, uint32
 		const bool guildActive = pIM->getDbProp("SERVER:GUILD:NAME")->getValueBool();
 		switch(groupType)
 		{
-			case CChatGroup::dyn_chat: entry+="DYN"; break;
+			case CChatGroup::dyn_chat:	// dyn_chat takes the color of say
 			case CChatGroup::say:	entry+="SAY";	break;
 			case CChatGroup::shout:	entry+="SHOUT";	break;
 			case CChatGroup::team:	if(!teamActive) return; entry+="GROUP";	break;
diff --git a/code/ryzom/client/src/interface_v3/chat_window.cpp b/code/ryzom/client/src/interface_v3/chat_window.cpp
index b76ab21cd..7f4e4eb39 100644
--- a/code/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/code/ryzom/client/src/interface_v3/chat_window.cpp
@@ -199,7 +199,7 @@ bool CChatWindow::isVisible() const
 }
 
 //=================================================================================
-void CChatWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CChatGroup::TGroupType gt, uint32 dynamicChatDbIndex, uint numBlinks /* = 0*/, bool *windowVisible /*= NULL*/)
+void CChatWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CChatGroup::TGroupType /* gt */, uint32 /* dynamicChatDbIndex */, uint numBlinks /* = 0*/, bool *windowVisible /*= NULL*/)
 {
 	if (!_Chat)
 	{
@@ -210,26 +210,8 @@ void CChatWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CChatGr
 
 	CChatTextManager &ctm = getChatTextMngr();
 
-	ucstring newmsg = msg;
-	ucstring prefix;
-	if (gt == CChatGroup::dyn_chat)
-	{
-		prefix = "[" + NLMISC::toString(dynamicChatDbIndex) + "]";
-		// Find position to put the new string
-		// After timestamp?
-		size_t pos = msg.find(ucstring("]"));
-		if (pos == ucstring::npos)
-		{
-			// No timestamp, so put it right after the color and add a space
-			pos = msg.find(ucstring("}"));
-			prefix += " ";
-		}
-		newmsg = msg.substr(0, pos + 1) + prefix + msg.substr(pos + 1);
-		prefix.clear();
-	}
-
 	gl = dynamic_cast<CGroupList *>(_Chat->getGroup("cb:text_list"));
-	if (gl)	gl->addChild(ctm.createMsgText(newmsg, col));
+	if (gl)	gl->addChild(ctm.createMsgText(msg, col));
 
 	// if the group is closed, make it blink
 	if (!_Chat->isOpen())
@@ -575,27 +557,9 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 	CRGBA	newMsgColor= stringToRGBA(pIM->getDefine("chat_group_tab_color_newmsg").c_str());
 
-	ucstring newmsg = msg;
-	ucstring prefix;
-	if (gt == CChatGroup::dyn_chat)
-	{
-		prefix = "[" + NLMISC::toString(dynamicChatDbIndex) + "]";
-		// Find position to put the new string
-		// After timestamp?
-		size_t pos = msg.find(ucstring("]"));
-		if (pos == ucstring::npos)
-		{
-			// No timestamp, so put it right after the color and add a space
-			pos = msg.find(ucstring("}"));
-			prefix += " ";
-		}
-		newmsg = msg.substr(0, pos + 1) + prefix + msg.substr(pos + 1);
-		prefix.clear();
-	}
-
 	if (gl != NULL)
 	{
-		gl->addChild(ctm.createMsgText(newmsg, col));
+		gl->addChild(ctm.createMsgText(msg, col));
 		if (!gl->getParent()->getActive())
 			if (tab != NULL)
 				tab->setTextColorNormal(newMsgColor);
@@ -620,36 +584,14 @@ void CChatGroupWindow::displayMessage(const ucstring &msg, NLMISC::CRGBA col, CC
 			case CChatGroup::guild:		if (ci.Guild.isListeningWindow(cw))			gl = gl2;	break;
 			case CChatGroup::system:	if (ci.SystemInfo.isListeningWindow(cw))	gl = gl2;	break;
 			case CChatGroup::universe:	if (ci.Universe.isListeningWindow(cw))		gl = gl2;	break;
-			case CChatGroup::dyn_chat:	
-				if (ci.DynamicChat[dynamicChatDbIndex].isListeningWindow(cw))
-				{
-					gl = gl2;
-
-					// Add dynchannel number and optionally name before text if user channel
-					if (CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB", false)->getValueBool())
-					{
-						uint32 textId = ChatMngr.getDynamicChannelNameFromDbIndex(dynamicChatDbIndex);
-						ucstring title;
-						STRING_MANAGER::CStringManagerClient::instance()->getDynString(textId, title);
-						if ( ! title.empty())
-						{
-							prefix = " " + title;
-						}
-					}
-					
-					// Put the new prefix in the correct position
-					size_t pos = newmsg.find(ucstring("] "));
-					newmsg = newmsg.substr(0, pos) + prefix + newmsg.substr(pos);
-				}
-				break;
-
-				// NB: the yubo chat cannot be in a user chat
+				// NB: the yubo chat and dyn_chat cannot be in a user chat
 			case CChatGroup::yubo_chat:	gl = NULL;	break;
+			case CChatGroup::dyn_chat:	gl = NULL;	break;
 		}
 
 		if (gl != NULL)
 		{
-			gl->addChild(ctm.createMsgText(newmsg, col));
+			gl->addChild(ctm.createMsgText(msg, col));
 			if (!gl->getParent()->getActive())
 				if (tab != NULL)
 					tab->setTextColorNormal(newMsgColor);
diff --git a/code/ryzom/client/src/interface_v3/filtered_chat_summary.cpp b/code/ryzom/client/src/interface_v3/filtered_chat_summary.cpp
index c0d9dd30f..a48ccfe7d 100644
--- a/code/ryzom/client/src/interface_v3/filtered_chat_summary.cpp
+++ b/code/ryzom/client/src/interface_v3/filtered_chat_summary.cpp
@@ -22,7 +22,7 @@
 //===================================================================================
 void CFilteredChatSummary::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 {
-	sint ver = f.serialVersion(3);
+	sint ver= f.serialVersion(2);
 	f.serialCheck((uint32) 'USHC');
 	f.serial(SrcGuild);
 	f.serial(SrcTeam);
@@ -36,12 +36,4 @@ void CFilteredChatSummary::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 
 	if(ver>=2)
 		f.serial(SrcRegion);
-
-	if (ver >= 3)
-	{
-		for (uint8 i = 0; i < CChatGroup::MaxDynChanPerPlayer; i++) {
-			f.serial(SrcDynChat[i]);
-		}
-	}
-
 }
diff --git a/code/ryzom/client/src/interface_v3/filtered_chat_summary.h b/code/ryzom/client/src/interface_v3/filtered_chat_summary.h
index 193a834d0..5cdf4f3ac 100644
--- a/code/ryzom/client/src/interface_v3/filtered_chat_summary.h
+++ b/code/ryzom/client/src/interface_v3/filtered_chat_summary.h
@@ -33,7 +33,6 @@ public:
 	bool SrcSystemInfo;
 	bool SrcRegion;
 	bool SrcUniverse;
-	bool SrcDynChat[CChatGroup::MaxDynChanPerPlayer];
 	// output
 	CChatGroup::TGroupType Target;
 public:
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp
index 47504cba5..2cf1712c1 100644
--- a/code/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -6380,20 +6380,26 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
 		vector<ucstring> token_vector;
 		vector<ucstring> param_vector;
 		splitUCString(token_string, ucstring("."), token_vector);
+		if (token_vector.size() == 0)
+		{
+			// Wrong formatting; give up on this one.
+			start_pos = end_pos;
+			continue;
+		}
 		token_subject = token_vector[0];
 		if (token_vector.size() == 1)
 		{
 			splitUCString(token_subject, ucstring("/"), param_vector);
-			token_subject = param_vector[0];
+			token_subject = (param_vector.size() > 0) ? param_vector[0] : ucstring("");
 			token_param = ucstring("name");
 		}
-		else
+		else if (token_vector.size() > 1)
 		{
 			token_param = token_vector[1];
 			if (token_param.luabind_substr(0, 3) != ucstring("gs("))
 			{
 				splitUCString(token_vector[1], ucstring("/"), param_vector);
-				token_param = param_vector[0];
+				token_param = (param_vector.size() > 0) ? param_vector[0] : ucstring("");
 			}
 		}
 
@@ -6537,7 +6543,7 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
 					continue;
 				}
 
-				// Only care about gender if it's a humanoid.
+				// We only care about the gender if the subject is humanoid.
 				GSGENDER::EGender gender = GSGENDER::neutral;
 				if (pTokenSubjectEntity->isUser() || pTokenSubjectEntity->isPlayer() || pTokenSubjectEntity->isNPC())
 				{
@@ -6548,8 +6554,7 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
 					}
 				}
 
-				// Neuter part is optional.
-				// Fallback to male if something is wrong.
+				// The neuter part is optional. Fallback to male if something is wrong.
 				GSGENDER::EGender g = ((uint)gender >= strList.size()) ? GSGENDER::male : gender;
 				token_replacement = strList[g];
 			}
@@ -6565,11 +6570,10 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
 			return false;
 		}
 
-
 		// Replace token
 		size_t token_whole_pos = str.find(token_whole);
 
-		// Only do extra replacement if using default
+		// Only do extra replacement spaces if using default
 		extra_replacement = (token_replacement == token_default) ? extra_replacement : 0;
 		if (str.find(token_whole, start_pos) != string::npos)
 		{
diff --git a/code/ryzom/client/src/interface_v3/people_interraction.cpp b/code/ryzom/client/src/interface_v3/people_interraction.cpp
index ee798b8a2..c3309b8d2 100644
--- a/code/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/code/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -487,6 +487,9 @@ void CPeopleInterraction::initStdInputs()
 	if (YuboChat)
 		ChatInput.YuboChat.addListeningWindow(YuboChat);
 
+	// NB: The universe channel can only be seen from the user chat (and hence chat group)
+	// There is no Special universe window
+
 	if (TheUserChat.Window)
 	{
 		ChatInput.AroundMe.addListeningWindow(TheUserChat.Window);
@@ -495,11 +498,6 @@ void CPeopleInterraction::initStdInputs()
 		ChatInput.Guild.addListeningWindow(TheUserChat.Window);
 		ChatInput.Universe.addListeningWindow	(TheUserChat.Window);
 		// Don't add the system info by default
-		// Dynamic chats
-		for(i = 0; i < CChatGroup::MaxDynChanPerPlayer; i++)
-		{
-			ChatInput.DynamicChat[i].addListeningWindow(TheUserChat.Window);
-		}
 	}
 
 	ChatInput.Tell.addListeningPeopleList(&FriendList);
@@ -1584,11 +1582,6 @@ void CPeopleInterraction::buildFilteredChatSummary(const CFilteredChat &src, CFi
 	{
 		fcs.Target = src.Filter.getTargetGroup();
 	}
-
-	for (uint8 i = 0; i < CChatGroup::MaxDynChanPerPlayer; i++)
-	{
-		fcs.SrcDynChat[i] = ChatInput.DynamicChat[i].isListeningWindow(src.Window);
-	}
 }
 
 //=================================================================================================================
@@ -1733,11 +1726,6 @@ void CPeopleInterraction::setupUserChatFromSummary(const CFilteredChatSummary &s
 	ChatInput.Tell.setWindowState(dest.Window, summary.SrcTell);
 	ChatInput.Region.setWindowState(dest.Window, summary.SrcRegion);
 	ChatInput.Universe.setWindowState(dest.Window, summary.SrcUniverse);
-
-	for (uint8 i = 0; i < CChatGroup::MaxDynChanPerPlayer; i++)
-	{
-		ChatInput.DynamicChat[i].setWindowState(dest.Window, summary.SrcDynChat[i]);
-	}
 }
 
 //=================================================================================================================
@@ -2504,7 +2492,7 @@ public:
 			for (uint i = 0; i < CChatGroup::MaxDynChanPerPlayer; i++)
 			{
 				string s = toString(i);
-				uint32 textId = ChatMngr.getDynamicChannelNameFromDbIndex(i);
+				uint32 textId = im->getDbProp("SERVER:DYN_CHAT:CHANNEL"+s+":NAME")->getValue32();
 				bool active = (textId != 0);
 				if (active)
 				{
@@ -2691,7 +2679,7 @@ class CHandlerSelectChatSource : public IActionHandler
 				CViewTextMenu *pVTM = dynamic_cast<CViewTextMenu *>(im->getElementFromId(MAIN_CHAT_SOURCE_MENU+":tab:dyn"+s));
 				if (pVTM)
 				{
-					uint32 textId = ChatMngr.getDynamicChannelNameFromDbIndex(i);
+					uint32 textId = im->getDbProp("SERVER:DYN_CHAT:CHANNEL"+s+":NAME")->getValue32();
 					bool active = (textId != 0);
 					pVTM->setActive(active);
 					if (active)
@@ -2812,22 +2800,6 @@ class CHandlerSelectChatSource : public IActionHandler
 					++ insertionIndex;
 				}
 			}
-
-			// Add all existing dynamic channels and set the names
-			for (uint8 i = 0; i < CChatGroup::MaxDynChanPerPlayer; i++)
-			{
-				string s = toString(i);
-				uint32 textId = ChatMngr.getDynamicChannelNameFromDbIndex(i);
-				bool active = (textId != 0);
-				if (active)
-				{
-					ucstring title;
-					STRING_MANAGER::CStringManagerClient::instance()->getDynString(textId, title);
-					menu->addLineAtIndex(insertionIndex, "["+s+"] " + title, FILTER_TOGGLE, "dyn"+s);
-					menu->setUserGroupLeft(insertionIndex, createMenuCheckBox(FILTER_TOGGLE, "dyn"+s, pi.ChatInput.DynamicChat[i].isListeningWindow(cw)));
-					++insertionIndex;
-				}
-			}
 		}
 
 
@@ -2936,14 +2908,6 @@ class CHandlerChatSourceSelected : public IActionHandler
 				}
 			}
 		}
-		else 
-		if (nlstricmp(sParams.substr(0, 3), "dyn") == 0)
-		{
-			uint8 i = 0;
-			fromString(sParams.substr(3), i);
-			if (ci.DynamicChat[i].isListeningWindow(cw)) ci.DynamicChat[i].removeListeningWindow(cw);
-			else ci.DynamicChat[i].addListeningWindow(cw);
-		}
 	}
 };
 REGISTER_ACTION_HANDLER( CHandlerChatSourceSelected, "chat_source_selected");
diff --git a/code/ryzom/client/src/net_manager.cpp b/code/ryzom/client/src/net_manager.cpp
index e80aa99bd..d5cc16a33 100644
--- a/code/ryzom/client/src/net_manager.cpp
+++ b/code/ryzom/client/src/net_manager.cpp
@@ -666,7 +666,7 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 		string entry="UI:SAVE:CHAT:COLORS:";
 		switch(mode)
 		{
-		case CChatGroup::dyn_chat:	entry+="DYN";	break;
+		case CChatGroup::dyn_chat:	// dyn_chat takes the color of say
 		case CChatGroup::say:	entry+="SAY";	break;
 		case CChatGroup::shout:	entry+="SHOUT";	break;
 		case CChatGroup::team:	entry+="GROUP";	break;