Commit: head - hunton_server (svn)

密猟オンラインサーバープログラム

Commit MetaInfo

• Revision: 17 (tree)
• Time: 2016-12-27 00:36:50
• Author: manjihq

Log Message

システムメッセージの書式を変更
（クライアント側で表示幅などを制御予定）

Change Summary

• modified: trunk/h-mesg
• modified: trunk/huntserv.c

Incremental Difference

--- trunk/huntserv.c	(revision 16)
+++ trunk/huntserv.c	(revision 17)
@@ -741,6 +741,74 @@
   return 0;
 }
 
+/* adjsut string length */
+/* (outbuffer no null-terminate) */
+static void
+adjust_string (char *poutbuffer, const char *pinbuffer, int nlimit,
+	       char fillchar)
+{
+  int i;
+  for (i = 0; i < nlimit && *pinbuffer != '\0'; i++)
+    {
+      unsigned char c = (unsigned char) *pinbuffer++;
+      if (c >= 0xc2 && c <= 0xfd)
+	{
+	  int ncount = 1;
+	  unsigned char c2;
+	  i++;
+	  if (i == nlimit)
+	    {
+	      *poutbuffer++ = fillchar;
+	      break;
+	    }
+	  else
+	    {
+	      *poutbuffer++ = (char) c;
+	    }
+	  for (; (c2 = (unsigned char) *pinbuffer++) != '\0'; ncount++, i++)
+	    {
+	      if (c2 >= 0x80 && c2 <= 0xbf)
+		{
+		  if (i == nlimit)
+		    {
+		      /* over size */
+		      for (; ncount > 0; ncount--)
+			{
+			  /* clear last sequence */
+			  *poutbuffer-- = fillchar;
+			}
+		      break;
+		    }
+		  else
+		    {
+		      *poutbuffer++ = (char) c2;
+		    }
+		}
+	      else
+		{
+		  /* found next character sequence */
+		  i--;
+		  pinbuffer--;
+		  break;
+		}
+	    }
+	  if (c2 == '\0')
+	    {
+	      /* null terminate  */
+	      break;
+	    }
+	}
+      else
+	{
+	  *poutbuffer++ = (char) c;
+	}
+    }
+  for (; i < nlimit; i++)
+    {
+      *poutbuffer++ = fillchar;
+    }
+}
+
 /* cut tail space (this use fixed single buffer!) */
 static const char *
 cut_tail (const char *p, int n)
@@ -1483,7 +1551,7 @@
 		{
 		  char namebuf[BUFFER_SIZE];
 		  memcpy (namebuf, User[i].myshop[j].name, USERNAME_LEN + 1);
-		  fprintf (optr, "%d,%d,%d,%-.24s\n",
+		  fprintf (optr, "%d,%d,%d,%s\n",
 			   User[i].myshop[j].build,
 			   User[i].myshop[j].pos.x, User[i].myshop[j].pos.y,
 			   CUTTAIL (namebuf));
@@ -1495,7 +1563,7 @@
 			  memcpy (namebuf,
 				  Weapon[User[i].myshop[j].list[0][k]].name,
 				  WEAPONNAME_LEN + 1);
-			  fprintf (optr, "%-.24s,%u,%u,%lu\n",
+			  fprintf (optr, "%s,%u,%u,%lu\n",
 				   CUTTAIL (namebuf),
 				   User[i].myshop[j].leftuse[0][k],
 				   User[i].myshop[j].count[0][k],
@@ -1506,7 +1574,7 @@
 			  memcpy (namebuf,
 				  Item[User[i].myshop[j].list[1][k]].name,
 				  ITEMNAME_LEN + 1);
-			  fprintf (optr, "%-.24s,%u,%u,%lu\n",
+			  fprintf (optr, "%s,%u,%u,%lu\n",
 				   CUTTAIL (namebuf),
 				   User[i].myshop[j].leftuse[1][k],
 				   User[i].myshop[j].count[1][k],
@@ -1972,7 +2040,8 @@
   p->left = left;
   if (pstr != NULL)
     {
-      strncpy (p->message, pstr, sizeof (p->message));
+      //strncpy (p->message, pstr, sizeof (p->message));
+      adjust_string (p->message, pstr, sizeof (p->message), 0);
     }
   else
     {
@@ -2129,7 +2198,7 @@
       memset (User[userno].statusinfo, 0, PACKET_MAX);
       memset (User[userno].mapdata, 0, PACKET_MAX);
       memcpy (work, User[userno].name, USERNAME_LEN);
-      printf ("user(%d)[%-.24s] logoff.\n", userno, CUTTAIL (work));
+      printf ("user(%d)[%s] logoff.\n", userno, CUTTAIL (work));
       User[userno].idletimer = 0;
     }
   ClearUser (userno);
@@ -2493,7 +2562,8 @@
 		  pmail->subject[0] = n;
 		  if (n)
 		    {
-		      strncpy (&pmail->subject[1], namebuf, n);
+		      //strncpy (&pmail->subject[1], namebuf, n);
+		      adjust_string (&pmail->subject[1], namebuf, n, 0);
 		    }
 		  for (j = 0; j < pmail->line; j++)
 		    {
@@ -2512,7 +2582,9 @@
 		      pmail->message[j][0] = n;
 		      if (n)
 			{
-			  strncpy (&pmail->message[j][1], namebuf, n);
+			  //strncpy (&pmail->message[j][1], namebuf, n);
+			  adjust_string (&pmail->message[j][1], namebuf, n,
+					 0);
 			}
 		    }
 		  if (j < pmail->line)
@@ -2560,9 +2632,9 @@
 	    }
 	  strncpy (namebuf, User[pmail->fromuser].name, USERNAME_LEN);
 	  namebuf[USERNAME_LEN] = '\0';
-	  fprintf (optr, "%d,%d,%lu\n%-.24s\n",
+	  fprintf (optr, "%d,%d,%lu\n%s\n",
 		   pmail->readflag, pmail->line, pmail->timestamp,
-		   CUTTAIL (namebuf));
+		   cut_tail (namebuf, USERNAME_LEN));
 	  n = (unsigned char) (pmail->subject[0]);
 	  if (n)
 	    {
@@ -2703,7 +2775,8 @@
 		  pmail->subject[0] = n;
 		  if (n)
 		    {
-		      strncpy (&pmail->subject[1], namebuf, n);
+		      //strncpy (&pmail->subject[1], namebuf, n);
+		      adjust_string (&pmail->subject[1], namebuf, n, 0);
 		    }
 		  for (j = 0; j < pmail->line; j++)
 		    {
@@ -2722,7 +2795,9 @@
 		      pmail->message[j][0] = n;
 		      if (n)
 			{
-			  strncpy (&pmail->message[j][1], namebuf, n);
+			  //strncpy (&pmail->message[j][1], namebuf, n);
+			  adjust_string (&pmail->message[j][1], namebuf, n,
+					 0);
 			}
 		    }
 		  if (j < pmail->line)
@@ -2770,9 +2845,9 @@
 	    }
 	  strncpy (namebuf, User[pmail->fromuser].name, USERNAME_LEN);
 	  namebuf[USERNAME_LEN] = '\0';
-	  fprintf (optr, "%d,%d,%lu\n%-.24s\n",
+	  fprintf (optr, "%d,%d,%lu\n%s\n",
 		   pmail->readflag, pmail->line, pmail->timestamp,
-		   CUTTAIL (namebuf));
+		   cut_tail (namebuf, USERNAME_LEN));
 	  n = (unsigned char) (pmail->subject[0]);
 	  if (n)
 	    {
@@ -3322,7 +3397,8 @@
 	      /* can't read data */
 	      break;
 	    }
-	  strncpy (p->name, namebuf, WEAPONNAME_LEN);
+	  //strncpy (p->name, namebuf, WEAPONNAME_LEN);
+	  adjust_string (p->name, namebuf, WEAPONNAME_LEN, 0);
 	  p->b_type = (enum bullet_type) b_type;
 	  n++;
 	}
@@ -3384,7 +3460,8 @@
 	      /* can't read data */
 	      break;
 	    }
-	  strncpy (p->name, namebuf, ITEMNAME_LEN);
+	  //strncpy (p->name, namebuf, ITEMNAME_LEN);
+	  adjust_string (p->name, namebuf, ITEMNAME_LEN, 0);
 	  p->id = ntype;
 	  p->effect = neffect;
 	  p->count = ncount;
@@ -4435,8 +4512,8 @@
       if (User[nowner].myshop[nshop].count[n][i])
 	{
 	  sprintf (work,
-		   n ? MESG ("<%2d:%-32.32s:%10luP %4ucount (stock:%4u)>") :
-		   MESG ("<%2d:%-32.32s:%10luP %4uround (stock:%4u)>"),
+		   n ? MESG ("<%2d:%s:%10luP:%4ucount:(stock:%4u)>") :
+		   MESG ("<%2d:%s:%10luP:%4uround:(stock:%4u)>"),
 		   i,
 		   (n ? Item[User[nowner].myshop[nshop].list[n][i]].name :
 		    Weapon[User[nowner].myshop[nshop].list[n][i]].name),
@@ -4479,8 +4556,8 @@
 	{
 	  WEAPONINFO *pw = Weapon + plist[i];
 	  sprintf (work,
-		   MESG ("<%3d:%-32.32s:%10luP %4uround HP%4u/Moral%4u "
-			 "Range:%4ublock>"),
+		   MESG ("<%3d:%s:%10luP:%4uround:HP%4u/Moral%4u:"
+			 "Range %4ublock>"),
 		   i, pw->name, pw->cost, pw->bullette,
 		   pw->firepower, pw->moral, pw->range);
 	  SendSystemMessagePacket (nuser, work);
@@ -4520,7 +4597,7 @@
 	{
 	  ITEMINFO *pi = Item + plist[i];
 	  sprintf (work,
-		   MESG ("<%3d:%-32.32s:%10luP %4ucount>"),
+		   MESG ("<%3d:%s:%10luP:%4ucount>"),
 		   i, pi->name, pi->cost, pi->count);
 	  SendSystemMessagePacket (nuser, work);
 	}
@@ -4643,15 +4720,15 @@
 	  switch (t)
 	    {
 	    case TargetUser:
-	      sprintf (work, MESG ("%-.24s damages you. lost %uHP."),
+	      sprintf (work, MESG ("%s damages you. lost %uHP."),
 		       CUTTAIL (User[fromuser].name), ndamage);
 	      break;
 	    case TargetNpc:
-	      sprintf (work, MESG ("%-.24s damages you. lost %uHP."),
+	      sprintf (work, MESG ("%s damages you. lost %uHP."),
 		       CUTTAIL (Npc[fromuser].name), ndamage);
 	      break;
 	    case TargetAnimal:
-	      sprintf (work, MESG ("Animal '%-.24s' damages you. lost %uHP"),
+	      sprintf (work, MESG ("Animal '%s' damages you. lost %uHP"),
 		       CUTTAIL (Animal[fromuser].name), ndamage);
 	      break;
 	    default:
@@ -4664,7 +4741,7 @@
 	    }
 	  if (t == TargetUser)
 	    {
-	      sprintf (work, MESG ("You attack %-.24s"),
+	      sprintf (work, MESG ("You attack %s"),
 		       CUTTAIL (User[nuser].name));
 	      SendSystemMessagePacket (fromuser, work);
 	    }
@@ -4883,7 +4960,7 @@
 	      char uname[USERNAME_LEN];
 	      char work[PASSWORD_LEN];
 	      memcpy (uname, User[nuser].name, USERNAME_LEN);
-	      printf ("User name:%-.24s\n", CUTTAIL (uname));
+	      printf ("User name:%s\n", CUTTAIL (uname));
 	      for (i = 0; i < PASSWORD_LEN; i++)
 		{
 		  char c = (char) *(p + i);
@@ -4976,8 +5053,7 @@
 		}
 	      else
 		{
-		  printf ("Blocked User:%-.24s\n",
-			  CUTTAIL (User[nuser].name));
+		  printf ("Blocked User:%s\n", CUTTAIL (User[nuser].name));
 		}
 	      SendResultPacket (psession->handle, -1);
 	    }
@@ -5293,7 +5369,8 @@
     }
   if (nlen)
     {
-      strncpy (User[nuser].mesg_for_action, (char *) (p + 1), nlen);
+      //strncpy (User[nuser].mesg_for_action, (char *) (p + 1), nlen);
+      adjust_string (User[nuser].mesg_for_action, (char *) (p + 1), nlen, 0);
     }
   User[nuser].mesg_for_action[nlen] = '\0';
   return;
@@ -5304,8 +5381,13 @@
 doSay (int nuser, unsigned char *p)
 {
   User[nuser].action = DoSay;
+#if 0
   memcpy (User[nuser].mesg_for_action, p,
 	  sizeof (User[nuser].mesg_for_action));
+#else
+  adjust_string (User[nuser].mesg_for_action, (char *) p,
+		 sizeof (User[nuser].mesg_for_action), 0);
+#endif
   return;
 }
 
@@ -5314,8 +5396,13 @@
 doTell (int nuser, unsigned char *p)
 {
   User[nuser].action = DoTell;
+#if 0
   memcpy (User[nuser].mesg_for_action, p,
 	  sizeof (User[nuser].mesg_for_action));
+#else
+  adjust_string (User[nuser].mesg_for_action, (char *) p,
+		 sizeof (User[nuser].mesg_for_action), 0);
+#endif
   return;
 }
 
@@ -5324,8 +5411,13 @@
 doBroadcast (int nuser, unsigned char *p)
 {
   User[nuser].action = DoBroadcast;
+#if 0
   memcpy (User[nuser].mesg_for_action, p,
 	  sizeof (User[nuser].mesg_for_action));
+#else
+  adjust_string (User[nuser].mesg_for_action, (char *) p,
+		 sizeof (User[nuser].mesg_for_action), 0);
+#endif
   return;
 }
 
@@ -5557,10 +5649,10 @@
 	}
       dec_score (nuser, n + ntax);
       add_score (ndist, n);
-      sprintf (work, MESG ("[You transfer %upoint to %-.24s. Tax:%upoint]"),
+      sprintf (work, MESG ("[You transfer %upoint to %s. Tax:%upoint]"),
 	       n, CUTTAIL (User[ndist].name), ntax);
       SendSystemMessagePacket (nuser, work);
-      sprintf (work, MESG ("[You receive %upoint from %-.24s]"),
+      sprintf (work, MESG ("[You receive %upoint from %s]"),
 	       n, CUTTAIL (User[nuser].name));
       SendSystemMessagePacket (ndist, work);
     }
@@ -5602,11 +5694,10 @@
 	{
 	  /* block user account */
 	  puts ("block user account");
-	  printf ("User %d [%-.24s]\n", ntarget,
-		  CUTTAIL (User[ntarget].name));
+	  printf ("User %d [%s]\n", ntarget, CUTTAIL (User[ntarget].name));
 	  DisconnectUser (ntarget);
 	  User[ntarget].account_status = AccountBlock;
-	  sprintf (work, MESG ("[user '%-.24s' is blocked]"),
+	  sprintf (work, MESG ("[user '%s' is blocked]"),
 		   CUTTAIL (User[ntarget].name));
 	  SendSystemMessagePacket (0, work);
 	}
@@ -5614,10 +5705,9 @@
 	{
 	  /* recover user account */
 	  puts ("recover user account");
-	  printf ("User %d [%-.24s]\n", ntarget,
-		  CUTTAIL (User[ntarget].name));
+	  printf ("User %d [%s]\n", ntarget, CUTTAIL (User[ntarget].name));
 	  User[ntarget].account_status = AccountActive;
-	  sprintf (work, MESG ("[user '%-.24s' is recoverd]"),
+	  sprintf (work, MESG ("[user '%s' is recoverd]"),
 		   CUTTAIL (User[ntarget].name));
 	  SendSystemMessagePacket (0, work);
 	}
@@ -5661,9 +5751,9 @@
 	{
 	  wkpassword[i] = ' ';
 	}
-      printf ("Change %-.24s password\n", CUTTAIL (User[nuser].name));
+      printf ("Change %s password\n", CUTTAIL (User[nuser].name));
       memcpy (User[nuser].password, wkpassword, PASSWORD_LEN);
-      sprintf (work, MESG ("[user '%-.24s' password is changed]"),
+      sprintf (work, MESG ("[user '%s' password is changed]"),
 	       CUTTAIL (User[nuser].name));
       SendSystemMessagePacket (0, work);
     }
@@ -5877,7 +5967,7 @@
 	    {
 	      char uname[USERNAME_LEN];
 	      memcpy (uname, User[ntarget].name, USERNAME_LEN);
-	      printf ("Delete User name:%-.24s\n", CUTTAIL (uname));
+	      printf ("Delete User name:%s\n", CUTTAIL (uname));
 	      DeleteUser (ntarget);
 	      SendSystemMessagePacket (nuser, "[Delete complete]");
 	    }
@@ -5889,7 +5979,7 @@
 	}
       else
 	{
-	  printf ("User:%d [%-.24s] is cracking!\n", nuser,
+	  printf ("User:%d [%s] is cracking!\n", nuser,
 		  CUTTAIL (User[nuser].name));
 	  SendSystemMessagePacket (nuser, "[uh?]");
 	}
@@ -5991,12 +6081,11 @@
 	  switch (User[i].crime_level)
 	    {
 	    case 1:
-	      sprintf (work, MESG ("<WANTED '%-.24s'>"),
-		       CUTTAIL (User[i].name));
+	      sprintf (work, MESG ("<WANTED '%s'>"), CUTTAIL (User[i].name));
 	      SendSystemMessagePacket (nuser, work);
 	      break;
 	    case 2:
-	      sprintf (work, MESG ("<Dead or Alive '%-.24s'>"),
+	      sprintf (work, MESG ("<Dead or Alive '%s'>"),
 		       CUTTAIL (User[i].name));
 	      SendSystemMessagePacket (nuser, work);
 	      break;
@@ -6337,8 +6426,7 @@
 	      name_len = sizeof (Weapon[n].name);
 	    }
 	  User[nuser].myshop[nshop].count[isitem][i]++;
-	  sprintf (work, MESG ("[%-.24s stocked]"),
-		   cut_tail (pname, name_len));
+	  sprintf (work, MESG ("[%s stocked]"), cut_tail (pname, name_len));
 	  SendSystemMessagePacket (nuser, work);
 	}
       else
@@ -6605,7 +6693,7 @@
 	{
 	  nlen = PACKET_DATA_MAX - USERNAME_LEN - 10;
 	}
-      sprintf (work, "You tell %-.24s,", CUTTAIL (User[destuser].name));
+      sprintf (work, "You tell %s,", CUTTAIL (User[destuser].name));
       if (nlen)
 	{
 	  memcpy (work + USERNAME_LEN + 10, p + 1 + USERNAME_LEN, nlen);
@@ -6641,7 +6729,7 @@
   else
     {
       char work[PACKET_DATA_MAX];
-      sprintf (work, MESG ("[Weapon:%-32.32s NOT READY]"),
+      sprintf (work, MESG ("[Weapon:%s NOT READY]"),
 	       Weapon[User[nuser].weapon[nweapon]].name);
       SendSystemMessagePacket (nuser, work);
     }
@@ -6693,7 +6781,7 @@
 	    {
 	      /* list up this */
 	      int relpos = get_rel_position_in (dx1, dx2, dy1, dy2);
-	      sprintf (work, MESG ("<%-.24s %10s %5dBlock>"),
+	      sprintf (work, MESG ("<%s:%s:%5dBlock>"),
 		       CUTTAIL (Animal[i].name),
 		       MESG (RelDirection[relpos]), n);
 	      SendSystemMessagePacket (nuser, work);
@@ -6734,7 +6822,7 @@
 	      if (User[i].c_type == Hunter)
 		{
 		  sprintf (work,
-			   MESG ("<Hunter:%-.24s %10s %5dBlock crime:%lu>"),
+			   MESG ("<Hunter:%s:%10s:%5dBlock:crime %lu>"),
 			   CUTTAIL (User[i].name),
 			   MESG (RelDirection[relpos]), n,
 			   User[i].maybearrest);
@@ -6742,7 +6830,7 @@
 	      else
 		{
 		  sprintf (work,
-			   MESG ("<Guard :%-.24s %10s %5dBlock>"),
+			   MESG ("<Guard :%s:%10s:%5dBlock>"),
 			   CUTTAIL (User[i].name),
 			   MESG (RelDirection[relpos]), n);
 		}
@@ -6777,13 +6865,13 @@
 	      if (Npc[i].c_type == NpcHunter)
 		{
 		  sprintf (work,
-			   MESG ("<Hunter:%-.24s %10s %5dBlock crime:NA>"),
+			   MESG ("<Hunter:%s:%10s:%5dBlock:crime NA>"),
 			   CUTTAIL (Npc[i].name),
 			   MESG (RelDirection[relpos]), n);
 		}
 	      else
 		{
-		  sprintf (work, MESG ("<Guard :%-.24s %10s %5dBlock>"),
+		  sprintf (work, MESG ("<Guard :%s:%10s:%5dBlock>"),
 			   CUTTAIL (Npc[i].name),
 			   MESG (RelDirection[relpos]), n);
 		}
@@ -6861,10 +6949,10 @@
       if (Npc[i].name[0] == '\0')
 	{
 	  static const char *mesg[4] = {
-	    "%-.24s say,OK Boss. I will guard you.",
-	    "%-.24s say,Ready for deployment",
-	    "%-.24s say,It's show time!",
-	    "%-.24s say,Do you wanna use my design?"
+	    "%s say,OK Boss. I will guard you.",
+	    "%s say,Ready for deployment",
+	    "%s say,It's show time!",
+	    "%s say,Do you wanna use my design?"
 	  };
 	  static const int ck_x[8] = { 0, 1, 1, 1, 0, -1, -1, -1 };
 	  static const int ck_y[8] = { -1, -1, 0, 1, 1, 1, 0, -1 };
@@ -7018,13 +7106,13 @@
 	    }
 	  break;
 	case Vehicle:
-	  sprintf (work, MESG ("You ride on %-.24s"), CUTTAIL (pitem->name));
+	  sprintf (work, MESG ("You ride on %s"), CUTTAIL (pitem->name));
 	  rideVehicle (nuser, pitem->effect % 100, pitem->effect / 100,
 		       pitem->pattern);
 	  break;
 	case Food:
 	  cause_eat (nuser, pitem->effect);
-	  sprintf (work, MESG ("You eat %-.24s..."), CUTTAIL (pitem->name));
+	  sprintf (work, MESG ("You eat %s..."), CUTTAIL (pitem->name));
 	  if (pitem->effect > 100)
 	    {
 	      strcat (work, MESG ("Delicious!"));
@@ -7087,7 +7175,7 @@
     }
   User[nuser].item[i] = nitem;
   User[nuser].itemcount[i] = Item[User[nuser].item[i]].count;
-  sprintf (work, MESG ("[Get item%1d:%-.24s]"),
+  sprintf (work, MESG ("[Get item%1d:%s]"),
 	   i + 1, CUTTAIL (Item[User[nuser].item[i]].name));
   SendSystemMessagePacket (nuser, work);
   return i;
@@ -7115,7 +7203,7 @@
   User[nuser].weapon[i] = nweapon;
   User[nuser].bullette[i] = Weapon[User[nuser].weapon[i]].bullette;
   User[nuser].reload[i] = 0;
-  sprintf (work, MESG ("[Get weapon%1d:%-.24s]"),
+  sprintf (work, MESG ("[Get weapon%1d:%s]"),
 	   i + 1, CUTTAIL (Weapon[User[nuser].weapon[i]].name));
   SendSystemMessagePacket (nuser, work);
   return i;
@@ -7211,7 +7299,7 @@
 	{
 	  /* can't get this. drop original position */
 	  char work[MESG_BUFFER];
-	  sprintf (work, MESG ("[You have no space to get %-.24s!]"),
+	  sprintf (work, MESG ("[You have no space to get %s!]"),
 		   isitem ? CUTTAIL (Item[nitem].name) :
 		   CUTTAIL (Weapon[nitem].name));
 	  SendSystemMessagePacket (nuser, work);
@@ -7245,7 +7333,7 @@
 		}
 	      add_score (nuser, n);
 	      add_crime (nuser, n);
-	      sprintf (work, MESG ("[You catch %-.24s:%upoint]"),
+	      sprintf (work, MESG ("[You catch %s:%upoint]"),
 		       CUTTAIL (Animal[nanimal].name), n);
 	      SendSystemMessagePacket (nuser, work);
 	      DeleteAnimal (nanimal);
@@ -7266,7 +7354,7 @@
 	      /* it is animal corpse */
 	      char work[MESG_BUFFER];
 	      sprintf (work,
-		       MESG ("[You collect %-.24s's corpse:10point]"),
+		       MESG ("[You collect %s's corpse:10point]"),
 		       CUTTAIL (Animal[nanimal].name));
 	      SendSystemMessagePacket (nuser, work);
 	      MAP (x, y)->id &= ~MAP_THERE_ANIMAL;
@@ -7288,7 +7376,7 @@
 	{
 	  /* arrest! */
 	  char work[MESG_BUFFER];
-	  sprintf (work, MESG ("[You arrest %-.24s. Get 500point.]"),
+	  sprintf (work, MESG ("[You arrest %s. Get 500point.]"),
 		   CUTTAIL (Npc[npc].name));
 	  SendSystemMessagePacket (nuser, work);
 	  add_score (nuser, 500);
@@ -7317,10 +7405,10 @@
 		  break;
 		}
 	      User[ntarget].crime_level = 0;
-	      sprintf (work, MESG ("[You arrest %-.24s. Get %lupoint.]"),
+	      sprintf (work, MESG ("[You arrest %s. Get %lupoint.]"),
 		       CUTTAIL (User[ntarget].name), npts);
 	      SendSystemMessagePacket (nuser, work);
-	      sprintf (work, MESG ("[You were arrested by %-.24s]"),
+	      sprintf (work, MESG ("[You were arrested by %s]"),
 		       CUTTAIL (User[nuser].name));
 	      SendSystemMessagePacket (ntarget, work);
 	      SendSystemMessagePacket (ntarget, MESG ("[Go to Jail!]"));
@@ -7336,11 +7424,11 @@
 	    }
 	  else
 	    {
-	      sprintf (work, MESG ("[You attempt to arrest %-.24s]"),
+	      sprintf (work, MESG ("[You attempt to arrest %s]"),
 		       CUTTAIL (User[ntarget].name));
 	      SendSystemMessagePacket (nuser, work);
 	      SendSystemMessagePacket (nuser, MESG ("[But he do not crime]"));
-	      sprintf (work, MESG ("[%-.24s attempt to arrest you]"),
+	      sprintf (work, MESG ("[%s attempt to arrest you]"),
 		       CUTTAIL (User[nuser].name));
 	      SendSystemMessagePacket (ntarget, work);
 	      SendSystemMessagePacket (ntarget,
@@ -7662,7 +7750,7 @@
 	{
 	  char work[MESG_BUFFER];
 	  sprintf (work,
-		   MESG ("<%d:%-.24s (%3d,%3d)>"), i + 1,
+		   MESG ("<%d:%s:(%3d,%3d)>"), i + 1,
 		   CUTTAIL (User[nuser].myshop[i].name),
 		   User[nuser].myshop[i].pos.x, User[nuser].myshop[i].pos.y);
 	  SendSystemMessagePacket (nuser, work);
@@ -7686,7 +7774,7 @@
       if (p != NULL)
 	{
 	  strncpy (namebuffer, CUTTAIL (p->name), sizeof (namebuffer));
-	  sprintf (work, MESG ("<%d:%-.24s(%-.24s)>"), i + 1, namebuffer,
+	  sprintf (work, MESG ("<%d:%s(%s)>"), i + 1, namebuffer,
 		   CUTTAIL (Item[p->forsell_item].name));
 	  SendSystemMessagePacket (nuser, work);
 	}
@@ -7791,7 +7879,7 @@
     {
       if (animal[i])
 	{
-	  sprintf (work, MESG ("<'%-.24s' lives:%3d rate:%3u value:%5u>"),
+	  sprintf (work, MESG ("<'%s':lives %3d:rate %3u:value %5u>"),
 		   CUTTAIL (AnimalData[i].name), animal[i],
 		   AnimalData[i].rate, AnimalData[i].value);
 	  SendSystemMessagePacket (nuser, work);
@@ -7835,7 +7923,7 @@
 	    {
 	      strcpy (subjectbuffer, "NO SUBJECT");
 	    }
-	  sprintf (work, "<%c%2d:%-.24s %-.32s>",
+	  sprintf (work, "<%c%2d:%s %s>",
 		   pmail->readflag ? ' ' : '*', i + 1,
 		   CUTTAIL (User[pmail->fromuser].name), subjectbuffer);
 	  SendSystemMessagePacket (nuser, work);
@@ -7929,7 +8017,7 @@
 	    {
 	      strcpy (subjectbuffer, "NO SUBJECT");
 	    }
-	  sprintf (work, "<%2d:%-.24s %-.32s>",
+	  sprintf (work, "<%2d:%s %s>",
 		   i + 1, CUTTAIL (User[pmail->fromuser].name),
 		   subjectbuffer);
 	  SendSystemMessagePacket (nuser, work);
@@ -8211,11 +8299,11 @@
 		    {
 		      if (pb->t_type == TargetUser)
 			{
-			  sprintf (work, MESG ("You attack animal '%-.24s'"),
+			  sprintf (work, MESG ("You attack animal '%s'"),
 				   CUTTAIL (Animal[nanimal].name));
 			  SendSystemMessagePacket (pb->nuser, work);
 			}
-		      sprintf (work, MESG ("[%-.24s shoot animal!]"),
+		      sprintf (work, MESG ("[%s shoot animal!]"),
 			       cut_tail (((pb->t_type == TargetUser) ?
 					  User[pb->nuser].name :
 					  Npc[pb->nuser].name),
@@ -8236,7 +8324,7 @@
 		      if (pb->nuser != -1 && pb->t_type == TargetUser)
 			{
 			  sprintf (work,
-				   MESG ("animal '%-.24s' died."),
+				   MESG ("animal '%s' died."),
 				   CUTTAIL (Animal[nanimal].name));
 			  SendSystemMessagePacket (pb->nuser, work);
 			  if (CountLiveAnimal (Animal[nanimal].pdata) == 0)
@@ -8244,7 +8332,7 @@
 			      /* this is last animal! */
 			      sprintf (work,
 				       MESG
-				       ("[animal '%-.24s' is extermination!]"),
+				       ("[animal '%s' is extermination!]"),
 				       CUTTAIL (Animal[nanimal].name));
 			      SendSystemMessagePacket (pb->nuser, work);
 			      if (User[pb->nuser].c_type == Observer)
@@ -8281,7 +8369,7 @@
 		    {
 		      if (pb->nuser != -1 && pb->t_type == TargetUser)
 			{
-			  sprintf (work, MESG ("animal '%-.24s' stun."),
+			  sprintf (work, MESG ("animal '%s' stun."),
 				   CUTTAIL (Animal[nanimal].name));
 			  SendSystemMessagePacket (pb->nuser, work);
 			}
@@ -8299,7 +8387,7 @@
 				{
 				  sprintf (work,
 					   MESG
-					   ("You charm animal '%-.24s'!"),
+					   ("You charm animal '%s'!"),
 					   CUTTAIL (Animal[nanimal].name));
 				  SendSystemMessagePacket (pb->nuser, work);
 				  Animal[nanimal].owner_user = pb->nuser;
@@ -8308,7 +8396,7 @@
 				{
 				  sprintf (work,
 					   MESG
-					   ("Animal '%-.24s' is free now!"),
+					   ("Animal '%s' is free now!"),
 					   CUTTAIL (Animal[nanimal].name));
 				  SendMessageNearUserPosition (pb->pos, work);
 				  Animal[nanimal].owner_user = -1;
@@ -8319,7 +8407,7 @@
 			      /* fail */
 			      sprintf (work,
 				       MESG
-				       ("You fail to charm animal '%-.24s'."),
+				       ("You fail to charm animal '%s'."),
 				       CUTTAIL (Animal[nanimal].name));
 			      SendSystemMessagePacket (pb->nuser, work);
 			    }
@@ -8369,7 +8457,7 @@
 		  char work[MESG_BUFFER];
 		  if (pb->nuser != -1 && pb->t_type == TargetUser)
 		    {
-		      sprintf (work, MESG ("You attack '%-.24s'"),
+		      sprintf (work, MESG ("You attack '%s'"),
 			       CUTTAIL (Npc[npc].name));
 		      SendSystemMessagePacket (pb->nuser, work);
 		    }
@@ -8378,7 +8466,7 @@
 		    {
 		      if (pb->nuser != -1 && pb->t_type == TargetUser)
 			{
-			  sprintf (work, MESG ("'%-.24s' died."),
+			  sprintf (work, MESG ("'%s' died."),
 				   CUTTAIL (Npc[npc].name));
 			  SendSystemMessagePacket (pb->nuser, work);
 			  if (User[pb->nuser].c_type == Hunter &&
@@ -8399,13 +8487,13 @@
 			      strncpy (namebuffer, CUTTAIL (Npc[npc].name),
 				       sizeof (namebuffer));
 			      sprintf (work,
-				       MESG ("'%-.24s' killed by %-.24s!"),
+				       MESG ("'%s' killed by %s!"),
 				       namebuffer,
 				       CUTTAIL (Npc[pb->nuser].name));
 			    }
 			  else
 			    {
-			      sprintf (work, MESG ("'%-.24s' killed by any!"),
+			      sprintf (work, MESG ("'%s' killed by any!"),
 				       CUTTAIL (Npc[npc].name));
 			    }
 			  SendMessageNearUserPosition (Npc[npc].pos, work);
@@ -8423,11 +8511,11 @@
 			  if (!(pb->t_type == TargetNpc && pb->nuser == npc))
 			    {
 			      static const char *mesg[5] = {
-				"%-.24s say,Hey! Why do you attack me?",
-				"%-.24s say,No! Don't shoot me!",
-				"%-.24s say,What's think?!",
-				"%-.24s say,Ohch! We are under fire!",
-				"%-.24s say,Ok. I will kill you."
+				"%s say,Hey! Why do you attack me?",
+				"%s say,No! Don't shoot me!",
+				"%s say,What's think?!",
+				"%s say,Ohch! We are under fire!",
+				"%s say,Ok. I will kill you."
 			      };
 			      NPCsay (npc, mesg, 5);
 			      Npc[npc].ntarget_user = pb->nuser;
@@ -8454,11 +8542,11 @@
 			  if (willcounter)
 			    {
 			      static const char *mesg[5] = {
-				"%-.24s say,Detect one boggy!",
-				"%-.24s say,We are under attack!",
-				"%-.24s say,Engage!",
-				"%-.24s say,Caution! Enemy fire!",
-				"%-.24s say,Emergency! Enemy attack us!"
+				"%s say,Detect one boggy!",
+				"%s say,We are under attack!",
+				"%s say,Engage!",
+				"%s say,Caution! Enemy fire!",
+				"%s say,Emergency! Enemy attack us!"
 			      };
 			      NPCsay (npc, mesg, 5);
 			      Npc[npc].ntarget_user = pb->nuser;
@@ -8467,11 +8555,11 @@
 			  else
 			    {
 			      static const char *mesg[5] = {
-				"%-.24s say,Hey! No shoot me!",
-				"%-.24s say,I'm friendly!",
-				"%-.24s say,This is friendly! Don't shoot!",
-				"%-.24s say,Don't shoot! Are you enemy's spy?",
-				"%-.24s say,Take more care!"
+				"%s say,Hey! No shoot me!",
+				"%s say,I'm friendly!",
+				"%s say,This is friendly! Don't shoot!",
+				"%s say,Don't shoot! Are you enemy's spy?",
+				"%s say,Take more care!"
 			      };
 			      NPCsay (npc, mesg, 5);
 			    }
@@ -8614,7 +8702,7 @@
 		  int nuser = User[i].lastuser;
 		  if (User[i].lastuser_type == TargetUser)
 		    {
-		      sprintf (work, MESG ("[You kill %-.24s]"),
+		      sprintf (work, MESG ("[You kill %s]"),
 			       CUTTAIL (User[i].name));
 		      SendSystemMessagePacket (nuser, work);
 		    }
@@ -8640,7 +8728,7 @@
 		  if (pname != NULL)
 		    {
 		      sprintf (work,
-			       MESG ("[You were killed by %-.24s]"),
+			       MESG ("[You were killed by %s]"),
 			       cut_tail (pname, name_len));
 		      SendSystemMessagePacket (i, work);
 		    }
@@ -8789,7 +8877,7 @@
 	      User[i].hold_count = HoldCount;
 	      SendSystemMessagePacket (i, MESG ("[You fall in hole!]"));
 	      SendEffectFallInHolePacket (i);
-	      sprintf (work, MESG ("[You hear sound %-.24s fall in hole]"),
+	      sprintf (work, MESG ("[You hear sound %s fall in hole]"),
 		       CUTTAIL (User[i].name));
 	      SendMessageNearUser (i, work);
 	    }
@@ -8799,7 +8887,7 @@
 	      /* perhaps,disconnect session. */
 	      char work[USERNAME_LEN];
 	      memcpy (work, User[i].name, USERNAME_LEN);
-	      printf ("user(%d)[%-.24s] no response\n", i, CUTTAIL (work));
+	      printf ("user(%d)[%s] no response\n", i, CUTTAIL (work));
 	      DisconnectUser (i);
 	    }
 	}
@@ -8999,7 +9087,7 @@
       char namebuffer[24 + 1];
       strncpy (namebuffer, CUTTAIL (Animal[nanimal].name),
 	       sizeof (namebuffer));
-      sprintf (work, MESG ("animal '%-.24s' eat %-.24s"), namebuffer,
+      sprintf (work, MESG ("animal '%s' eat %s"), namebuffer,
 	       CUTTAIL (Animal[targetanimal].name));
       SendMessageNearUserPosition (Animal[nanimal].pos, work);
       MAP (Animal[targetanimal].pos.x, Animal[targetanimal].pos.y)->id &=
@@ -9069,11 +9157,11 @@
       if (Npc[npc].hp)
 	{
 	  static const char *mesg[5] = {
-	    "%-.24s say,Nooo!",
-	    "%-.24s say,Animal bite me!",
-	    "%-.24s say,Danger! This animal is ferocity!",
-	    "%-.24s say,Help! Animal bite ...Arrrrgh!",
-	    "%-.24s say,Why is this animal angry?"
+	    "%s say,Nooo!",
+	    "%s say,Animal bite me!",
+	    "%s say,Danger! This animal is ferocity!",
+	    "%s say,Help! Animal bite ...Arrrrgh!",
+	    "%s say,Why is this animal angry?"
 	  };
 	  NPCsay (npc, mesg, 5);
 	}
@@ -9080,7 +9168,7 @@
       if (Npc[npc].hp == 0)
 	{
 	  char work[MESG_BUFFER];
-	  sprintf (work, MESG ("'%-.24s' died."), CUTTAIL (Npc[npc].name));
+	  sprintf (work, MESG ("'%s' died."), CUTTAIL (Npc[npc].name));
 	  SendMessageNearUserPosition (Npc[npc].pos, work);
 	  Npc[npc].name[0] = '\0';
 	  MAP (Npc[npc].pos.x, Npc[npc].pos.y)->id &= ~MAP_THERE_NPC;
@@ -9606,7 +9694,7 @@
 		      Animal[i].hold_count = HoldCount;
 		      sprintf (work,
 			       MESG
-			       ("[You hear sound '%-.24s' fall in hole]"),
+			       ("[You hear sound '%s' fall in hole]"),
 			       CUTTAIL (Animal[i].name));
 		      SendMessageNearUserAnimal (i, work);
 		    }
@@ -9999,11 +10087,11 @@
 	  if (ret == 0)
 	    {
 	      static const char *mesg[5] = {
-		"%-.24s say,FREEZE!",
-		"%-.24s say,FIRE!",
-		"%-.24s say,Hey! I know your position!",
-		"%-.24s say,You can't escape from me!",
-		"%-.24s say,Contact!"
+		"%s say,FREEZE!",
+		"%s say,FIRE!",
+		"%s say,Hey! I know your position!",
+		"%s say,You can't escape from me!",
+		"%s say,Contact!"
 	      };
 	      NPCsay (npc, mesg, 5);
 	    }
@@ -10016,11 +10104,11 @@
 	  if (User[ntarget_user].maybearrest)
 	    {
 	      static const char *mesg[5] = {
-		"%-.24s say,Do not move!",
-		"%-.24s say,You are criminal!",
-		"%-.24s say,Hold up!",
-		"%-.24s say,Do not escape! If you do so,I will shoot you!",
-		"%-.24s say,You should surrender!"
+		"%s say,Do not move!",
+		"%s say,You are criminal!",
+		"%s say,Hold up!",
+		"%s say,Do not escape! If you do so,I will shoot you!",
+		"%s say,You should surrender!"
 	      };
 	      NPCsay (npc, mesg, 5);
 	    }
@@ -10028,11 +10116,11 @@
 		   User[ntarget_user].crime_level)
 	    {
 	      static const char *mesg2[5] = {
-		"%-.24s say,Go out!",
-		"%-.24s say,You can't escape!",
-		"%-.24s say,You no have choise!",
-		"%-.24s say,Do anyone call SWAT? We need!",
-		"%-.24s say,We have surrounded you!"
+		"%s say,Go out!",
+		"%s say,You can't escape!",
+		"%s say,You no have choise!",
+		"%s say,Do anyone call SWAT? We need!",
+		"%s say,We have surrounded you!"
 	      };
 	      NPCsay (npc, mesg2, 5);
 	    }
@@ -10099,7 +10187,7 @@
 	  char work[MESG_BUFFER];
 	  MAP (x, y)->id &= ~MAP_THERE_HOLE;
 	  Npc[n].hold_count = HoldCount;
-	  sprintf (work, MESG ("[You hear sound %-.24s fall in hole!]"),
+	  sprintf (work, MESG ("[You hear sound %s fall in hole!]"),
 		   CUTTAIL (Npc[n].name));
 	  SendMessageNearUserPosition (Npc[n].pos, work);
 	}
@@ -10122,9 +10210,9 @@
       if (getrand (1, 100) < HUNTER_SPEAK_RATE)
 	{
 	  static const char *mesg[3] = {
-	    "%-.24s say,Oh! I am innoucence!",
-	    "%-.24s say,Leave alone!",
-	    "%-.24s say,HELP ME! HELP! HELP!"
+	    "%s say,Oh! I am innoucence!",
+	    "%s say,Leave alone!",
+	    "%s say,HELP ME! HELP! HELP!"
 	  };
 	  NPCsay (n, mesg, 3);
 	}
@@ -10177,11 +10265,11 @@
 	  if (getrand (1, 100) < HUNTER_SPEAK_RATE)
 	    {
 	      static const char *mesg[5] = {
-		"%-.24s say,Anyone see animal?",
-		"%-.24s say,Oh sorry.",
-		"%-.24s say,Nice meet you!",
-		"%-.24s say,Hello. Is there anyone?",
-		"%-.24s say,I want any food. Anyone have?"
+		"%s say,Anyone see animal?",
+		"%s say,Oh sorry.",
+		"%s say,Nice meet you!",
+		"%s say,Hello. Is there anyone?",
+		"%s say,I want any food. Anyone have?"
 	      };
 	      NPCsay (n, mesg, 5);
 	    }
@@ -10211,8 +10299,7 @@
 		{
 		  /* get */
 		  char work[MESG_BUFFER];
-		  sprintf (work, MESG ("%-.24s say,Get!"),
-			   CUTTAIL (Npc[n].name));
+		  sprintf (work, MESG ("%s say,Get!"), CUTTAIL (Npc[n].name));
 		  SendMessageNearUserPosition (Npc[n].pos, work);
 		  MAP (Animal[ntarget].pos.x, Animal[ntarget].pos.y)->id &=
 		    ~MAP_THERE_ANIMAL;
@@ -10227,14 +10314,14 @@
 		      if (getrand (1, 100) < HUNTER_SPEAK_RATE)
 			{
 			  static const char *mesg_a[3] = {
-			    "%-.24s say,Fire! Fire!",
-			    "%-.24s say,Oh! This animal is strong!",
-			    "%-.24s say,Hey! Cover me!"
+			    "%s say,Fire! Fire!",
+			    "%s say,Oh! This animal is strong!",
+			    "%s say,Hey! Cover me!"
 			  };
 			  static const char *mesg_n[3] = {
-			    "%-.24s say,Fire! Fire! Fire!",
-			    "%-.24s say,We are under attack!",
-			    "%-.24s say,Anyone! Help me!"
+			    "%s say,Fire! Fire! Fire!",
+			    "%s say,We are under attack!",
+			    "%s say,Anyone! Help me!"
 			  };
 			  NPCsay (n,
 				  (t_type == TargetAnimal) ? mesg_a : mesg_n,
@@ -10257,14 +10344,14 @@
 	    {
 	      /* out of range */
 	      static const char *mesg_a[3] = {
-		"%-.24s say,OH NO! I miss animal!",
-		"%-.24s say,Hey! Don't you get my animal?",
-		"%-.24s say,I think animal enter hyper-space."
+		"%s say,OH NO! I miss animal!",
+		"%s say,Hey! Don't you get my animal?",
+		"%s say,I think animal enter hyper-space."
 	      };
 	      static const char *mesg_n[3] = {
-		"%-.24s say,hehe! bye bye!",
-		"%-.24s say,Enemy escape from me.",
-		"%-.24s say,Where?"
+		"%s say,hehe! bye bye!",
+		"%s say,Enemy escape from me.",
+		"%s say,Where?"
 	      };
 	      NPCsay (n, (t_type == TargetAnimal) ? mesg_a : mesg_n, 3);
 	      Npc[n].ntarget_user = -1;
@@ -10334,11 +10421,11 @@
       if (getrand (1, 100) < OBSERVER_SPEAK_RATE)
 	{
 	  static const char *mesg[5] = {
-	    "%-.24s say,*anyone see bad hunter?*",
-	    "%-.24s say,*uhmm. where is he?*",
-	    "%-.24s say,*are you bad hunter?*",
-	    "%-.24s say,*I want to rest here...*",
-	    "%-.24s say,*Zzzzz*"
+	    "%s say,*anyone see bad hunter?*",
+	    "%s say,*uhmm. where is he?*",
+	    "%s say,*are you bad hunter?*",
+	    "%s say,*I want to rest here...*",
+	    "%s say,*Zzzzz*"
 	  };
 	  NPCsay (n, mesg, 5);
 	}
@@ -10400,9 +10487,9 @@
 	  if (ndistance == 1)
 	    {
 	      static const char *g_mesg[3] = {
-		"%-.24s say,Hey! You do crime!",
-		"%-.24s say,Arrest you!",
-		"%-.24s say,Hold up!"
+		"%s say,Hey! You do crime!",
+		"%s say,Arrest you!",
+		"%s say,Hold up!"
 	      };
 	      if (t_type == TargetUser)
 		{
@@ -10412,7 +10499,7 @@
 		      /* arrest */
 		      char work[MESG_BUFFER];
 		      NPCsay (n, g_mesg, 3);
-		      sprintf (work, MESG ("[You were arrested by %-.24s!]"),
+		      sprintf (work, MESG ("[You were arrested by %s!]"),
 			       CUTTAIL (Npc[n].name));
 		      SendSystemMessagePacket (ntarget, work);
 		      ClearUser (ntarget);
@@ -10449,9 +10536,9 @@
 		{
 		  /* arrest NPC */
 		  static const char *h_mesg[3] = {
-		    "%-.24s say,Oh NO! PLEASE HELP ME!",
-		    "%-.24s say,ARGGGH!",
-		    "%-.24s say,Yeah I understand your claim. But..."
+		    "%s say,Oh NO! PLEASE HELP ME!",
+		    "%s say,ARGGGH!",
+		    "%s say,Yeah I understand your claim. But..."
 		  };
 		  NPCsay (n, g_mesg, 3);
 		  NPCsay (ntarget, h_mesg, 3);
@@ -10479,9 +10566,9 @@
 		      NPCfire (n, ndir) == 0)
 		    {
 		      static const char *mesg[3] = {
-			"%-.24s say,Hey! Stop!",
-			"%-.24s say,You are BAD HUNTER!",
-			"%-.24s say,Shoot!"
+			"%s say,Hey! Stop!",
+			"%s say,You are BAD HUNTER!",
+			"%s say,Shoot!"
 		      };
 		      NPCsay (n, mesg, 3);
 		      return;
@@ -10492,9 +10579,9 @@
 	    {
 	      /* out of range */
 	      static const char *mesg[3] = {
-		"%-.24s say,Shit!",
-		"%-.24s say,I miss bad hunter.",
-		"%-.24s say,Oh no! My radar device is malfunction!"
+		"%s say,Shit!",
+		"%s say,I miss bad hunter.",
+		"%s say,Oh no! My radar device is malfunction!"
 	      };
 	      NPCsay (n, mesg, 3);
 	      Npc[n].ntarget_user = -1;
@@ -10579,11 +10666,11 @@
 	      if (getrand (1, 100) < HIRENPC_SPEAK_RATE)
 		{
 		  static const char *mesg[5] = {
-		    "%-.24s say,sorry.",
-		    "%-.24s say,I cover your back.",
-		    "%-.24s say,Anyone see enemy?",
-		    "%-.24s say,no boggy.",
-		    "%-.24s say,I no see enemy."
+		    "%s say,sorry.",
+		    "%s say,I cover your back.",
+		    "%s say,Anyone see enemy?",
+		    "%s say,no boggy.",
+		    "%s say,I no see enemy."
 		  };
 		  NPCsay (n, mesg, 5);
 		}
@@ -10596,11 +10683,11 @@
 	      if (getrand (1, 100) < HIRENPC_SPEAK_RATE)
 		{
 		  static const char *mesg[5] = {
-		    "%-.24s say,on the way.",
-		    "%-.24s say,search trap now...",
-		    "%-.24s say,Don't go away from me!",
-		    "%-.24s say,no enemy in sight.",
-		    "%-.24s say,I no see any on my radar."
+		    "%s say,on the way.",
+		    "%s say,search trap now...",
+		    "%s say,Don't go away from me!",
+		    "%s say,no enemy in sight.",
+		    "%s say,I no see any on my radar."
 		  };
 		  NPCsay (n, mesg, 5);
 		}
@@ -10625,9 +10712,9 @@
 		{
 		  /* boggy! */
 		  static const char *mesg[3] = {
-		    "%-.24s say,Engage enemy!",
-		    "%-.24s say,Hey! Do not enter!",
-		    "%-.24s say,Formation alpha! move to attack position!"
+		    "%s say,Engage enemy!",
+		    "%s say,Hey! Do not enter!",
+		    "%s say,Formation alpha! move to attack position!"
 		  };
 		  NPCsay (n, mesg, 3);
 		  Npc[n].ntarget_user = ntarget;
@@ -10641,9 +10728,9 @@
 		    {
 		      /* owner is under attack! */
 		      static const char *mesg[3] = {
-			"%-.24s say,Alert! HQ is under attack!",
-			"%-.24s say,Condition RED! All guard HQ!",
-			"%-.24s say,Formation sigma! move to support position!"
+			"%s say,Alert! HQ is under attack!",
+			"%s say,Condition RED! All guard HQ!",
+			"%s say,Formation sigma! move to support position!"
 		      };
 		      NPCsay (n, mesg, 3);
 		      Npc[n].ntarget_user = User[nuser].lastuser;
@@ -10655,9 +10742,9 @@
 	    {
 	      /* animal aproach */
 	      static const char *mesg[3] = {
-		"%-.24s say,I find dangerous animal!",
-		"%-.24s say,Animal aproach!",
-		"%-.24s say,Formation delta! move to attack position!"
+		"%s say,I find dangerous animal!",
+		"%s say,Animal aproach!",
+		"%s say,Formation delta! move to attack position!"
 	      };
 	      NPCsay (n, mesg, 3);
 	      Npc[n].ntarget_user = ntarget;
@@ -10718,9 +10805,9 @@
 	  if (ndistance == 1 && Npc[n].weapon)
 	    {
 	      static const char *mesg[3] = {
-		"%-.24s say,I wanna need your support!",
-		"%-.24s say,Shit! This enemy is too near!",
-		"%-.24s say,HAHAHA!"
+		"%s say,I wanna need your support!",
+		"%s say,Shit! This enemy is too near!",
+		"%s say,HAHAHA!"
 	      };
 	      NPCsay (n, mesg, 3);
 	    }
@@ -10729,9 +10816,9 @@
 	      if (ndistance < VIEW_LIMIT && Npc[n].reload == 0)
 		{
 		  static const char *mesg[3] = {
-		    "%-.24s say,I attack this enemy.",
-		    "%-.24s say,We are under fire!",
-		    "%-.24s say,Cover me!"
+		    "%s say,I attack this enemy.",
+		    "%s say,We are under fire!",
+		    "%s say,Cover me!"
 		  };
 		  NPCsay (n, mesg, 3);
 		}
@@ -10740,9 +10827,9 @@
 	    {
 	      /* out of range */
 	      static const char *mesg[3] = {
-		"%-.24s say,I lost target-lock.",
-		"%-.24s say,no see anyone.",
-		"%-.24s say,ok. clear."
+		"%s say,I lost target-lock.",
+		"%s say,no see anyone.",
+		"%s say,ok. clear."
 	      };
 	      NPCsay (n, mesg, 3);
 	      Npc[n].ntarget_user = -1;