Commit: 4 - hunton_server (svn)

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

Commit MetaInfo

• Revision: 4 (tree)
• Time: 2016-01-24 23:29:58
• Author: manjihq

Log Message

utf-8に変更した結果、名称バッファが足りなくなっていたのでそれを修正

Change Summary

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

Incremental Difference

--- trunk/huntserv.c	(revision 3)
+++ trunk/huntserv.c	(revision 4)
@@ -367,7 +367,7 @@
 typedef struct animal_info
 {
   ANIMALDATA *pdata;
-  char name[USERNAME_LEN];
+  char name[ANIMALNAME_LEN];
   unsigned long hp;
   unsigned moral;
   unsigned w_power;
@@ -1524,7 +1524,7 @@
 #ifdef MAKEWIN32
 		  convertH2C (namebuf, USERNAME_LEN);
 #endif
-		  fprintf (optr, "%d,%d,%d,%-.16s\n",
+		  fprintf (optr, "%d,%d,%d,%-.24s\n",
 			   User[i].myshop[j].build,
 			   User[i].myshop[j].pos.x, User[i].myshop[j].pos.y,
 			   namebuf);
@@ -1539,7 +1539,7 @@
 #ifdef MAKEWIN32
 			  convertH2C (namebuf, WEAPONNAME_LEN);
 #endif
-			  fprintf (optr, "%-.32s,%u,%u,%lu\n",
+			  fprintf (optr, "%-.24s,%u,%u,%lu\n",
 				   namebuf,
 				   User[i].myshop[j].leftuse[0][k],
 				   User[i].myshop[j].count[0][k],
@@ -1553,7 +1553,7 @@
 #ifdef MAKEWIN32
 			  convertH2C (namebuf, ITEMNAME_LEN);
 #endif
-			  fprintf (optr, "%-.32s,%u,%u,%lu\n",
+			  fprintf (optr, "%-.24s,%u,%u,%lu\n",
 				   namebuf,
 				   User[i].myshop[j].leftuse[1][k],
 				   User[i].myshop[j].count[1][k],
@@ -2188,7 +2188,7 @@
 #ifdef MAKEWIN32
       convertH2C (work, USERNAME_LEN);
 #endif
-      printf ("user(%d)[%-16.16s] logoff.\n", userno, work);
+      printf ("user(%d)[%-.24s] logoff.\n", userno, work);
       User[userno].idletimer = 0;
     }
   ClearUser (userno);
@@ -2623,7 +2623,7 @@
 #ifdef MAKEWIN32
 	  convertH2C (namebuf, USERNAME_LEN);
 #endif
-	  fprintf (optr, "%d,%d,%lu\n%-.16s\n",
+	  fprintf (optr, "%d,%d,%lu\n%-.24s\n",
 		   pmail->readflag, pmail->line, pmail->timestamp, namebuf);
 	  n = (unsigned char) (pmail->subject[0]);
 	  if (n)
@@ -2850,7 +2850,7 @@
 #ifdef MAKEWIN32
 	  convertH2C (namebuf, USERNAME_LEN);
 #endif
-	  fprintf (optr, "%d,%d,%lu\n%-.16s\n",
+	  fprintf (optr, "%d,%d,%lu\n%-.24s\n",
 		   pmail->readflag, pmail->line, pmail->timestamp, namebuf);
 	  n = (unsigned char) (pmail->subject[0]);
 	  if (n)
@@ -2961,7 +2961,7 @@
 			{
 			  User[i].password[j] = work[j];
 			}
-		      for (; j < USERNAME_LEN; j++)
+		      for (; j < PASSWORD_LEN; j++)
 			{
 			  User[i].password[j] = ' ';
 			}
@@ -3251,7 +3251,7 @@
 	  int x;
 	  int y;
 	  Animal[i].pdata = pdata;
-	  memcpy (Animal[i].name, pdata->name, USERNAME_LEN);
+	  memcpy (Animal[i].name, pdata->name, ANIMALNAME_LEN);
 	  Animal[i].hp = pdata->hp;
 	  Animal[i].moral = pdata->moral;
 	  Animal[i].speed = pdata->speed;
@@ -3792,7 +3792,7 @@
   int nanimal = MAP (x, y)->animal;
   if (nplayer && User[nplayer - 1].cloak_count == 0)
     {
-      memcpy (p, User[nplayer - 1].name, 16);
+      memcpy (p, User[nplayer - 1].name, USERNAME_LEN);
       if (User[nplayer - 1].maybearrest > 0)
 	{
 	  if (User[nplayer - 1].maybearrest <= ArrestPass)
@@ -3826,7 +3826,7 @@
     {
       if (id & MAP_THERE_ANIMAL)
 	{
-	  memcpy (p, Animal[nanimal].name, 16);
+	  memcpy (p, Animal[nanimal].name, USERNAME_LEN);
 	  if (Animal[nanimal].owner_user == userno)
 	    {
 	      /* your animal */
@@ -3852,7 +3852,7 @@
 	}
       else if (id & MAP_THERE_NPC)
 	{
-	  memcpy (p, Npc[nanimal].name, 16);
+	  memcpy (p, Npc[nanimal].name, USERNAME_LEN);
 	  if (Npc[nanimal].c_type == NpcHunter)
 	    {
 	      ret = 3;
@@ -3871,17 +3871,17 @@
 	  int nshop = searchUserShopFromPos (nowner - 1, x, y);
 	  if (nshop != -1)
 	    {
-	      memcpy (p, User[nowner - 1].myshop[nshop].name, 16);
+	      memcpy (p, User[nowner - 1].myshop[nshop].name, USERNAME_LEN);
 	    }
 	  else
 	    {
 	      /* error??? */
-	      memset (p, ' ', 16);
+	      memset (p, ' ', USERNAME_LEN);
 	    }
 	}
       else
 	{
-	  memset (p, ' ', 16);
+	  memset (p, ' ', USERNAME_LEN);
 	}
     }
   return ret;
@@ -3890,7 +3890,8 @@
 /* make map detail data for send */
 static void
 make_send_mapdetaildata (int userno,
-			 unsigned char d[VIEW_LIMIT * VIEW_WIDTH * 16],
+			 unsigned char d[VIEW_LIMIT * VIEW_WIDTH *
+					 USERNAME_LEN],
 			 unsigned char crime[VIEW_LIMIT * VIEW_WIDTH])
 {
   int x;
@@ -3909,24 +3910,24 @@
       ny = y - RGVectorY[direction] * 2;
       adjust_pos (&nx, &ny);
       *pcrime++ = copy_mapdetaildata (userno, p, nx, ny);
-      p += 16;
+      p += USERNAME_LEN;
       nx += RGVectorX[direction];
       ny += RGVectorY[direction];
       adjust_pos (&nx, &ny);
       *pcrime++ = copy_mapdetaildata (userno, p, nx, ny);
-      p += 16;
+      p += USERNAME_LEN;
       *pcrime++ = copy_mapdetaildata (userno, p, x, y);
-      p += 16;
+      p += USERNAME_LEN;
       nx = x + RGVectorX[direction];
       ny = y + RGVectorY[direction];
       adjust_pos (&nx, &ny);
       *pcrime++ = copy_mapdetaildata (userno, p, nx, ny);
-      p += 16;
+      p += USERNAME_LEN;
       nx += RGVectorX[direction];
       ny += RGVectorY[direction];
       adjust_pos (&nx, &ny);
       *pcrime++ = copy_mapdetaildata (userno, p, nx, ny);
-      p += 16;
+      p += USERNAME_LEN;
       x += FWVectorX[direction];
       y += FWVectorY[direction];
       adjust_pos (&x, &y);
@@ -4028,8 +4029,9 @@
   make_send_playeronmapdata (userno, packet + n);
   n += VIEW_LIMIT * VIEW_WIDTH;
   make_send_mapdetaildata (userno, packet + n,
-			   packet + n + VIEW_LIMIT * VIEW_WIDTH * 16);
-  n += VIEW_LIMIT * VIEW_WIDTH * 16;
+			   packet + n +
+			   VIEW_LIMIT * VIEW_WIDTH * USERNAME_LEN);
+  n += VIEW_LIMIT * VIEW_WIDTH * USERNAME_LEN;
   n += VIEW_LIMIT * VIEW_WIDTH;
   if (!memcmp (User[userno].mapdata + 2, packet + 2, n - 2))
     {
@@ -4103,14 +4105,14 @@
       unsigned char packet[PACKET_MAX];
       int nlen = strlen (p);
       packet[0] = HSERV_MESG;
-      memcpy (packet + 2, User[srcuser].name, 16);
-      if (nlen > PACKET_DATA_MAX - 17)
+      memcpy (packet + 2, User[srcuser].name, USERNAME_LEN);
+      if (nlen > PACKET_DATA_MAX - 1 - USERNAME_LEN)
 	{
-	  nlen = PACKET_DATA_MAX - 17;
+	  nlen = PACKET_DATA_MAX - 1 - USERNAME_LEN;
 	}
-      packet[18] = nlen;
-      memcpy (packet + 19, p, nlen);
-      ret = SENDPACKET (userno, packet, nlen + 17);
+      packet[2 + USERNAME_LEN] = nlen;
+      memcpy (packet + 3 + USERNAME_LEN, p, nlen);
+      ret = SENDPACKET (userno, packet, nlen + 1 + USERNAME_LEN);
     }
   return ret;
 }
@@ -4291,8 +4293,8 @@
 	    {
 	      int n = 2;
 	      packet[0] = HSERV_WHO;
-	      memcpy (packet + n, User[i].name, 16);
-	      n += 16;
+	      memcpy (packet + n, User[i].name, USERNAME_LEN);
+	      n += USERNAME_LEN;
 	      *(unsigned long *) (packet + n) = htonl (User[i].score);
 	      n += 4;
 	      packet[n++] =
@@ -4373,8 +4375,8 @@
       unsigned char packet[PACKET_MAX];
       int n = 2;
       packet[0] = HSERV_SENDMAIL;
-      memcpy (packet + n, User[p->fromuser].name, 16);
-      n += 16;
+      memcpy (packet + n, User[p->fromuser].name, USERNAME_LEN);
+      n += USERNAME_LEN;
       *(unsigned long *) (packet + n) = htonl (p->timestamp);
       n += 4;
       packet[n++] = p->subject[0];
@@ -4430,8 +4432,8 @@
       unsigned char packet[PACKET_MAX];
       int n = 2;
       packet[0] = HSERV_BBS_HEADER;
-      memcpy (packet + n, User[p->fromuser].name, 16);
-      n += 16;
+      memcpy (packet + n, User[p->fromuser].name, USERNAME_LEN);
+      n += USERNAME_LEN;
       *(unsigned long *) (packet + n) = htonl (p->timestamp);
       n += 4;
       packet[n++] = p->subject[0];
@@ -4499,8 +4501,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:%-32.24s:%10luP %4ucount (stock:%4u)>") :
+		   MESG ("<%2d:%-32.24s:%10luP %4uround (stock:%4u)>"),
 		   i,
 		   (n ? Item[User[nowner].myshop[nshop].list[n][i]].name :
 		    Weapon[User[nowner].myshop[nshop].list[n][i]].name),
@@ -4543,7 +4545,7 @@
 	{
 	  WEAPONINFO *pw = Weapon + plist[i];
 	  sprintf (work,
-		   MESG ("<%3d:%-32.32s:%10luP %4uround HP%4u/Moral%4u "
+		   MESG ("<%3d:%-32.24s:%10luP %4uround HP%4u/Moral%4u "
 			 "Range:%4ublock>"),
 		   i, pw->name, pw->cost, pw->bullette,
 		   pw->firepower, pw->moral, pw->range);
@@ -4584,7 +4586,7 @@
 	{
 	  ITEMINFO *pi = Item + plist[i];
 	  sprintf (work,
-		   MESG ("<%3d:%-32.32s:%10luP %4ucount>"),
+		   MESG ("<%3d:%-32.24s:%10luP %4ucount>"),
 		   i, pi->name, pi->cost, pi->count);
 	  SendSystemMessagePacket (nuser, work);
 	}
@@ -4707,15 +4709,15 @@
 	  switch (t)
 	    {
 	    case TargetUser:
-	      sprintf (work, MESG ("%-.16s damages you. lost %uHP."),
+	      sprintf (work, MESG ("%-.24s damages you. lost %uHP."),
 		       CUTTAIL (User[fromuser].name), ndamage);
 	      break;
 	    case TargetNpc:
-	      sprintf (work, MESG ("%-.16s damages you. lost %uHP."),
+	      sprintf (work, MESG ("%-.24s damages you. lost %uHP."),
 		       CUTTAIL (Npc[fromuser].name), ndamage);
 	      break;
 	    case TargetAnimal:
-	      sprintf (work, MESG ("Animal '%-.16s' damages you. lost %uHP"),
+	      sprintf (work, MESG ("Animal '%-.24s' damages you. lost %uHP"),
 		       CUTTAIL (Animal[fromuser].name), ndamage);
 	      break;
 	    default:
@@ -4728,7 +4730,7 @@
 	    }
 	  if (t == TargetUser)
 	    {
-	      sprintf (work, MESG ("You attack %-.16s"),
+	      sprintf (work, MESG ("You attack %-.24s"),
 		       CUTTAIL (User[nuser].name));
 	      SendSystemMessagePacket (fromuser, work);
 	    }
@@ -4932,8 +4934,9 @@
 	  /* login */
 	  int nuser = SearchUser ((char *) (packet + 2));
 	  puts ("attempt to login.");
-	  if (packet[1] != 16 + 16 + 2 ||
-	      packet[2 + 16 + 16 + 1] != HPROTOCOL_VERSION)
+	  if (packet[1] != USERNAME_LEN + PASSWORD_LEN + 2 ||
+	      packet[2 + USERNAME_LEN + PASSWORD_LEN + 1] !=
+	      HPROTOCOL_VERSION)
 	    {
 	      /* illegal protocol */
 	      puts ("protocol mismatch.");
@@ -4942,7 +4945,7 @@
 	  else if (nuser != -1)
 	    {
 	      int i;
-	      const unsigned char *p = packet + 2 + 16;
+	      const unsigned char *p = packet + 2 + USERNAME_LEN;
 	      char uname[USERNAME_LEN];
 	      char work[PASSWORD_LEN];
 	      memcpy (uname, User[nuser].name, USERNAME_LEN);
@@ -4949,7 +4952,7 @@
 #ifdef MAKEWIN32
 	      convertH2C (uname, USERNAME_LEN);
 #endif
-	      printf ("User name:%-16.16s\n", uname);
+	      printf ("User name:%-16.24s\n", uname);
 	      for (i = 0; i < PASSWORD_LEN; i++)
 		{
 		  if (*(p + i) == '\0')
@@ -5038,19 +5041,20 @@
 	  if (packet[1] == USERNAME_LEN + PASSWORD_LEN + 16 + PASSWORD_LEN)
 	    {
 	      /* ok */
-	      if (packet[2 + 16 + 16 + 1] != HPROTOCOL_VERSION)
+	      if (packet[2 + USERNAME_LEN + PASSWORD_LEN + 1] !=
+		  HPROTOCOL_VERSION)
 		{
 		  /* illegal protocol */
 		  puts ("protocol mismatch");
 		  SendResultPacket (psession->handle, -1);
 		}
-	      else if (memcmp (packet + 2 + 16 + 16 + 16, makeUserKey,
-			       PASSWORD_LEN))
+	      else if (memcmp (packet + 2 + USERNAME_LEN + PASSWORD_LEN + 16,
+			       makeUserKey, PASSWORD_LEN))
 		{
 		  /* illegal system password */
 		  puts ("system password mismatch");
-		  printf ("Client key[%-16.16s]\n",
-			  packet + 2 + 16 + 16 + 16);
+		  printf ("Client key[%-16.24s]\n",
+			  packet + 2 + USERNAME_LEN + PASSWORD_LEN + 16);
 		  SendResultPacket (psession->handle, -1);
 		}
 	      else
@@ -5075,7 +5079,7 @@
 		      char *ps;
 		      char *pd;
 		      puts ("ok. new user!");
-		      ps = (char *) (packet + 2 + 16);
+		      ps = (char *) (packet + 2 + USERNAME_LEN);
 		      pd = User[nuser].password;
 		      for (i = 0; i < PASSWORD_LEN; i++)
 			{
@@ -5090,7 +5094,8 @@
 			  *pd++ = ' ';
 			}
 		      User[nuser].c_type =
-			packet[2 + 16 + 16] ? Observer : Hunter;
+			packet[2 + USERNAME_LEN + PASSWORD_LEN] ?
+			Observer : Hunter;
 		      if (SendResultPacket (psession->handle, 0) == -1)
 			{
 			  /* ?? error */
@@ -5133,7 +5138,7 @@
 	  if (nuser != -1)
 	    {
 	      int i;
-	      const unsigned char *p = packet + 2 + 16;
+	      const unsigned char *p = packet + 2 + USERNAME_LEN;
 	      char uname[USERNAME_LEN];
 	      char work[PASSWORD_LEN];
 	      memcpy (uname, User[nuser].name, USERNAME_LEN);
@@ -5140,7 +5145,7 @@
 #ifdef MAKEWIN32
 	      convertH2C (uname, USERNAME_LEN);
 #endif
-	      printf ("User name:%-16.16s\n", uname);
+	      printf ("User name:%-16.24s\n", uname);
 	      for (i = 0; i < PASSWORD_LEN; i++)
 		{
 		  if (*(p + i) == '\0')
@@ -5428,8 +5433,8 @@
 doChangeShopName (int nuser, const char *p)
 {
   User[nuser].action = DoChangeShopName;
-  strncpy (User[nuser].mesg_for_action, p, 16);
-  User[nuser].mesg_for_action[16] = '\0';
+  strncpy (User[nuser].mesg_for_action, p, USERNAME_LEN);
+  User[nuser].mesg_for_action[USERNAME_LEN] = '\0';
   return;
 }
 
@@ -5460,9 +5465,9 @@
       User[nuser].t_target = ntarget;
       if (User[nuser].t_mail != NULL)
 	{
-	  int n = *(p + 16);
+	  int n = *(p + USERNAME_LEN);
 	  User[nuser].t_mail->fromuser = nuser;
-	  memcpy (User[nuser].t_mail->subject, p + 16, n + 1);
+	  memcpy (User[nuser].t_mail->subject, p + USERNAME_LEN, n + 1);
 	}
     }
   else
@@ -5631,7 +5636,7 @@
   if (ndist != -1)
     {
       char work[MESG_BUFFER];
-      unsigned n = ntohl (*(unsigned long *) (p + 16));
+      unsigned n = ntohl (*(unsigned long *) (p + USERNAME_LEN));
       unsigned ntax = n / 100;
       if (User[nuser].score < n + ntax)
 	{
@@ -5641,10 +5646,10 @@
 	}
       dec_score (nuser, n + ntax);
       add_score (ndist, n);
-      sprintf (work, MESG ("[You transfer %upoint to %-.16s. Tax:%upoint]"),
+      sprintf (work, MESG ("[You transfer %upoint to %-.24s. Tax:%upoint]"),
 	       n, CUTTAIL (User[ndist].name), ntax);
       SendSystemMessagePacket (nuser, work);
-      sprintf (work, MESG ("[You receive %upoint from %-.16s]"),
+      sprintf (work, MESG ("[You receive %upoint from %-.24s]"),
 	       n, CUTTAIL (User[nuser].name));
       SendSystemMessagePacket (ndist, work);
     }
@@ -5660,8 +5665,8 @@
 doChangeUserAnimalName (int nuser, unsigned char *p)
 {
   User[nuser].action = DoChangeAnimalName;
-  strncpy (User[nuser].mesg_for_action, (char *) p, 16);
-  User[nuser].mesg_for_action[16] = '\0';
+  strncpy (User[nuser].mesg_for_action, (char *) p, ANIMALNAME_LEN);
+  User[nuser].mesg_for_action[ANIMALNAME_LEN] = '\0';
   return;
 }
 
@@ -5907,12 +5912,12 @@
 	  switch (User[i].crime_level)
 	    {
 	    case 1:
-	      sprintf (work, MESG ("<WANTED '%-.16s'>"),
+	      sprintf (work, MESG ("<WANTED '%-.24s'>"),
 		       CUTTAIL (User[i].name));
 	      SendSystemMessagePacket (nuser, work);
 	      break;
 	    case 2:
-	      sprintf (work, MESG ("<Dead or Alive '%-.16s'>"),
+	      sprintf (work, MESG ("<Dead or Alive '%-.24s'>"),
 		       CUTTAIL (User[i].name));
 	      SendSystemMessagePacket (nuser, work);
 	      break;
@@ -6247,7 +6252,7 @@
 	      User[nuser].bullette[nslot] = 0;
 	    }
 	  User[nuser].myshop[nshop].count[isitem][i]++;
-	  sprintf (work, MESG ("[%-.32s stocked]"),
+	  sprintf (work, MESG ("[%-.24s stocked]"),
 		   isitem ? Item[n].name : Weapon[n].name);
 	  SendSystemMessagePacket (nuser, work);
 	}
@@ -6501,8 +6506,8 @@
   if (destuser != -1)
     {
       char work[PACKET_DATA_MAX];
-      int nlen = *(p + 16);
-      memcpy (work, p + 17, nlen);
+      int nlen = *(p + USERNAME_LEN);
+      memcpy (work, p + 1 + USERNAME_LEN, nlen);
       work[nlen] = '\0';
       SendMessagePacket (destuser, nuser, work);
       if (nlen > PACKET_DATA_MAX - USERNAME_LEN - 10)
@@ -6509,11 +6514,10 @@
 	{
 	  nlen = PACKET_DATA_MAX - USERNAME_LEN - 10;
 	}
-      sprintf (work, MESG ("You tell %-.16s,"),
-	       CUTTAIL (User[destuser].name));
+      sprintf (work, "You tell %-.24s,", CUTTAIL (User[destuser].name));
       if (nlen)
 	{
-	  memcpy (work + USERNAME_LEN + 10, p + 17, nlen);
+	  memcpy (work + USERNAME_LEN + 10, p + 1 + USERNAME_LEN, nlen);
 	}
       work[USERNAME_LEN + 10 + nlen] = '\0';
       SendSystemMessagePacket (nuser, work);
@@ -6546,7 +6550,7 @@
   else
     {
       char work[PACKET_DATA_MAX];
-      sprintf (work, MESG ("[Weapon:%-32.32s NOT READY]"),
+      sprintf (work, MESG ("[Weapon:%-32.24s NOT READY]"),
 	       Weapon[User[nuser].weapon[nweapon]].name);
       SendSystemMessagePacket (nuser, work);
     }
@@ -6598,7 +6602,7 @@
 	    {
 	      /* list up this */
 	      int relpos = get_rel_position_in (dx1, dx2, dy1, dy2);
-	      sprintf (work, MESG ("<%-16.16s %10s %5dBlock>"),
+	      sprintf (work, MESG ("<%-16.24s %10s %5dBlock>"),
 		       Animal[i].name, MESG (RelDirection[relpos]), n);
 	      SendSystemMessagePacket (nuser, work);
 	    }
@@ -6638,7 +6642,7 @@
 	      if (User[i].c_type == Hunter)
 		{
 		  sprintf (work,
-			   MESG ("<Hunter:%-16.16s %10s %5dBlock crime:%lu>"),
+			   MESG ("<Hunter:%-16.24s %10s %5dBlock crime:%lu>"),
 			   User[i].name, MESG (RelDirection[relpos]), n,
 			   User[i].maybearrest);
 		}
@@ -6645,7 +6649,7 @@
 	      else
 		{
 		  sprintf (work,
-			   MESG ("<Guard :%-16.16s %10s %5dBlock>"),
+			   MESG ("<Guard :%-16.24s %10s %5dBlock>"),
 			   User[i].name, MESG (RelDirection[relpos]), n);
 		}
 	      SendSystemMessagePacket (nuser, work);
@@ -6679,12 +6683,12 @@
 	      if (Npc[i].c_type == NpcHunter)
 		{
 		  sprintf (work,
-			   MESG ("<Hunter:%-16.16s %10s %5dBlock crime:NA>"),
+			   MESG ("<Hunter:%-16.24s %10s %5dBlock crime:NA>"),
 			   Npc[i].name, MESG (RelDirection[relpos]), n);
 		}
 	      else
 		{
-		  sprintf (work, MESG ("<Guard :%-16.16s %10s %5dBlock>"),
+		  sprintf (work, MESG ("<Guard :%-16.24s %10s %5dBlock>"),
 			   Npc[i].name, MESG (RelDirection[relpos]), n);
 		}
 	      SendSystemMessagePacket (nuser, work);
@@ -6761,10 +6765,10 @@
       if (Npc[i].name[0] == '\0')
 	{
 	  static const char *mesg[4] = {
-	    "%-.16s say,OK Boss. I will guard you.",
-	    "%-.16s say,Ready for deployment",
-	    "%-.16s say,It's show time!",
-	    "%-.16s say,Do you wanna use my design?"
+	    "%-.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?"
 	  };
 	  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 };
@@ -6918,13 +6922,13 @@
 	    }
 	  break;
 	case Vehicle:
-	  sprintf (work, MESG ("You ride on %-.32s"), pitem->name);
+	  sprintf (work, MESG ("You ride on %-.24s"), 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 %-.32s..."), pitem->name);
+	  sprintf (work, MESG ("You eat %-.24s..."), pitem->name);
 	  if (pitem->effect > 100)
 	    {
 	      strcat (work, MESG ("Delicious!"));
@@ -6987,7 +6991,7 @@
     }
   User[nuser].item[i] = nitem;
   User[nuser].itemcount[i] = Item[User[nuser].item[i]].count;
-  sprintf (work, MESG ("[Get item%1d:%-.32s]"),
+  sprintf (work, MESG ("[Get item%1d:%-.24s]"),
 	   i + 1, Item[User[nuser].item[i]].name);
   SendSystemMessagePacket (nuser, work);
   return i;
@@ -7015,7 +7019,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:%-.32s]"),
+  sprintf (work, MESG ("[Get weapon%1d:%-.24s]"),
 	   i + 1, Weapon[User[nuser].weapon[i]].name);
   SendSystemMessagePacket (nuser, work);
   return i;
@@ -7111,7 +7115,7 @@
 	{
 	  /* can't get this. drop original position */
 	  char work[MESG_BUFFER];
-	  sprintf (work, MESG ("[You have no space to get %-.32s!]"),
+	  sprintf (work, MESG ("[You have no space to get %-.24s!]"),
 		   isitem ? Item[nitem].name : Weapon[nitem].name);
 	  SendSystemMessagePacket (nuser, work);
 	  addUserItemBox (x, y, isitem, nitem, nleft, NULL);
@@ -7144,7 +7148,7 @@
 		}
 	      add_score (nuser, n);
 	      add_crime (nuser, n);
-	      sprintf (work, MESG ("[You catch %-.16s:%upoint]"),
+	      sprintf (work, MESG ("[You catch %-.24s:%upoint]"),
 		       CUTTAIL (Animal[nanimal].name), n);
 	      SendSystemMessagePacket (nuser, work);
 	      DeleteAnimal (nanimal);
@@ -7165,7 +7169,7 @@
 	      /* it is animal corpse */
 	      char work[MESG_BUFFER];
 	      sprintf (work,
-		       MESG ("[You collect %-.16s's corpse:10point]"),
+		       MESG ("[You collect %-.24s's corpse:10point]"),
 		       CUTTAIL (Animal[nanimal].name));
 	      SendSystemMessagePacket (nuser, work);
 	      MAP (x, y)->id &= ~MAP_THERE_ANIMAL;
@@ -7187,7 +7191,7 @@
 	{
 	  /* arrest! */
 	  char work[MESG_BUFFER];
-	  sprintf (work, MESG ("[You arrest %-.16s. Get 500point.]"),
+	  sprintf (work, MESG ("[You arrest %-.24s. Get 500point.]"),
 		   CUTTAIL (Npc[npc].name));
 	  SendSystemMessagePacket (nuser, work);
 	  add_score (nuser, 500);
@@ -7216,10 +7220,10 @@
 		  break;
 		}
 	      User[ntarget].crime_level = 0;
-	      sprintf (work, MESG ("[You arrest %-.16s. Get %lupoint.]"),
+	      sprintf (work, MESG ("[You arrest %-.24s. Get %lupoint.]"),
 		       CUTTAIL (User[ntarget].name), npts);
 	      SendSystemMessagePacket (nuser, work);
-	      sprintf (work, MESG ("[You were arrested by %-.16s]"),
+	      sprintf (work, MESG ("[You were arrested by %-.24s]"),
 		       CUTTAIL (User[nuser].name));
 	      SendSystemMessagePacket (ntarget, work);
 	      SendSystemMessagePacket (ntarget, MESG ("[Go to Jail!]"));
@@ -7235,11 +7239,11 @@
 	    }
 	  else
 	    {
-	      sprintf (work, MESG ("[You attempt to arrest %-.16s]"),
+	      sprintf (work, MESG ("[You attempt to arrest %-.24s]"),
 		       CUTTAIL (User[ntarget].name));
 	      SendSystemMessagePacket (nuser, work);
 	      SendSystemMessagePacket (nuser, MESG ("[But he do not crime]"));
-	      sprintf (work, MESG ("[%-.16s attempt to arrest you]"),
+	      sprintf (work, MESG ("[%-.24s attempt to arrest you]"),
 		       CUTTAIL (User[nuser].name));
 	      SendSystemMessagePacket (ntarget, work);
 	      SendSystemMessagePacket (ntarget,
@@ -7561,7 +7565,7 @@
 	{
 	  char work[MESG_BUFFER];
 	  sprintf (work,
-		   MESG ("<%d:%-16.16s (%3d,%3d)>"), i + 1,
+		   MESG ("<%d:%-16.24s (%3d,%3d)>"), i + 1,
 		   User[nuser].myshop[i].name,
 		   User[nuser].myshop[i].pos.x, User[nuser].myshop[i].pos.y);
 	  SendSystemMessagePacket (nuser, work);
@@ -7583,7 +7587,7 @@
       ANIMALDATA *p = User[nuser].lastPickupAnimal[i];
       if (p != NULL)
 	{
-	  sprintf (work, MESG ("<%d:%-16.16s(%-.32s)>"), i + 1, p->name,
+	  sprintf (work, MESG ("<%d:%-16.24s(%-.24s)>"), i + 1, p->name,
 		   Item[p->forsell_item].name);
 	  SendSystemMessagePacket (nuser, work);
 	}
@@ -7688,7 +7692,7 @@
     {
       if (animal[i])
 	{
-	  sprintf (work, MESG ("<'%-16.16s' lives:%3d rate:%3u value:%5u>"),
+	  sprintf (work, MESG ("<'%-16.24s' lives:%3d rate:%3u value:%5u>"),
 		   AnimalData[i].name, animal[i],
 		   AnimalData[i].rate, AnimalData[i].value);
 	  SendSystemMessagePacket (nuser, work);
@@ -7732,7 +7736,7 @@
 	    {
 	      strcpy (subjectbuffer, "NO SUBJECT");
 	    }
-	  sprintf (work, "<%c%2d:%-16.16s %-.32s>",
+	  sprintf (work, "<%c%2d:%-16.24s %-.24s>",
 		   pmail->readflag ? ' ' : '*', i + 1,
 		   User[pmail->fromuser].name, subjectbuffer);
 	  SendSystemMessagePacket (nuser, work);
@@ -7826,7 +7830,7 @@
 	    {
 	      strcpy (subjectbuffer, "NO SUBJECT");
 	    }
-	  sprintf (work, "<%2d:%-16.16s %-.32s>",
+	  sprintf (work, "<%2d:%-16.24s %-.24s>",
 		   i + 1, User[pmail->fromuser].name, subjectbuffer);
 	  SendSystemMessagePacket (nuser, work);
 	  f = 1;
@@ -8107,11 +8111,11 @@
 		    {
 		      if (pb->t_type == TargetUser)
 			{
-			  sprintf (work, MESG ("You attack animal '%-.16s'"),
+			  sprintf (work, MESG ("You attack animal '%-.24s'"),
 				   CUTTAIL (Animal[nanimal].name));
 			  SendSystemMessagePacket (pb->nuser, work);
 			}
-		      sprintf (work, MESG ("[%-.16s shoot animal!]"),
+		      sprintf (work, MESG ("[%-.24s shoot animal!]"),
 			       CUTTAIL ((pb->t_type == TargetUser) ?
 					User[pb->nuser].name :
 					Npc[pb->nuser].name));
@@ -8131,7 +8135,7 @@
 		      if (pb->nuser != -1 && pb->t_type == TargetUser)
 			{
 			  sprintf (work,
-				   MESG ("animal '%-.16s' died."),
+				   MESG ("animal '%-.24s' died."),
 				   CUTTAIL (Animal[nanimal].name));
 			  SendSystemMessagePacket (pb->nuser, work);
 			  if (CountLiveAnimal (Animal[nanimal].pdata) == 0)
@@ -8139,7 +8143,7 @@
 			      /* this is last animal! */
 			      sprintf (work,
 				       MESG
-				       ("[animal '%-.16s' is extermination!]"),
+				       ("[animal '%-.24s' is extermination!]"),
 				       CUTTAIL (Animal[nanimal].name));
 			      SendSystemMessagePacket (pb->nuser, work);
 			      if (User[pb->nuser].c_type == Observer)
@@ -8176,7 +8180,7 @@
 		    {
 		      if (pb->nuser != -1 && pb->t_type == TargetUser)
 			{
-			  sprintf (work, MESG ("animal '%-.16s' stun."),
+			  sprintf (work, MESG ("animal '%-.24s' stun."),
 				   CUTTAIL (Animal[nanimal].name));
 			  SendSystemMessagePacket (pb->nuser, work);
 			}
@@ -8194,7 +8198,7 @@
 				{
 				  sprintf (work,
 					   MESG
-					   ("You charm animal '%-.16s'!"),
+					   ("You charm animal '%-.24s'!"),
 					   CUTTAIL (Animal[nanimal].name));
 				  SendSystemMessagePacket (pb->nuser, work);
 				  Animal[nanimal].owner_user = pb->nuser;
@@ -8203,7 +8207,7 @@
 				{
 				  sprintf (work,
 					   MESG
-					   ("Animal '%-.16s' is free now!"),
+					   ("Animal '%-.24s' is free now!"),
 					   CUTTAIL (Animal[nanimal].name));
 				  SendMessageNearUserPosition (pb->pos, work);
 				  Animal[nanimal].owner_user = -1;
@@ -8214,7 +8218,7 @@
 			      /* fail */
 			      sprintf (work,
 				       MESG
-				       ("You fail to charm animal '%-.16s'."),
+				       ("You fail to charm animal '%-.24s'."),
 				       CUTTAIL (Animal[nanimal].name));
 			      SendSystemMessagePacket (pb->nuser, work);
 			    }
@@ -8264,7 +8268,7 @@
 		  char work[MESG_BUFFER];
 		  if (pb->nuser != -1 && pb->t_type == TargetUser)
 		    {
-		      sprintf (work, MESG ("You attack '%-.16s'"),
+		      sprintf (work, MESG ("You attack '%-.24s'"),
 			       CUTTAIL (Npc[npc].name));
 		      SendSystemMessagePacket (pb->nuser, work);
 		    }
@@ -8273,7 +8277,7 @@
 		    {
 		      if (pb->nuser != -1 && pb->t_type == TargetUser)
 			{
-			  sprintf (work, MESG ("'%-.16s' died."),
+			  sprintf (work, MESG ("'%-.24s' died."),
 				   CUTTAIL (Npc[npc].name));
 			  SendSystemMessagePacket (pb->nuser, work);
 			  if (User[pb->nuser].c_type == Hunter &&
@@ -8291,13 +8295,13 @@
 			  if (pb->nuser != -1 && pb->t_type == TargetNpc)
 			    {
 			      sprintf (work,
-				       MESG ("'%-.16s' killed by %-.16s!"),
+				       MESG ("'%-.24s' killed by %-.24s!"),
 				       CUTTAIL (Npc[npc].name),
 				       CUTTAIL (Npc[pb->nuser].name));
 			    }
 			  else
 			    {
-			      sprintf (work, MESG ("'%-.16s' killed by any!"),
+			      sprintf (work, MESG ("'%-.24s' killed by any!"),
 				       CUTTAIL (Npc[npc].name));
 			    }
 			  SendMessageNearUserPosition (Npc[npc].pos, work);
@@ -8315,11 +8319,11 @@
 			  if (!(pb->t_type == TargetNpc && pb->nuser == npc))
 			    {
 			      static const char *mesg[5] = {
-				"%-.16s say,Hey! Why do you attack me?",
-				"%-.16s say,No! Don't shoot me!",
-				"%-.16s say,What's think?!",
-				"%-.16s say,Ohch! We are under fire!",
-				"%-.16s say,Ok. I will kill you."
+				"%-.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."
 			      };
 			      NPCsay (npc, mesg, 5);
 			      Npc[npc].ntarget_user = pb->nuser;
@@ -8346,11 +8350,11 @@
 			  if (willcounter)
 			    {
 			      static const char *mesg[5] = {
-				"%-.16s say,Detect one boggy!",
-				"%-.16s say,We are under attack!",
-				"%-.16s say,Engage!",
-				"%-.16s say,Caution! Enemy fire!",
-				"%-.16s say,Emergency! Enemy attack us!"
+				"%-.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!"
 			      };
 			      NPCsay (npc, mesg, 5);
 			      Npc[npc].ntarget_user = pb->nuser;
@@ -8359,11 +8363,11 @@
 			  else
 			    {
 			      static const char *mesg[5] = {
-				"%-.16s say,Hey! No shoot me!",
-				"%-.16s say,I'm friendly!",
-				"%-.16s say,This is friendly! Don't shoot!",
-				"%-.16s say,Don't shoot! Are you enemy's spy?",
-				"%-.16s say,Take more care!"
+				"%-.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!"
 			      };
 			      NPCsay (npc, mesg, 5);
 			    }
@@ -8505,7 +8509,7 @@
 		  int nuser = User[i].lastuser;
 		  if (User[i].lastuser_type == TargetUser)
 		    {
-		      sprintf (work, MESG ("[You kill %-.16s]"),
+		      sprintf (work, MESG ("[You kill %-.24s]"),
 			       CUTTAIL (User[i].name));
 		      SendSystemMessagePacket (nuser, work);
 		    }
@@ -8527,7 +8531,7 @@
 		  if (pname != NULL)
 		    {
 		      sprintf (work,
-			       MESG ("[You were killed by %-.16s]"),
+			       MESG ("[You were killed by %-.24s]"),
 			       CUTTAIL (pname));
 		      SendSystemMessagePacket (i, work);
 		    }
@@ -8676,7 +8680,7 @@
 	      User[i].hold_count = HoldCount;
 	      SendSystemMessagePacket (i, MESG ("[You fall in hole!]"));
 	      SendEffectFallInHolePacket (i);
-	      sprintf (work, MESG ("[You hear sound %-.16s fall in hole]"),
+	      sprintf (work, MESG ("[You hear sound %-.24s fall in hole]"),
 		       CUTTAIL (User[i].name));
 	      SendMessageNearUser (i, work);
 	    }
@@ -8689,7 +8693,7 @@
 #ifdef MAKEWIN32
 	      convertH2C (work, USERNAME_LEN);
 #endif
-	      printf ("user(%d)[%-16.16s] no response\n", i, work);
+	      printf ("user(%d)[%-16.24s] no response\n", i, work);
 	      DisconnectUser (i);
 	    }
 	}
@@ -8886,7 +8890,7 @@
     {
       /* eat meat */
       char work[MESG_BUFFER];
-      sprintf (work, MESG ("animal '%-.16s' eat %-.16s"),
+      sprintf (work, MESG ("animal '%-.24s' eat %-.24s"),
 	       CUTTAIL (Animal[nanimal].name),
 	       CUTTAIL (Animal[targetanimal].name));
       SendMessageNearUserPosition (Animal[nanimal].pos, work);
@@ -8957,11 +8961,11 @@
       if (Npc[npc].hp)
 	{
 	  static const char *mesg[5] = {
-	    "%-.16s say,Nooo!",
-	    "%-.16s say,Animal bite me!",
-	    "%-.16s say,Danger! This animal is ferocity!",
-	    "%-.16s say,Help! Animal bite ...Arrrrgh!",
-	    "%-.16s say,Why is this animal angry?"
+	    "%-.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?"
 	  };
 	  NPCsay (npc, mesg, 5);
 	}
@@ -8968,7 +8972,7 @@
       if (Npc[npc].hp == 0)
 	{
 	  char work[MESG_BUFFER];
-	  sprintf (work, MESG ("'%-.16s' died."), CUTTAIL (Npc[npc].name));
+	  sprintf (work, MESG ("'%-.24s' 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;
@@ -9494,7 +9498,7 @@
 		      Animal[i].hold_count = HoldCount;
 		      sprintf (work,
 			       MESG
-			       ("[You hear sound '%-.16s' fall in hole]"),
+			       ("[You hear sound '%-.24s' fall in hole]"),
 			       CUTTAIL (Animal[i].name));
 		      SendMessageNearUserAnimal (i, work);
 		    }
@@ -9887,11 +9891,11 @@
 	  if (ret == 0)
 	    {
 	      static const char *mesg[5] = {
-		"%-.16s say,FREEZE!",
-		"%-.16s say,FIRE!",
-		"%-.16s say,Hey! I know your position!",
-		"%-.16s say,You can't escape from me!",
-		"%-.16s say,Contact!"
+		"%-.24s say,FREEZE!",
+		"%-.24s say,FIRE!",
+		"%-.24s say,Hey! I know your position!",
+		"%-.24s say,You can't escape from me!",
+		"%-.24s say,Contact!"
 	      };
 	      NPCsay (npc, mesg, 5);
 	    }
@@ -9904,11 +9908,11 @@
 	  if (User[ntarget_user].maybearrest)
 	    {
 	      static const char *mesg[5] = {
-		"%-.16s say,Do not move!",
-		"%-.16s say,You are criminal!",
-		"%-.16s say,Hold up!",
-		"%-.16s say,Do not escape! If you do so,I will shoot you!",
-		"%-.16s say,You should surrender!"
+		"%-.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!"
 	      };
 	      NPCsay (npc, mesg, 5);
 	    }
@@ -9916,11 +9920,11 @@
 		   User[ntarget_user].crime_level)
 	    {
 	      static const char *mesg2[5] = {
-		"%-.16s say,Go out!",
-		"%-.16s say,You can't escape!",
-		"%-.16s say,You no have choise!",
-		"%-.16s say,Do anyone call SWAT? We need!",
-		"%-.16s say,We have surrounded you!"
+		"%-.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!"
 	      };
 	      NPCsay (npc, mesg2, 5);
 	    }
@@ -9987,7 +9991,7 @@
 	  char work[MESG_BUFFER];
 	  MAP (x, y)->id &= ~MAP_THERE_HOLE;
 	  Npc[n].hold_count = HoldCount;
-	  sprintf (work, MESG ("[You hear sound %-.16s fall in hole!]"),
+	  sprintf (work, MESG ("[You hear sound %-.24s fall in hole!]"),
 		   Npc[n].name);
 	  SendMessageNearUserPosition (Npc[n].pos, work);
 	}
@@ -10010,9 +10014,9 @@
       if (getrand (1, 100) < HUNTER_SPEAK_RATE)
 	{
 	  static const char *mesg[3] = {
-	    "%-.16s say,Oh! I am innoucence!",
-	    "%-.16s say,Leave alone!",
-	    "%-.16s say,HELP ME! HELP! HELP!"
+	    "%-.24s say,Oh! I am innoucence!",
+	    "%-.24s say,Leave alone!",
+	    "%-.24s say,HELP ME! HELP! HELP!"
 	  };
 	  NPCsay (n, mesg, 3);
 	}
@@ -10065,11 +10069,11 @@
 	  if (getrand (1, 100) < HUNTER_SPEAK_RATE)
 	    {
 	      static const char *mesg[5] = {
-		"%-.16s say,Anyone see animal?",
-		"%-.16s say,Oh sorry.",
-		"%-.16s say,Nice meet you!",
-		"%-.16s say,Hello. Is there anyone?",
-		"%-.16s say,I want any food. Anyone have?"
+		"%-.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?"
 	      };
 	      NPCsay (n, mesg, 5);
 	    }
@@ -10099,7 +10103,7 @@
 		{
 		  /* get */
 		  char work[MESG_BUFFER];
-		  sprintf (work, MESG ("%-.16s say,Get!"),
+		  sprintf (work, MESG ("%-.24s say,Get!"),
 			   CUTTAIL (Npc[n].name));
 		  SendMessageNearUserPosition (Npc[n].pos, work);
 		  MAP (Animal[ntarget].pos.x, Animal[ntarget].pos.y)->id &=
@@ -10115,14 +10119,14 @@
 		      if (getrand (1, 100) < HUNTER_SPEAK_RATE)
 			{
 			  static const char *mesg_a[3] = {
-			    "%-.16s say,Fire! Fire!",
-			    "%-.16s say,Oh! This animal is strong!",
-			    "%-.16s say,Hey! Cover me!"
+			    "%-.24s say,Fire! Fire!",
+			    "%-.24s say,Oh! This animal is strong!",
+			    "%-.24s say,Hey! Cover me!"
 			  };
 			  static const char *mesg_n[3] = {
-			    "%-.16s say,Fire! Fire! Fire!",
-			    "%-.16s say,We are under attack!",
-			    "%-.16s say,Anyone! Help me!"
+			    "%-.24s say,Fire! Fire! Fire!",
+			    "%-.24s say,We are under attack!",
+			    "%-.24s say,Anyone! Help me!"
 			  };
 			  NPCsay (n,
 				  (t_type == TargetAnimal) ? mesg_a : mesg_n,
@@ -10145,14 +10149,14 @@
 	    {
 	      /* out of range */
 	      static const char *mesg_a[3] = {
-		"%-.16s say,OH NO! I miss animal!",
-		"%-.16s say,Hey! Don't you get my animal?",
-		"%-.16s say,I think animal enter hyper-space."
+		"%-.24s say,OH NO! I miss animal!",
+		"%-.24s say,Hey! Don't you get my animal?",
+		"%-.24s say,I think animal enter hyper-space."
 	      };
 	      static const char *mesg_n[3] = {
-		"%-.16s say,hehe! bye bye!",
-		"%-.16s say,Enemy escape from me.",
-		"%-.16s say,Where?"
+		"%-.24s say,hehe! bye bye!",
+		"%-.24s say,Enemy escape from me.",
+		"%-.24s say,Where?"
 	      };
 	      NPCsay (n, (t_type == TargetAnimal) ? mesg_a : mesg_n, 3);
 	      Npc[n].ntarget_user = -1;
@@ -10222,11 +10226,11 @@
       if (getrand (1, 100) < OBSERVER_SPEAK_RATE)
 	{
 	  static const char *mesg[5] = {
-	    "%-.16s say,*anyone see bad hunter?*",
-	    "%-.16s say,*uhmm. where is he?*",
-	    "%-.16s say,*are you bad hunter?*",
-	    "%-.16s say,*I want to rest here...*",
-	    "%-.16s say,*Zzzzz*"
+	    "%-.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*"
 	  };
 	  NPCsay (n, mesg, 5);
 	}
@@ -10288,9 +10292,9 @@
 	  if (ndistance == 1)
 	    {
 	      static const char *g_mesg[3] = {
-		"%-.16s say,Hey! You do crime!",
-		"%-.16s say,Arrest you!",
-		"%-.16s say,Hold up!"
+		"%-.24s say,Hey! You do crime!",
+		"%-.24s say,Arrest you!",
+		"%-.24s say,Hold up!"
 	      };
 	      if (t_type == TargetUser)
 		{
@@ -10300,7 +10304,7 @@
 		      /* arrest */
 		      char work[MESG_BUFFER];
 		      NPCsay (n, g_mesg, 3);
-		      sprintf (work, MESG ("[You were arrested by %-.16s!]"),
+		      sprintf (work, MESG ("[You were arrested by %-.24s!]"),
 			       CUTTAIL (Npc[n].name));
 		      SendSystemMessagePacket (ntarget, work);
 		      ClearUser (ntarget);
@@ -10337,9 +10341,9 @@
 		{
 		  /* arrest NPC */
 		  static const char *h_mesg[3] = {
-		    "%-.16s say,Oh NO! PLEASE HELP ME!",
-		    "%-.16s say,ARGGGH!",
-		    "%-.16s say,Yeah I understand your claim. But..."
+		    "%-.24s say,Oh NO! PLEASE HELP ME!",
+		    "%-.24s say,ARGGGH!",
+		    "%-.24s say,Yeah I understand your claim. But..."
 		  };
 		  NPCsay (n, g_mesg, 3);
 		  NPCsay (ntarget, h_mesg, 3);
@@ -10367,9 +10371,9 @@
 		      NPCfire (n, ndir) == 0)
 		    {
 		      static const char *mesg[3] = {
-			"%-.16s say,Hey! Stop!",
-			"%-.16s say,You are BAD HUNTER!",
-			"%-.16s say,Shoot!"
+			"%-.24s say,Hey! Stop!",
+			"%-.24s say,You are BAD HUNTER!",
+			"%-.24s say,Shoot!"
 		      };
 		      NPCsay (n, mesg, 3);
 		      return;
@@ -10380,9 +10384,9 @@
 	    {
 	      /* out of range */
 	      static const char *mesg[3] = {
-		"%-.16s say,Shit!",
-		"%-.16s say,I miss bad hunter.",
-		"%-.16s say,Oh no! My radar device is malfunction!"
+		"%-.24s say,Shit!",
+		"%-.24s say,I miss bad hunter.",
+		"%-.24s say,Oh no! My radar device is malfunction!"
 	      };
 	      NPCsay (n, mesg, 3);
 	      Npc[n].ntarget_user = -1;
@@ -10467,11 +10471,11 @@
 	      if (getrand (1, 100) < HIRENPC_SPEAK_RATE)
 		{
 		  static const char *mesg[5] = {
-		    "%-.16s say,sorry.",
-		    "%-.16s say,I cover your back.",
-		    "%-.16s say,Anyone see enemy?",
-		    "%-.16s say,no boggy.",
-		    "%-.16s say,I no see enemy."
+		    "%-.24s say,sorry.",
+		    "%-.24s say,I cover your back.",
+		    "%-.24s say,Anyone see enemy?",
+		    "%-.24s say,no boggy.",
+		    "%-.24s say,I no see enemy."
 		  };
 		  NPCsay (n, mesg, 5);
 		}
@@ -10484,11 +10488,11 @@
 	      if (getrand (1, 100) < HIRENPC_SPEAK_RATE)
 		{
 		  static const char *mesg[5] = {
-		    "%-.16s say,on the way.",
-		    "%-.16s say,search trap now...",
-		    "%-.16s say,Don't go away from me!",
-		    "%-.16s say,no enemy in sight.",
-		    "%-.16s say,I no see any on my radar."
+		    "%-.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."
 		  };
 		  NPCsay (n, mesg, 5);
 		}
@@ -10513,9 +10517,9 @@
 		{
 		  /* boggy! */
 		  static const char *mesg[3] = {
-		    "%-.16s say,Engage enemy!",
-		    "%-.16s say,Hey! Do not enter!",
-		    "%-.16s say,Formation alpha! move to attack position!"
+		    "%-.24s say,Engage enemy!",
+		    "%-.24s say,Hey! Do not enter!",
+		    "%-.24s say,Formation alpha! move to attack position!"
 		  };
 		  NPCsay (n, mesg, 3);
 		  Npc[n].ntarget_user = ntarget;
@@ -10529,9 +10533,9 @@
 		    {
 		      /* owner is under attack! */
 		      static const char *mesg[3] = {
-			"%-.16s say,Alert! HQ is under attack!",
-			"%-.16s say,Condition RED! All guard HQ!",
-			"%-.16s say,Formation sigma! move to support position!"
+			"%-.24s say,Alert! HQ is under attack!",
+			"%-.24s say,Condition RED! All guard HQ!",
+			"%-.24s say,Formation sigma! move to support position!"
 		      };
 		      NPCsay (n, mesg, 3);
 		      Npc[n].ntarget_user = User[nuser].lastuser;
@@ -10543,9 +10547,9 @@
 	    {
 	      /* animal aproach */
 	      static const char *mesg[3] = {
-		"%-.16s say,I find dangerous animal!",
-		"%-.16s say,Animal aproach!",
-		"%-.16s say,Formation delta! move to attack position!"
+		"%-.24s say,I find dangerous animal!",
+		"%-.24s say,Animal aproach!",
+		"%-.24s say,Formation delta! move to attack position!"
 	      };
 	      NPCsay (n, mesg, 3);
 	      Npc[n].ntarget_user = ntarget;
@@ -10606,9 +10610,9 @@
 	  if (ndistance == 1 && Npc[n].weapon)
 	    {
 	      static const char *mesg[3] = {
-		"%-.16s say,I wanna need your support!",
-		"%-.16s say,Shit! This enemy is too near!",
-		"%-.16s say,HAHAHA!"
+		"%-.24s say,I wanna need your support!",
+		"%-.24s say,Shit! This enemy is too near!",
+		"%-.24s say,HAHAHA!"
 	      };
 	      NPCsay (n, mesg, 3);
 	    }
@@ -10617,9 +10621,9 @@
 	      if (ndistance < VIEW_LIMIT && Npc[n].reload == 0)
 		{
 		  static const char *mesg[3] = {
-		    "%-.16s say,I attack this enemy.",
-		    "%-.16s say,We are under fire!",
-		    "%-.16s say,Cover me!"
+		    "%-.24s say,I attack this enemy.",
+		    "%-.24s say,We are under fire!",
+		    "%-.24s say,Cover me!"
 		  };
 		  NPCsay (n, mesg, 3);
 		}
@@ -10628,9 +10632,9 @@
 	    {
 	      /* out of range */
 	      static const char *mesg[3] = {
-		"%-.16s say,I lost target-lock.",
-		"%-.16s say,no see anyone.",
-		"%-.16s say,ok. clear."
+		"%-.24s say,I lost target-lock.",
+		"%-.24s say,no see anyone.",
+		"%-.24s say,ok. clear."
 	      };
 	      NPCsay (n, mesg, 3);
 	      Npc[n].ntarget_user = -1;

--- trunk/hunt.h	(revision 3)
+++ trunk/hunt.h	(revision 4)
@@ -8,10 +8,10 @@
 
 #define DEFAULT_PORT		10001
 
-#define USERNAME_LEN		16
+#define USERNAME_LEN		24
 #define PASSWORD_LEN		16
 #define SCORE_LIMIT		999999999L
-#define ANIMALNAME_LEN		16
+#define ANIMALNAME_LEN		USERNAME_LEN
 #define WEAPON_MAX		2
 #define WEAPONNAME_LEN		32
 #define ITEM_MAX		4