Commit: 9 - hunton_server (svn)

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

Commit MetaInfo

• Revision: 9 (tree)
• Time: 2016-02-01 01:39:42
• Author: manjihq

Log Message

サーバー送出メッセージの調整

Change Summary

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

Incremental Difference

--- trunk/huntserv.c	(revision 8)
+++ trunk/huntserv.c	(revision 9)
@@ -121,7 +121,7 @@
 #define SENDPACKET(u,p,s) send_packet_c (User[(u)].session.handle,(p),(s))
 #endif
 
-#define CUTTAIL(s)	cut_tail(s,USERNAME_LEN)
+#define CUTTAIL(s)	cut_tail(s,sizeof(s))
 
 #define ALLOCATE_CHUNK		16
 #define BUFFER_SIZE		256
@@ -4428,8 +4428,8 @@
       if (User[nowner].myshop[nshop].count[n][i])
 	{
 	  sprintf (work,
-		   n ? MESG ("<%2d:%-32.24s:%10luP %4ucount (stock:%4u)>") :
-		   MESG ("<%2d:%-32.24s:%10luP %4uround (stock:%4u)>"),
+		   n ? MESG ("<%2d:%-32.32s:%10luP %4ucount (stock:%4u)>") :
+		   MESG ("<%2d:%-32.32s:%10luP %4uround (stock:%4u)>"),
 		   i,
 		   (n ? Item[User[nowner].myshop[nshop].list[n][i]].name :
 		    Weapon[User[nowner].myshop[nshop].list[n][i]].name),
@@ -4472,7 +4472,7 @@
 	{
 	  WEAPONINFO *pw = Weapon + plist[i];
 	  sprintf (work,
-		   MESG ("<%3d:%-32.24s:%10luP %4uround HP%4u/Moral%4u "
+		   MESG ("<%3d:%-32.32s:%10luP %4uround HP%4u/Moral%4u "
 			 "Range:%4ublock>"),
 		   i, pw->name, pw->cost, pw->bullette,
 		   pw->firepower, pw->moral, pw->range);
@@ -4513,7 +4513,7 @@
 	{
 	  ITEMINFO *pi = Item + plist[i];
 	  sprintf (work,
-		   MESG ("<%3d:%-32.24s:%10luP %4ucount>"),
+		   MESG ("<%3d:%-32.32s:%10luP %4ucount>"),
 		   i, pi->name, pi->cost, pi->count);
 	  SendSystemMessagePacket (nuser, work);
 	}
@@ -5791,21 +5791,21 @@
 	  if (ntarget != -1)
 	    {
 	      char uname[USERNAME_LEN];
-	      memcpy (uname, User[nuser].name, USERNAME_LEN);
+	      memcpy (uname, User[ntarget].name, USERNAME_LEN);
 	      printf ("Delete User name:%-.24s\n", uname);
-	      DeleteUser (nuser);
-	      SendResultPacket (User[nuser].session.handle, 0);
+	      DeleteUser (ntarget);
+	      SendSystemMessagePacket (nuser, "[Delete complete]");
 	    }
 	  else
 	    {
 	      puts ("no user.");
-	      SendResultPacket (User[nuser].session.handle, -1);
+	      SendSystemMessagePacket (nuser, "[no user]");
 	    }
 	}
       else
 	{
 	  printf ("User:%d [%-.24s] is cracking!\n", nuser, User[nuser].name);
-	  SendResultPacket (User[nuser].session.handle, -1);
+	  SendSystemMessagePacket (nuser, "[uh?]");
 	}
       break;
     case HCLIT_LOGOFF:
@@ -6246,7 +6246,8 @@
 	    }
 	  User[nuser].myshop[nshop].count[isitem][i]++;
 	  sprintf (work, MESG ("[%-.24s stocked]"),
-		   isitem ? Item[n].name : Weapon[n].name);
+		   isitem ? CUTTAIL (Item[n].name) : CUTTAIL (Weapon[n].
+							      name));
 	  SendSystemMessagePacket (nuser, work);
 	}
       else
@@ -6549,7 +6550,7 @@
   else
     {
       char work[PACKET_DATA_MAX];
-      sprintf (work, MESG ("[Weapon:%-32.24s NOT READY]"),
+      sprintf (work, MESG ("[Weapon:%-32.32s NOT READY]"),
 	       Weapon[User[nuser].weapon[nweapon]].name);
       SendSystemMessagePacket (nuser, work);
     }
@@ -6601,8 +6602,9 @@
 	    {
 	      /* list up this */
 	      int relpos = get_rel_position_in (dx1, dx2, dy1, dy2);
-	      sprintf (work, MESG ("<%-16.24s %10s %5dBlock>"),
-		       Animal[i].name, MESG (RelDirection[relpos]), n);
+	      sprintf (work, MESG ("<%-.24s %10s %5dBlock>"),
+		       CUTTAIL (Animal[i].name),
+		       MESG (RelDirection[relpos]), n);
 	      SendSystemMessagePacket (nuser, work);
 	    }
 	}
