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.40 by pippijn, Thu Mar 1 12:28:17 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;
356 packet sl; 355 packet sl;
357 sl.printf ("item%d ", pl->contr->ns->itemcmd); 356 sl.printf ("item%d ", pl->contr->ns->itemcmd);
358 357
359 sl << uint32 (0); 358 sl << uint32 (0);
360 359
361 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 360 pl->contr->ns->send_face (empty_face);
362 esrv_send_face (pl->contr->ns, empty_face->number, 0);
363 361
364 if (pl->contr->ns->look_position) 362 if (pl->contr->ns->look_position)
365 { 363 {
366 char buf[80]; 364 char buf[80];
367 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);
368 366
369 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 367 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
370 << uint32 (0) 368 << uint32 (0)
371 << sint32 (-1) 369 << sint32 (-1)
372 << uint32 (empty_face->number) 370 << uint32 (empty_face)
373 << data8 (buf) 371 << data8 (buf)
374 << uint16 (0) 372 << uint16 (0)
375 << uint8 (0) 373 << uint8 (0)
376 << uint32 (0); 374 << uint32 (0);
377 375
404 * we notice the special tag the object has, and act accordingly. 402 * we notice the special tag the object has, and act accordingly.
405 */ 403 */
406 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE)) 404 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
407 << uint32 (0) 405 << uint32 (0)
408 << uint32 ((uint32) - 1) 406 << uint32 ((uint32) - 1)
409 << uint32 (empty_face->number) 407 << uint32 (empty_face)
410 << data8 ("Apply this to see next group of items") 408 << data8 ("Apply this to see next group of items")
411 << uint16 (0) 409 << uint16 (0)
412 << uint8 (0) 410 << uint8 (0)
413 << uint32 (0); 411 << uint32 (0);
414 412
555 ns->last_weight = weight; 553 ns->last_weight = weight;
556 } 554 }
557 555
558 if (flags & UPD_FACE) 556 if (flags & UPD_FACE)
559 { 557 {
560 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 558 ns->send_face (op->face);
561 esrv_send_face (ns, op->face->number, 0);
562
563 sl << uint32 (op->face->number); 559 sl << uint32 (op->face);
564 } 560 }
565 561
566 if (flags & UPD_NAME) 562 if (flags & UPD_NAME)
567 { 563 {
568 int len; 564 int len;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines