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.32 by root, Tue Jan 9 21:32:43 2007 UTC vs.
Revision 1.43 by root, Tue Apr 3 00:21:38 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); 270 ns.flush_fx ();
271 271
272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
273 esrv_send_animation (&ns, head->animation_id); 273 ns.send_animation (head->animation_id);
274 274
275 sl << uint32 (head->count) 275 sl << uint32 (head->count)
276 << uint32 (flags) 276 << uint32 (flags)
277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
278 << uint32 (head->face->number); 278 << uint32 (head->face);
279 279
280 if (!head->custom_name) 280 if (!head->custom_name)
281 { 281 {
282 strncpy (item_n, query_base_name (head, 0), 127); 282 strncpy (item_n, query_base_name (head, 0), 127);
283 item_n[127] = 0; 283 item_n[127] = 0;
… …
304 { 304 {
305 if (head->anim_speed) 305 if (head->anim_speed)
306 anim_speed = head->anim_speed; 306 anim_speed = head->anim_speed;
307 else 307 else
308 { 308 {
309 if (FABS (head->speed) < 0.001) 309 if (fabs (head->speed) < 0.001)
310 anim_speed = 255; 310 anim_speed = 255;
311 else if (FABS (head->speed) >= 1.0) 311 else if (fabs (head->speed) >= 1.0)
312 anim_speed = 1; 312 anim_speed = 1;
313 else 313 else
314 anim_speed = (int) (1.0 / FABS (head->speed)); 314 anim_speed = (int) (1.0 / fabs (head->speed));
315 } 315 }
316 316
317 if (anim_speed > 255) 317 if (anim_speed > 255)
318 anim_speed = 255; 318 anim_speed = 255;
319 } 319 }
… …
334 */ 334 */
335void 335void
336esrv_draw_look (object *pl) 336esrv_draw_look (object *pl)
337{ 337{
338 int got_one = 0, start_look = 0, end_look = 0; 338 int got_one = 0, start_look = 0, end_look = 0;
339 char buf[MAX_BUF];
340 339
341 if (!pl->contr->ns->update_look) 340 if (!pl->contr->ns->update_look)
342 { 341 {
343 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 342 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name);
344 return; 343 return;
345 } 344 }
346 else 345 else
347 pl->contr->ns->update_look = 0; 346 pl->contr->ns->update_look = 0;
348 347
… …
357 packet sl; 356 packet sl;
358 sl.printf ("item%d ", pl->contr->ns->itemcmd); 357 sl.printf ("item%d ", pl->contr->ns->itemcmd);
359 358
360 sl << uint32 (0); 359 sl << uint32 (0);
361 360
362 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 361 pl->contr->ns->send_face (empty_face);
363 esrv_send_face (pl->contr->ns, empty_face->number, 0); 362 pl->contr->ns->flush_fx ();
364 363
365 if (pl->contr->ns->look_position) 364 if (pl->contr->ns->look_position)
366 { 365 {
367 char buf[80]; 366 char buf[80];
368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); 367 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
369 368
370 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 369 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
371 << uint32 (0) 370 << uint32 (0)
372 << sint32 (-1) 371 << sint32 (-1)
373 << uint32 (empty_face->number) 372 << uint32 (empty_face)
374 << data8 (buf) 373 << data8 (buf)
375 << uint16 (0) 374 << uint16 (0)
376 << uint8 (0) 375 << uint8 (0)
377 << uint32 (0); 376 << uint32 (0);
378 377
… …
405 * we notice the special tag the object has, and act accordingly. 404 * we notice the special tag the object has, and act accordingly.
406 */ 405 */
407 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) 406 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
408 << uint32 (0) 407 << uint32 (0)
409 << uint32 ((uint32) - 1) 408 << uint32 ((uint32) - 1)
410 << uint32 (empty_face->number) 409 << uint32 (empty_face)
411 << data8 ("Apply this to see next group of items") 410 << data8 ("Apply this to see next group of items")
412 << uint16 (0) 411 << uint16 (0)
413 << uint8 (0) 412 << uint8 (0)
414 << uint32 (0); 413 << uint32 (0);
415 414
… …
448 * Sends whole inventory. 447 * Sends whole inventory.
449 */ 448 */
450void 449void
451esrv_send_inventory (object *pl, object *op) 450esrv_send_inventory (object *pl, object *op)
452{ 451{
452 if (!pl->contr->ns)//D
453 return;
454
453 int got_one = 0; 455 int got_one = 0;
454 456
455 pl->contr->ns->send_packet_printf ("delinv %d", op->count); 457 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
456 458
457 packet sl; 459 packet sl;
… …
499 * 501 *
500 * flags is a list of values to update 502 * flags is a list of values to update
501 * to the client (as defined in newclient.h - might as well use the 503 * to the client (as defined in newclient.h - might as well use the
502 * same value both places. 504 * same value both places.
503 */ 505 */
504
505void 506void
506esrv_update_item (int flags, object *pl, object *op) 507esrv_update_item (int flags, object *pl, object *op)
507{ 508{
508 /* If we have a request to send the player item, skip a few checks. */ 509 /* If we have a request to send the player item, skip a few checks. */
509 if (op != pl) 510 if (op != pl)
… …
554 ns->last_weight = weight; 555 ns->last_weight = weight;
555 } 556 }
556 557
557 if (flags & UPD_FACE) 558 if (flags & UPD_FACE)
558 { 559 {
559 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 560 ns->send_face (op->face);
560 esrv_send_face (ns, op->face->number, 0); 561 ns->flush_fx ();
561
562 sl << uint32 (op->face->number); 562 sl << uint32 (op->face);
563 } 563 }
564 564
565 if (flags & UPD_NAME) 565 if (flags & UPD_NAME)
566 { 566 {
567 int len; 567 int len;
… …
601 { 601 {
602 if (op->anim_speed) 602 if (op->anim_speed)
603 anim_speed = op->anim_speed; 603 anim_speed = op->anim_speed;
604 else 604 else
605 { 605 {
606 if (FABS (op->speed) < 0.001) 606 if (fabs (op->speed) < 0.001)
607 anim_speed = 255; 607 anim_speed = 255;
608 else if (FABS (op->speed) >= 1.0) 608 else if (fabs (op->speed) >= 1.0)
609 anim_speed = 1; 609 anim_speed = 1;
610 else 610 else
611 anim_speed = (int) (1.0 / FABS (op->speed)); 611 anim_speed = (int) (1.0 / fabs (op->speed));
612 } 612 }
613 613
614 if (anim_speed > 255) 614 if (anim_speed > 255)
615 anim_speed = 255; 615 anim_speed = 255;
616 } 616 }
… …
628 * Sends item's info to player. 628 * Sends item's info to player.
629 */ 629 */
630void 630void
631esrv_send_item (object *pl, object *op) 631esrv_send_item (object *pl, object *op)
632{ 632{
633 if (!pl->contr->ns)
634 return;
635
633 /* If this is not the player object, do some more checks */ 636 /* If this is not the player object, do some more checks */
634 if (op != pl) 637 if (op != pl)
635 { 638 {
636 /* We only send 'visibile' objects to the client */ 639 /* We only send 'visibile' objects to the client */
637 if (!op->client_visible ()) 640 if (!op->client_visible ())
… …
664 667
665/** 668/**
666 * Tells the client to delete an item. Uses the item 669 * Tells the client to delete an item. Uses the item
667 * command with a -1 location. 670 * command with a -1 location.
668 */ 671 */
669
670void 672void
671esrv_del_item (player *pl, int tag) 673esrv_del_item (player *pl, int tag)
672{ 674{
675 if (!pl->ns)
676 return;
677
673 packet sl ("delitem"); 678 packet sl ("delitem");
674 679
675 sl << uint32 (tag); 680 sl << uint32 (tag);
676 681
677 pl->ns->send_packet (sl); 682 pl->ns->send_packet (sl);
… …
873 else 878 else
874 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 879 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
875 } 880 }
876} 881}
877 882
878
879
880/** Client wants to look at some object. Lets do so. */ 883/** Client wants to look at some object. Lets do so. */
881void 884void
882LookAt (char *buf, int len, player *pl) 885LookAt (char *buf, int len, player *pl)
883{ 886{
884 int dx, dy; 887 int dx, dy;
… …
889 { 892 {
890 return; 893 return;
891 } 894 }
892 dy = atoi (cp); 895 dy = atoi (cp);
893 896
894 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2) 897 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
895 return; 898 return;
896 899
897 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 900 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
898 return; 901 return;
899 902

Diff Legend

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