@@ -6641,15 +6643,17 @@
 	      if (User[i].c_type == Hunter)
 		{
 		  sprintf (work,
-			   MESG ("<Hunter:%-16.24s %10s %5dBlock crime:%lu>"),
-			   User[i].name, MESG (RelDirection[relpos]), n,
+			   MESG ("<Hunter:%-.24s %10s %5dBlock crime:%lu>"),
+			   CUTTAIL (User[i].name),
+			   MESG (RelDirection[relpos]), n,
 			   User[i].maybearrest);
 		}
 	      else
 		{
 		  sprintf (work,
-			   MESG ("<Guard :%-16.24s %10s %5dBlock>"),
-			   User[i].name, MESG (RelDirection[relpos]), n);
+			   MESG ("<Guard :%-.24s %10s %5dBlock>"),
+			   CUTTAIL (User[i].name),
+			   MESG (RelDirection[relpos]), n);
 		}
 	      SendSystemMessagePacket (nuser, work);
 	    }
@@ -6682,13 +6686,15 @@
 	      if (Npc[i].c_type == NpcHunter)
 		{
 		  sprintf (work,
-			   MESG ("<Hunter:%-16.24s %10s %5dBlock crime:NA>"),
-			   Npc[i].name, MESG (RelDirection[relpos]), n);
+			   MESG ("<Hunter:%-.24s %10s %5dBlock crime:NA>"),
+			   CUTTAIL (Npc[i].name),
+			   MESG (RelDirection[relpos]), n);
 		}
 	      else
 		{
-		  sprintf (work, MESG ("<Guard :%-16.24s %10s %5dBlock>"),
-			   Npc[i].name, MESG (RelDirection[relpos]), n);
+		  sprintf (work, MESG ("<Guard :%-.24s %10s %5dBlock>"),
+			   CUTTAIL (Npc[i].name),
+			   MESG (RelDirection[relpos]), n);
 		}
 	      SendSystemMessagePacket (nuser, work);
 	    }
@@ -6921,13 +6927,13 @@
 	    }
 	  break;
 	case Vehicle:
-	  sprintf (work, MESG ("You ride on %-.24s"), pitem->name);
+	  sprintf (work, MESG ("You ride on %-.24s"), 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..."), pitem->name);
+	  sprintf (work, MESG ("You eat %-.24s..."), CUTTAIL (pitem->name));
 	  if (pitem->effect > 100)
 	    {
 	      strcat (work, MESG ("Delicious!"));
@@ -6991,7 +6997,7 @@
   User[nuser].item[i] = nitem;
   User[nuser].itemcount[i] = Item[User[nuser].item[i]].count;
   sprintf (work, MESG ("[Get item%1d:%-.24s]"),
-	   i + 1, Item[User[nuser].item[i]].name);
+	   i + 1, CUTTAIL (Item[User[nuser].item[i]].name));
   SendSystemMessagePacket (nuser, work);
   return i;
 }
@@ -7019,7 +7025,7 @@
   User[nuser].bullette[i] = Weapon[User[nuser].weapon[i]].bullette;
   User[nuser].reload[i] = 0;
   sprintf (work, MESG ("[Get weapon%1d:%-.24s]"),
-	   i + 1, Weapon[User[nuser].weapon[i]].name);
+	   i + 1, CUTTAIL (Weapon[User[nuser].weapon[i]].name));
   SendSystemMessagePacket (nuser, work);
   return i;
 }
@@ -7115,7 +7121,8 @@
 	  /* can't get this. drop original position */
 	  char work[MESG_BUFFER];
 	  sprintf (work, MESG ("[You have no space to get %-.24s!]"),
-		   isitem ? Item[nitem].name : Weapon[nitem].name);
+		   isitem ? CUTTAIL (Item[nitem].name) :
+		   CUTTAIL (Weapon[nitem].name));
 	  SendSystemMessagePacket (nuser, work);
 	  addUserItemBox (x, y, isitem, nitem, nleft, NULL);
 	}
