From: <eva...@us...> - 2007-09-30 17:26:47
|
Update of /cvsroot/planeshift/planeshift/src/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15334/src/client Modified Files: chatbubbles.cpp Log Message: - Fixed FS#233 - Chat bubbles not shown for some NPCs. Now uses the first name to find the target actor in case the target NPC has both names. Index: chatbubbles.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/chatbubbles.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** chatbubbles.cpp 17 Aug 2007 04:11:00 -0000 1.6 --- chatbubbles.cpp 30 Sep 2007 17:26:48 -0000 1.7 *************** *** 192,196 **** psChatMessage chatMsg(msg); ! GEMClientActor* actor = psengine->GetCelClient()->GetActorByName(chatMsg.sPerson); if (!actor) return; --- 192,203 ---- psChatMessage chatMsg(msg); ! // Get the first name of the person (needed for NPCs with both the first and the last name) ! csString firstName; ! if ((a = chatMsg.sPerson.FindFirst(' ')) != (size_t)-1) ! firstName = chatMsg.sPerson.Slice(0, a); ! else ! firstName = chatMsg.sPerson; ! ! GEMClientActor* actor = psengine->GetCelClient()->GetActorByName(firstName); if (!actor) return; |