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.35 by root, Sun Jan 21 21:28:27 2007 UTC vs.
Revision 1.42 by root, Wed Mar 14 00:04:59 2007 UTC

… …
264 264
265 flags = query_flags (head); 265 flags = query_flags (head);
266 if (QUERY_FLAG (head, FLAG_NO_PICK)) 266 if (QUERY_FLAG (head, FLAG_NO_PICK))
267 flags |= F_NOPICK; 267 flags |= F_NOPICK;
268 268
269 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 269 ns.send_face (head->face);
270 esrv_send_face (&ns, head->face->number, 0);
271 270
272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 271 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
273 esrv_send_animation (&ns, head->animation_id); 272 ns.send_animation (head->animation_id);
274 273
275 sl << uint32 (head->count) 274 sl << uint32 (head->count)
276 << uint32 (flags) 275 << uint32 (flags)
277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 276 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
278 << uint32 (head->face->number); 277 << uint32 (head->face);
279 278
280 if (!head->custom_name) 279 if (!head->custom_name)
281 { 280 {
282 strncpy (item_n, query_base_name (head, 0), 127); 281 strncpy (item_n, query_base_name (head, 0), 127);
283 item_n[127] = 0; 282 item_n[127] = 0;
… …
334 */ 333 */
335void 334void
336esrv_draw_look (object *pl) 335esrv_draw_look (object *pl)
337{ 336{
338 int got_one = 0, start_look = 0, end_look = 0; 337 int got_one = 0, start_look = 0, end_look = 0;
339 char buf[MAX_BUF];
340 338
341 if (!pl->contr->ns->update_look) 339 if (!pl->contr->ns->update_look)
342 { 340 {
343 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 341 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name);
344 return; 342 return;
345 } 343 }
346 else 344 else
347 pl->contr->ns->update_look = 0; 345 pl->contr->ns->update_look = 0;
348 346
… …
357 packet sl; 355 packet sl;
358 sl.printf ("item%d ", pl->contr->ns->itemcmd); 356 sl.printf ("item%d ", pl->contr->ns->itemcmd);
359 357
360 sl << uint32 (0); 358 sl << uint32 (0);
361 359
362 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 360 pl->contr->ns->send_face (empty_face);
363 esrv_send_face (pl->contr->ns, empty_face->number, 0);
364 361
365 if (pl->contr->ns->look_position) 362 if (pl->contr->ns->look_position)
366 { 363 {
367 char buf[80]; 364 char buf[80];
368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); 365 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
369 366
370 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 367 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
371 << uint32 (0) 368 << uint32 (0)
372 << sint32 (-1) 369 << sint32 (-1)
373 << uint32 (empty_face->number) 370 << uint32 (empty_face)
374 << data8 (buf) 371 << data8 (buf)
375 << uint16 (0) 372 << uint16 (0)
376 << uint8 (0) 373 << uint8 (0)
377 << uint32 (0); 374 << uint32 (0);
378 375
… …
405 * we notice the special tag the object has, and act accordingly. 402 * we notice the special tag the object has, and act accordingly.
406 */ 403 */
407 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) 404 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
408 << uint32 (0) 405 << uint32 (0)
409 << uint32 ((uint32) - 1) 406 << uint32 ((uint32) - 1)
410 << uint32 (empty_face->number) 407 << uint32 (empty_face)
411 << data8 ("Apply this to see next group of items") 408 << data8 ("Apply this to see next group of items")
412 << uint16 (0) 409 << uint16 (0)
413 << uint8 (0) 410 << uint8 (0)
414 << uint32 (0); 411 << uint32 (0);
415 412
… …
502 * 499 *
503 * flags is a list of values to update 500 * flags is a list of values to update
504 * to the client (as defined in newclient.h - might as well use the 501 * to the client (as defined in newclient.h - might as well use the
505 * same value both places. 502 * same value both places.
506 */ 503 */
507
508void 504void
509esrv_update_item (int flags, object *pl, object *op) 505esrv_update_item (int flags, object *pl, object *op)
510{ 506{
511 /* If we have a request to send the player item, skip a few checks. */ 507 /* If we have a request to send the player item, skip a few checks. */
512 if (op != pl) 508 if (op != pl)
… …
557 ns->last_weight = weight; 553 ns->last_weight = weight;
558 } 554 }
559 555
560 if (flags & UPD_FACE) 556 if (flags & UPD_FACE)
561 { 557 {
562 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 558 ns->send_face (op->face);
563 esrv_send_face (ns, op->face->number, 0);
564
565 sl << uint32 (op->face->number); 559 sl << uint32 (op->face);
566 } 560 }
567 561
568 if (flags & UPD_NAME) 562 if (flags & UPD_NAME)
569 { 563 {
570 int len; 564 int len;
… …
670 664
671/** 665/**
672 * Tells the client to delete an item. Uses the item 666 * Tells the client to delete an item. Uses the item
673 * command with a -1 location. 667 * command with a -1 location.
674 */ 668 */
675
676void 669void
677esrv_del_item (player *pl, int tag) 670esrv_del_item (player *pl, int tag)
678{ 671{
672 if (!pl->ns)
673 return;
674
679 packet sl ("delitem"); 675 packet sl ("delitem");
680 676
681 sl << uint32 (tag); 677 sl << uint32 (tag);
682 678
683 pl->ns->send_packet (sl); 679 pl->ns->send_packet (sl);
… …
879 else 875 else
880 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 876 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
881 } 877 }
882} 878}
883 879
884
885
886/** Client wants to look at some object. Lets do so. */ 880/** Client wants to look at some object. Lets do so. */
887void 881void
888LookAt (char *buf, int len, player *pl) 882LookAt (char *buf, int len, player *pl)
889{ 883{
890 int dx, dy; 884 int dx, dy;

Diff Legend

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