[Planeshift-cvs] CVS: planeshift/src/server adminmanager.cpp, 1.430, 1.431 advicemanager.cpp, 1.67, 1.68 chatmanager.cpp, 1.171, 1.172 gem.cpp, 1.488, 1.489 groupmanager.cpp, 1.53, 1.54 guildmanager.cpp, 1.155, 1.156

[<eva...@us...>]

Update of /cvsroot/planeshift/planeshift/src/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5550/src/server

Modified Files:
	adminmanager.cpp advicemanager.cpp chatmanager.cpp gem.cpp 
	groupmanager.cpp guildmanager.cpp 
Log Message:
- Added 'Other person' field to the psChatMessage class.
  This field can be used in cases where both the sender and the receiver name
  are needed. Currently only the advisor message needs it and any other chat
  types use a 0 string there.
- Fixed bug #2387. Now the advisor message is shown how Arianna originally planned it:
  Advisee gets "Advisor suggests ...", advisor gets "You advise ..." and other 
  advisors get "<advisorname> advices <playername> ...".


Index: adminmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/adminmanager.cpp,v
retrieving revision 1.430
retrieving revision 1.431
diff -C2 -d -r1.430 -r1.431
*** adminmanager.cpp	30 Sep 2007 02:24:41 -0000	1.430
--- adminmanager.cpp	30 Sep 2007 12:28:55 -0000	1.431
***************
*** 3678,3682 ****
          sendText.Format("%s %ss: %s", data.player.GetData(), data.commandMod.GetData(), data.text.GetData() );
  
!     psChatMessage newMsg(client->GetClientNum(), data.player, sendText, CHAT_GM, false);
  
      gemObject* source = (gemObject*)client->GetActor();
--- 3678,3682 ----
          sendText.Format("%s %ss: %s", data.player.GetData(), data.commandMod.GetData(), data.text.GetData() );
  
!     psChatMessage newMsg(client->GetClientNum(), data.player, 0, sendText, CHAT_GM, false);
  
      gemObject* source = (gemObject*)client->GetActor();

Index: advicemanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/advicemanager.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** advicemanager.cpp	16 Jun 2007 18:31:26 -0000	1.67
--- advicemanager.cpp	30 Sep 2007 12:28:55 -0000	1.68
***************
*** 492,496 ****
  			&& activeSession->status == SESSION_STATUS_UNKNOWN && !activeSession->answered )
          {
!             psChatMessage msgAdvisor( advisor->GetClientNum(), activeSession->adviseeName, activeSession->lastRequest, CHAT_ADVICE_LIST, false);
              msgAdvisor.SendMessage();
              found = true;
--- 492,496 ----
  			&& activeSession->status == SESSION_STATUS_UNKNOWN && !activeSession->answered )
          {
!             psChatMessage msgAdvisor( advisor->GetClientNum(), activeSession->adviseeName, 0, activeSession->lastRequest, CHAT_ADVICE_LIST, false);
              msgAdvisor.SendMessage();
              found = true;
***************
*** 594,598 ****
          psserver->GetLogCSV()->Write(CSV_ADVICE, buf);
  
!         psChatMessage msgAdvisor( activeSession->AdvisorClientNum, advisee->GetName(), message , CHAT_ADVICE, false );
          msgAdvisor.SendMessage();
      }
--- 594,598 ----
          psserver->GetLogCSV()->Write(CSV_ADVICE, buf);
  
!         psChatMessage msgAdvisor( activeSession->AdvisorClientNum, advisee->GetName(), 0, message , CHAT_ADVICE, false );
          msgAdvisor.SendMessage();
      }
***************
*** 605,613 ****
          for (size_t i = 0; i < advisors.GetSize(); i++)
          {
!             psChatMessage msgAdvisor( advisors[i].id, advisee->GetName(), message, CHAT_ADVICE, false);
              msgAdvisor.SendMessage();
          }
      }
!     psChatMessage msgChat( advisee->GetClientNum() , advisee->GetName(), message, CHAT_ADVICE, false);
      msgChat.SendMessage();
  
--- 605,613 ----
          for (size_t i = 0; i < advisors.GetSize(); i++)
          {
!             psChatMessage msgAdvisor( advisors[i].id, advisee->GetName(), 0, message, CHAT_ADVICE, false);
              msgAdvisor.SendMessage();
          }
      }
!     psChatMessage msgChat( advisee->GetClientNum() , advisee->GetName(), 0, message, CHAT_ADVICE, false);
      msgChat.SendMessage();
  
***************
*** 713,717 ****
          }
  
!         psChatMessage msgChat(activeSession->AdviseeClientNum,advisee->GetName(), message ,CHAT_ADVISOR,false);
  
          if ( activeSession->GetAdvisor() == NULL || activeSession->status != SESSION_STATUS_OWNED )
--- 713,717 ----
          }
  
!         psChatMessage msgChat(activeSession->AdviseeClientNum, advisor->GetName(), advisee->GetName(), message ,CHAT_ADVISOR,false);
  
          if ( activeSession->GetAdvisor() == NULL || activeSession->status != SESSION_STATUS_OWNED )
***************
*** 854,858 ****
          psserver->SendSystemInfo(adviceSession->AdviseeClientNum,"Your advisor appears to be busy at the moment, the messenger is still waiting for an answer.");
          psserver->SendSystemInfo(adviceSession->AdvisorClientNum,"%s is still waiting for an answer to their question.",adviseeClient->GetName());
!         psChatMessage msgAdvisor(adviceSession->AdvisorClientNum,adviseeClient->GetName(), adviceSession->lastRequest, CHAT_ADVICE_LIST, false);
          msgAdvisor.SendMessage();
      }
--- 854,858 ----
          psserver->SendSystemInfo(adviceSession->AdviseeClientNum,"Your advisor appears to be busy at the moment, the messenger is still waiting for an answer.");
          psserver->SendSystemInfo(adviceSession->AdvisorClientNum,"%s is still waiting for an answer to their question.",adviseeClient->GetName());
!         psChatMessage msgAdvisor(adviceSession->AdvisorClientNum,adviseeClient->GetName(), 0, adviceSession->lastRequest, CHAT_ADVICE_LIST, false);
          msgAdvisor.SendMessage();
      }

Index: chatmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/chatmanager.cpp,v
retrieving revision 1.171
retrieving revision 1.172
diff -C2 -d -r1.171 -r1.172
*** chatmanager.cpp	24 Sep 2007 08:48:35 -0000	1.171
--- chatmanager.cpp	30 Sep 2007 12:28:55 -0000	1.172
***************
*** 189,193 ****
                // Only the speaker sees his successful chatting with an npc.
                // This helps quests stay secret.
!               psChatMessage newMsg(client->GetClientNum(), client->GetName(),
                    msg.sText, msg.iChatType, msg.translate);
                newMsg.SendMessage();
--- 189,193 ----
                // Only the speaker sees his successful chatting with an npc.
                // This helps quests stay secret.
!               psChatMessage newMsg(client->GetClientNum(), client->GetName(), 0,
                    msg.sText, msg.iChatType, msg.translate);
                newMsg.SendMessage();
