From: Andy D. <kha...@us...> - 2004-09-02 18:23:32
|
Update of /cvsroot/planeshift/planeshift/src/server/bulkobjects In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27228/src/server/bulkobjects Modified Files: psnpcloader.cpp Log Message: Made importnpc and exportnpc compatible with the new npc file format. Index: psnpcloader.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/server/bulkobjects/psnpcloader.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** psnpcloader.cpp 2 Sep 2004 14:05:30 -0000 1.14 --- psnpcloader.cpp 2 Sep 2004 18:23:22 -0000 1.15 *************** *** 755,761 **** { // <response> ! // <pronoun him=".." her=".." it=".." them=".."/> ! // <say value="..."/> ! // <say value="..."/> // <script> // ... --- 755,760 ---- { // <response> ! // <response pronoun_him=".." pronoun_her=".." pronoun_it=".." them=".." say="..."/> ! // <response pronoun_him=".." pronoun_her=".." pronoun_it=".." them=".." say="..."/> // <script> // ... *************** *** 778,795 **** csString pronoun; ! if (him!="") ! pronoun += temp.Format("him=\"%s\" ",him.GetData()); ! if (her!="") ! pronoun += temp.Format("her=\"%s\" ",her.GetData()); ! ! if (it!="") ! pronoun += temp.Format("it=\"%s\" ",it.GetData()); ! if (them!="") ! pronoun += temp.Format("them=\"%s\" ",them.GetData()); ! if (pronoun!="") ! npcData+=csString("<pronoun ") + pronoun + csString(" />\n"); for (int i=0;i<5;i++) --- 777,791 ---- csString pronoun; ! if (!him.IsEmpty()) ! pronoun += temp.Format("pronoun_him=\"%s\" ",him.GetData()); ! if (!her.IsEmpty()) ! pronoun += temp.Format("pronoun_her=\"%s\" ",her.GetData()); ! if (!it.IsEmpty()) ! pronoun += temp.Format("pronoun_it=\"%s\" ",it.GetData()); ! if (!them.IsEmpty()) ! pronoun += temp.Format("pronoun_them=\"%s\" ",them.GetData()); for (int i=0;i<5;i++) *************** *** 797,801 **** if (csString(result[0][i])!="") { ! npcData+= temp.Format("<say value=\"%s\"/>\n",result[0][i]); } } --- 793,800 ---- if (csString(result[0][i])!="") { ! if (pronoun.IsEmpty()) ! npcData+= temp.Format("<response say=\"%s\"/>\n",result[0][i]); ! else ! npcData+= temp.Format("<response %ssay=\"%s\"/>\n",pronoun,result[0][i]); } } |