@@ -7564,8 +7571,8 @@
 	{
 	  char work[MESG_BUFFER];
 	  sprintf (work,
-		   MESG ("<%d:%-16.24s (%3d,%3d)>"), i + 1,
-		   User[nuser].myshop[i].name,
+		   MESG ("<%d:%-.24s (%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);
 	}
@@ -7580,6 +7587,7 @@
 {
   int i;
   char work[MESG_BUFFER];
+  char namebuffer[24];
   SendSystemMessagePacket (nuser, MESG ("<CAPTURED ANIMAL>"));
   for (i = 0; i < User[nuser].animal_slot; i++)
     {
@@ -7586,8 +7594,9 @@
       ANIMALDATA *p = User[nuser].lastPickupAnimal[i];
       if (p != NULL)
 	{
-	  sprintf (work, MESG ("<%d:%-16.24s(%-.24s)>"), i + 1, p->name,
-		   Item[p->forsell_item].name);
+	  strncpy (namebuffer, CUTTAIL (p->name), sizeof (namebuffer));
+	  sprintf (work, MESG ("<%d:%-.24s(%-.24s)>"), i + 1, namebuffer,
+		   CUTTAIL (Item[p->forsell_item].name));
 	  SendSystemMessagePacket (nuser, work);
 	}
       else
@@ -7691,8 +7700,8 @@
     {
       if (animal[i])
 	{
-	  sprintf (work, MESG ("<'%-16.24s' lives:%3d rate:%3u value:%5u>"),
-		   AnimalData[i].name, animal[i],
+	  sprintf (work, MESG ("<'%-.24s' lives:%3d rate:%3u value:%5u>"),
+		   CUTTAIL (AnimalData[i].name), animal[i],
 		   AnimalData[i].rate, AnimalData[i].value);
 	  SendSystemMessagePacket (nuser, work);
 	}
@@ -7735,9 +7744,9 @@
 	    {
 	      strcpy (subjectbuffer, "NO SUBJECT");
 	    }
-	  sprintf (work, "<%c%2d:%-16.24s %-.24s>",
+	  sprintf (work, "<%c%2d:%-.24s %-.32s>",
 		   pmail->readflag ? ' ' : '*', i + 1,
-		   User[pmail->fromuser].name, subjectbuffer);
+		   CUTTAIL (User[pmail->fromuser].name), subjectbuffer);
 	  SendSystemMessagePacket (nuser, work);
 	  f = 1;
 	}
@@ -7829,8 +7838,9 @@
 	    {
 	      strcpy (subjectbuffer, "NO SUBJECT");
 	    }
-	  sprintf (work, "<%2d:%-16.24s %-.24s>",
-		   i + 1, User[pmail->fromuser].name, subjectbuffer);
+	  sprintf (work, "<%2d:%-.24s %-.32s>",
+		   i + 1, CUTTAIL (User[pmail->fromuser].name),
+		   subjectbuffer);
 	  SendSystemMessagePacket (nuser, work);
 	  f = 1;
 	}
@@ -8293,9 +8303,12 @@
 			{
 			  if (pb->nuser != -1 && pb->t_type == TargetNpc)
 			    {
+			      char namebuffer[24];
+			      strncpy (namebuffer, CUTTAIL (Npc[npc].name),
+				       sizeof (namebuffer));
 			      sprintf (work,
 				       MESG ("'%-.24s' killed by %-.24s!"),
-				       CUTTAIL (Npc[npc].name),
+				       namebuffer,
 				       CUTTAIL (Npc[pb->nuser].name));
 			    }
 			  else
@@ -8689,7 +8702,7 @@
 	      /* perhaps,disconnect session. */
 	      char work[USERNAME_LEN];
 	      memcpy (work, User[i].name, USERNAME_LEN);
-	      printf ("user(%d)[%-16.24s] no response\n", i, work);
+	      printf ("user(%d)[%-.24s] no response\n", i, work);
 	      DisconnectUser (i);
 	    }
 	}
@@ -8886,8 +8899,10 @@
     {
       /* eat meat */
       char work[MESG_BUFFER];
-      sprintf (work, MESG ("animal '%-.24s' eat %-.24s"),
-	       CUTTAIL (Animal[nanimal].name),
+      char namebuffer[24];
+      strncpy (namebuffer, CUTTAIL (Animal[nanimal].name),
+	       sizeof (namebuffer));
+      sprintf (work, MESG ("animal '%-.24s' eat %-.24s"), namebuffer,
 	       CUTTAIL (Animal[targetanimal].name));
       SendMessageNearUserPosition (Animal[nanimal].pos, work);
       MAP (Animal[targetanimal].pos.x, Animal[targetanimal].pos.y)->id &=
@@ -9988,7 +10003,7 @@
 	  MAP (x, y)->id &= ~MAP_THERE_HOLE;
 	  Npc[n].hold_count = HoldCount;
 	  sprintf (work, MESG ("[You hear sound %-.24s fall in hole!]"),
-		   Npc[n].name);
+		   CUTTAIL (Npc[n].name));
 	  SendMessageNearUserPosition (Npc[n].pos, work);
 	}
     }