***************
*** 305,309 ****
  void ChatManager::SendShout(Client *c, psChatMessage& msg)
  {
!     psChatMessage newMsg(c->GetClientNum(), c->GetName(), msg.sText, msg.iChatType, msg.translate);
  
      if (c->GetActor()->GetCharacterData()->GetTotalOnlineTime() > 3600)
--- 305,309 ----
  void ChatManager::SendShout(Client *c, psChatMessage& msg)
  {
!     psChatMessage newMsg(c->GetClientNum(), c->GetName(), 0, msg.sText, msg.iChatType, msg.translate);
  
      if (c->GetActor()->GetCharacterData()->GetTotalOnlineTime() > 3600)
***************
*** 329,333 ****
  void ChatManager::SendSay(uint32_t clientNum, gemActor *actor, psChatMessage& msg,const char* who)
  {
!     psChatMessage newMsg(clientNum, who, msg.sText, msg.iChatType, msg.translate);
      csArray<PublishDestination>& clients = actor->GetMulticastClients();
      newMsg.Multicast(clients, 0, CHAT_SAY_RANGE );
--- 329,333 ----
  void ChatManager::SendSay(uint32_t clientNum, gemActor *actor, psChatMessage& msg,const char* who)
  {
!     psChatMessage newMsg(clientNum, who, 0, msg.sText, msg.iChatType, msg.translate);
      csArray<PublishDestination>& clients = actor->GetMulticastClients();
      newMsg.Multicast(clients, 0, CHAT_SAY_RANGE );
***************
*** 377,381 ****
              if (level!=NULL  &&  level->HasRights(RIGHTS_VIEW_CHAT))
              {
!                 psChatMessage newMsg(client->GetClientNum(), sender, msg.sText, msg.iChatType, msg.translate);
                  newMsg.SendMessage();
              }
--- 377,381 ----
              if (level!=NULL  &&  level->HasRights(RIGHTS_VIEW_CHAT))
              {
!                 psChatMessage newMsg(client->GetClientNum(), sender, 0, msg.sText, msg.iChatType, msg.translate);
                  newMsg.SendMessage();
              }
***************
*** 389,393 ****
      if (group)
      {
!         psChatMessage newMsg(0, client->GetName(), msg.sText, msg.iChatType, msg.translate);
          group->Broadcast(newMsg.msg);
      }
--- 389,393 ----
      if (group)
      {
!         psChatMessage newMsg(0, client->GetName(), 0, msg.sText, msg.iChatType, msg.translate);
          group->Broadcast(newMsg.msg);
      }
***************
*** 409,417 ****
  
        // Create a new message and send it to that person if found
!     psChatMessage cmsg(p->GetClientNum(), who, msg.sText, msg.iChatType, msg.translate);
      cmsg.SendMessage();
  
      // Echo the message back to the speaker also
!     psChatMessage cmsg2(client->GetClientNum(), msg.sPerson, msg.sText, CHAT_TELLSELF, msg.translate);
      cmsg2.SendMessage();
  }
--- 409,417 ----
  
        // Create a new message and send it to that person if found
!     psChatMessage cmsg(p->GetClientNum(), who, 0, msg.sText, msg.iChatType, msg.translate);
      cmsg.SendMessage();
  
      // Echo the message back to the speaker also
!     psChatMessage cmsg2(client->GetClientNum(), msg.sPerson, 0, msg.sText, CHAT_TELLSELF, msg.translate);
      cmsg2.SendMessage();
  }

Index: gem.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/gem.cpp,v
retrieving revision 1.488
retrieving revision 1.489
diff -C2 -d -r1.488 -r1.489
*** gem.cpp	25 Sep 2007 21:04:10 -0000	1.488
--- gem.cpp	30 Sep 2007 12:28:55 -0000	1.489
***************
*** 3140,3144 ****
      else 
          timeDelay += (csTicks)(1000 + 30*strlen(actText));
!     psChatMessage msg(destClientID,GetName(),actText,chtype,false);
      
      psserver->GetEventManager()->SendMessageDelayed(msg.msg,timeDelay);
--- 3140,3144 ----
      else 
          timeDelay += (csTicks)(1000 + 30*strlen(actText));
!     psChatMessage msg(destClientID,GetName(),0,actText,chtype,false);
      
      psserver->GetEventManager()->SendMessageDelayed(msg.msg,timeDelay);
***************
*** 3677,3681 ****
  
              // Some NPC responses are now in the form of private tells.
!             psChatMessage newMsg(who->GetClientNum(), GetName(), strsay, CHAT_NPC, false);
  
              // first response gets 2 seconds delay to simulate NPC thinking
--- 3677,3681 ----
  
              // Some NPC responses are now in the form of private tells.
!             psChatMessage newMsg(who->GetClientNum(), GetName(), 0, strsay, CHAT_NPC, false);
  
              // first response gets 2 seconds delay to simulate NPC thinking
***************
*** 3691,3695 ****
              Notify2(LOG_CHAT,"Public NPC Response: %s\n",strsay);
              // Some NPC responses are now in the form of public /says.
!             psChatMessage newMsg(0, GetName(), strsay, CHAT_NPC, false);
              newMsg.Multicast(GetMulticastClients(), 0, CHAT_SAY_RANGE );
          }
--- 3691,3695 ----
              Notify2(LOG_CHAT,"Public NPC Response: %s\n",strsay);
              // Some NPC responses are now in the form of public /says.
!             psChatMessage newMsg(0, GetName(), 0, strsay, CHAT_NPC, false);
              newMsg.Multicast(GetMulticastClients(), 0, CHAT_SAY_RANGE );
          }

