ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/item.C
(Generate patch)

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.14 by root, Thu Dec 14 00:23:59 2006 UTC vs.
Revision 1.17 by root, Thu Dec 14 01:59:10 2006 UTC

… …
109 flags |= F_LOCKED; 109 flags |= F_LOCKED;
110 110
111 return flags; 111 return flags;
112} 112}
113 113
114/* Used in the send_look to put object head into SockList 114/* Used in the send_look to put object head into packet
115 * sl for socket ns. Need socket to know if we need to send 115 * sl for socket ns. Need socket to know if we need to send
116 * animation of face to the client. 116 * animation of face to the client.
117 */ 117 */
118static void 118static void
119add_object_to_socklist (NewSocket &ns, SockList &sl, object *head) 119add_object_to_socklist (NewSocket &ns, packet &sl, object *head)
120{ 120{
121 int flags, len, anim_speed; 121 int flags, len, anim_speed;
122 char item_n[MAX_BUF]; 122 char item_n[MAX_BUF];
123 const char *item_p; 123 const char *item_p;
124 124
… …
216 return; 216 return;
217 217
218 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) 218 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
219 ; 219 ;
220 220
221 SockList sl (MAXSOCKBUF); 221 packet sl;
222 222
223 Write_String_To_Socket (&pl->contr->socket, "delinv 0", sizeof ("delinv 0") - 1); 223 pl->contr->socket.send_packet ("delinv 0");
224 224
225 sl.printf ("item%d ", pl->contr->socket.itemcmd); 225 sl.printf ("item%d ", pl->contr->socket.itemcmd);
226 226
227 sl << uint32 (0); 227 sl << uint32 (0);
228 228
… …
292 head = tmp; 292 head = tmp;
293 293
294 add_object_to_socklist (pl->contr->socket, sl, head); 294 add_object_to_socklist (pl->contr->socket, sl, head);
295 got_one++; 295 got_one++;
296 296
297 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 297 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
298 { 298 {
299 Send_With_Handling (&pl->contr->socket, &sl); 299 Send_With_Handling (&pl->contr->socket, &sl);
300 300
301 sl.reset (); 301 sl.reset ();
302 sl.printf ("item%d ", pl->contr->socket.itemcmd); 302 sl.printf ("item%d ", pl->contr->socket.itemcmd);
… …
307 } 307 }
308 308
309 if (got_one) 309 if (got_one)
310 Send_With_Handling (&pl->contr->socket, &sl); 310 Send_With_Handling (&pl->contr->socket, &sl);
311 311
312 sl.free ();
313} 312}
314 313
315/** 314/**
316 * Sends whole inventory. 315 * Sends whole inventory.
317 */ 316 */
… …
319esrv_send_inventory (object *pl, object *op) 318esrv_send_inventory (object *pl, object *op)
320{ 319{
321 object *tmp; 320 object *tmp;
322 int got_one = 0; 321 int got_one = 0;
323 322
324 SockList sl (MAXSOCKBUF); 323 packet sl;
325 324
326 sl.printf ("delinv %d", op->count); 325 sl.printf ("delinv %d", op->count);
327 Send_With_Handling (&pl->contr->socket, &sl); 326 Send_With_Handling (&pl->contr->socket, &sl);
328 327
329 sl.reset (); 328 sl.reset ();
… …
348 347
349 /* IT is possible for players to accumulate a huge amount of 348 /* IT is possible for players to accumulate a huge amount of
350 * items (especially with some of the bags out there) to 349 * items (especially with some of the bags out there) to
351 * overflow the buffer. IF so, send multiple item commands. 350 * overflow the buffer. IF so, send multiple item commands.
352 */ 351 */
353 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 352 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
354 { 353 {
355 Send_With_Handling (&pl->contr->socket, &sl); 354 Send_With_Handling (&pl->contr->socket, &sl);
355
356 sl.reset ();
356 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 357 sl.printf ("item%d ", pl->contr->socket.itemcmd);
357 sl.len = strlen ((char *) sl.buf);
358 sl << uint32 (op->count); 358 sl << uint32 (op->count);
359 got_one = 0; 359 got_one = 0;
360 } 360 }
361 } /* If LOOK_OBJ() */ 361 } /* If LOOK_OBJ() */
362 } 362 }
363 363
364 if (got_one) 364 if (got_one)
365 Send_With_Handling (&pl->contr->socket, &sl); 365 Send_With_Handling (&pl->contr->socket, &sl);
366 366
367 sl.free ();
368} 367}
369 368
370/** 369/**
371 * Updates object *op for player *pl. 370 * Updates object *op for player *pl.
372 * 371 *
… …
396 * and track back the call. 395 * and track back the call.
397 */ 396 */
398 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 397 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
399 } 398 }
400 399
401 SockList sl (MAXSOCKBUF); 400 packet sl;
402 401
403 sl << "upditem " 402 sl << "upditem "
404 << uint8 (flags); 403 << uint8 (flags);
405 404
406 if (op->head) 405 if (op->head)
… …
490 489
491 if (flags & UPD_NROF) 490 if (flags & UPD_NROF)
492 sl << uint32 (op->nrof); 491 sl << uint32 (op->nrof);
493 492
494 Send_With_Handling (&pl->contr->socket, &sl); 493 Send_With_Handling (&pl->contr->socket, &sl);
495 sl.free ();
496} 494}
497 495
498/** 496/**
499 * Sends item's info to player. 497 * Sends item's info to player.
500 */ 498 */
… …
515 pl->contr->socket.update_look = 1; 513 pl->contr->socket.update_look = 1;
516 return; 514 return;
517 } 515 }
518 } 516 }
519 517
520 SockList sl (MAXSOCKBUF); 518 packet sl;
521 519
522 sl.printf ("item%d ", pl->contr->socket.itemcmd); 520 sl.printf ("item%d ", pl->contr->socket.itemcmd);
523 521
524 if (op->head) 522 if (op->head)
525 op = op->head; 523 op = op->head;
… …
529 add_object_to_socklist (pl->contr->socket, sl, op); 527 add_object_to_socklist (pl->contr->socket, sl, op);
530 528
531 Send_With_Handling (&pl->contr->socket, &sl); 529 Send_With_Handling (&pl->contr->socket, &sl);
532 SET_FLAG (op, FLAG_CLIENT_SENT); 530 SET_FLAG (op, FLAG_CLIENT_SENT);
533 531
534 sl.free ();
535} 532}
536 533
537/** 534/**
538 * Tells the client to delete an item. Uses the item 535 * Tells the client to delete an item. Uses the item
539 * command with a -1 location. 536 * command with a -1 location.
540 */ 537 */
541 538
542void 539void
543esrv_del_item (player *pl, int tag) 540esrv_del_item (player *pl, int tag)
544{ 541{
545 SockList sl (MAXSOCKBUF); 542 packet sl;
546 543
547 sl << "delitem " 544 sl << "delitem "
548 << uint32 (tag); 545 << uint32 (tag);
549 546
550 Send_With_Handling (&pl->socket, &sl); 547 Send_With_Handling (&pl->socket, &sl);
551 sl.free ();
552} 548}
553 549
554 550
555/******************************************************************************* 551/*******************************************************************************
556 * 552 *

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines