commit 113b919df2fb1b5ff2d70925096bd28b4dc67d54
author Zesstra <zesstra@zesstra.de> Mon Jul 25 11:15:27 2016 +0200
committer Zesstra <zesstra@zesstra.de> Sat Jul 30 13:31:10 2016 +0200
tree 7a031096a45313922e2f01d820dc069cd1a1fe6d
parent bc1e21c42ed3ca96b99f8ff94f4eb6c702351473

Infos benutzen replace_personal

Infos hatten ihre eigene Version von replace_personal.
Die alten Modifier werden jetzt beim Eintragen mit
Add*Info() in die von replace_personal() konvertiert.
Die Varianten mit @CAP... sind entfallen, da sie
niemand benutzt. Dafuer schreibt replace_personal
nach Satzenden automatisch gross.

Change-Id: I15e9a4aa8f502995c4063be63344e35bc2790c25

std/npc/info.c

diff --git a/std/npc/info.c b/std/npc/info.c
index d66ee26..5ec3e6e 100644
--- a/std/npc/info.c
+++ b/std/npc/info.c
@@ -139,25 +139,26 @@
   return do_frage( text );
 }
 
-static string infoDefaultReplace(string pstring, object pl)
+// ersetzt die alten @... durch die von replace_personal.
+private string conv2replace_personal(string pstring)
 {
   pstring=" "+pstring;
   if (strstr(pstring,"@WER",0) >-1 )
-    pstring= regreplace(pstring,"@WER",pl->name(WER,1),1);
+    pstring= regreplace(pstring,"@WER","@WER1",1);
   if (strstr(pstring,"@WESSEN",0) >-1 )
-    pstring= regreplace(pstring,"@WESSEN",pl->name(WESSEN,1),1);
+    pstring= regreplace(pstring,"@WESSEN","@WESSEN1",1);
   if (strstr(pstring,"@WEM",0) >-1 )
-    pstring= regreplace(pstring,"@WEM",pl->name(WEM,1),1);
+    pstring= regreplace(pstring,"@WEM","@WEM1",1);
   if (strstr(pstring,"@WEN",0) >-1 )
-    pstring= regreplace(pstring,"@WEN",pl->name(WEN,1),1);
+    pstring= regreplace(pstring,"@WEN","@WEN1",1);
   if (strstr(pstring,"@CAP_WER",0) >-1 )
-    pstring= regreplace(pstring,"@CAP_WER",pl->Name(WER,1),1);
+    pstring= regreplace(pstring,"@CAP_WER","@WER1",1);
   if (strstr(pstring,"@CAP_WESSEN",0) >-1 )
-    pstring= regreplace(pstring,"@CAP_WESSEN",pl->Name(WESSEN,1),1);
+    pstring= regreplace(pstring,"@CAP_WESSEN","@WESSEN1",1);
   if (strstr(pstring,"@CAP_WEM",0) >-1 )
-    pstring= regreplace(pstring,"@CAP_WEM",pl->Name(WEM,1),1);
+    pstring= regreplace(pstring,"@CAP_WEM","@WEM1",1);
   if (strstr(pstring,"@CAP_WEN",0) >-1 )
-    pstring= regreplace(pstring,"@CAP_WEN",pl->Name(WEN,1),1);
+    pstring= regreplace(pstring,"@CAP_WEN","@WEN1",1);
 
   return pstring[1..];
 }
@@ -231,7 +232,7 @@
 
   // Replacements gehen auch in der Antwort des NPC. Das gibt den Antworten 
   // eine persoenliche Note, und so teuer is das auch nicht :)
-  answer = infoDefaultReplace(answer, this_player());
+  answer = replace_personal(answer, this_player(), 1);
 
   if( indent=info[1] )
   {
@@ -243,7 +244,7 @@
                                  this_object());
        if (stringp(silent))
        {
-          silent=infoDefaultReplace(silent, this_player());
+          silent=replace_personal(silent, this_player(), 1);
           send_room(environment(), silent, MT_LISTEN, "frage",
                     Name(WER,2)+" ", ({this_player()}));
        }
@@ -265,7 +266,7 @@
                                  this_object());
        if (stringp(silent))
        {
-          silent=infoDefaultReplace(silent, this_player());
+          silent=replace_personal(silent, this_player(), 1);
           send_room(environment(), silent, MT_LISTEN, "frage",
                     Name(WER,2)+" ", ({this_player()}) );
        }
@@ -283,11 +284,15 @@
  *---------------------------------------------------------------------------
  */
 
-public varargs void AddInfo(mixed key, mixed info, string indent, 
+public varargs void AddInfo(mixed key, mixed info, string indent,
                             mixed silent, mixed casebased ) {
 
   if (stringp(casebased))
     casebased=symbol_function(casebased,this_object());
+  if (stringp(info))
+    info = conv2replace_personal(info);
+  if (stringp(silent))
+    silent = conv2replace_personal(silent);
 
   if( pointerp( key ) ) {
     int i;