Index: groupmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/groupmanager.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** groupmanager.cpp	22 Jul 2007 10:07:39 -0000	1.53
--- groupmanager.cpp	30 Sep 2007 12:28:55 -0000	1.54
***************
*** 569,573 ****
      va_end(args);
  
!     psChatMessage groupmsg(client->GetClientID(),"System",text,CHAT_GROUP, false);
      if (groupmsg.valid)
      {
--- 569,573 ----
      va_end(args);
  
!     psChatMessage groupmsg(client->GetClientID(),"System",0,text,CHAT_GROUP, false);
      if (groupmsg.valid)
      {

Index: guildmanager.cpp
===================================================================
RCS file: /cvsroot/planeshift/planeshift/src/server/guildmanager.cpp,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -d -r1.155 -r1.156
*** guildmanager.cpp	22 Jul 2007 10:07:39 -0000	1.155
--- guildmanager.cpp	30 Sep 2007 12:28:55 -0000	1.156
***************
*** 1378,1382 ****
      csString text;
      text.Format("Player %s has joined the guild!",invite->inviteeName.GetData() );
!     psChatMessage guildmsg(invite->inviterClientNum,"System",text,CHAT_GUILD, false);
      chatserver->SendGuild(inviteeClient->GetCharacterData()->GetCharName(), guild, guildmsg);
  
--- 1378,1382 ----
      csString text;
      text.Format("Player %s has joined the guild!",invite->inviteeName.GetData() );
!     psChatMessage guildmsg(invite->inviterClientNum,"System",0,text,CHAT_GUILD, false);
      chatserver->SendGuild(inviteeClient->GetCharacterData()->GetCharName(), guild, guildmsg);
  
***************
*** 1467,1471 ****
      csString text;
      text.Format("Player %s has left the guild.", (const char *)msg.player );
!     psChatMessage guildmsg(0,"System",text,CHAT_GUILD, false);
      chatserver->SendGuild("server", gi, guildmsg);
      
--- 1467,1471 ----
      csString text;
      text.Format("Player %s has left the guild.", (const char *)msg.player );
!     psChatMessage guildmsg(0,"System",0,text,CHAT_GUILD, false);
      chatserver->SendGuild("server", gi, guildmsg);
      
***************
*** 1545,1549 ****
      csString text;
      text.Format("Guild level %d is now called: %s", msg.level, (const char *)msg.levelname );
!     psChatMessage guildmsg(clientnum,"System",text,CHAT_GUILD, false);
      if (guildmsg.valid)
          chatserver->SendGuild(client->GetCharacterData()->GetCharName(), gi, guildmsg);
--- 1545,1549 ----
      csString text;
      text.Format("Guild level %d is now called: %s", msg.level, (const char *)msg.levelname );
!     psChatMessage guildmsg(clientnum,"System",0,text,CHAT_GUILD, false);
      if (guildmsg.valid)
          chatserver->SendGuild(client->GetCharacterData()->GetCharName(), gi, guildmsg);
***************
*** 1631,1635 ****
      csString text;
      text.Format("%s has been promoted to '%s'", (const char *)msg.player, target->guildlevel->title.GetData() );
!     psChatMessage guildmsg(clientnum,"System",text,CHAT_GUILD, false);
      if (guildmsg.valid)
          chatserver->SendGuild(client->GetCharacterData()->GetCharName(), guild, guildmsg);
--- 1631,1635 ----
      csString text;
      text.Format("%s has been promoted to '%s'", (const char *)msg.player, target->guildlevel->title.GetData() );
!     psChatMessage guildmsg(clientnum,"System",0,text,CHAT_GUILD, false);
      if (guildmsg.valid)
          chatserver->SendGuild(client->GetCharacterData()->GetCharName(), guild, guildmsg);