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.63 by root, Thu Apr 24 00:30:52 2008 UTC vs.
Revision 1.78 by root, Mon Apr 27 01:38:49 2009 UTC

… …
36#include <object.h> 36#include <object.h>
37#include <sproto.h> 37#include <sproto.h>
38 38
39/** This is the maximum number of bytes we expect any one item to take up */ 39/** This is the maximum number of bytes we expect any one item to take up */
40#define MAXITEMLEN 300 40#define MAXITEMLEN 300
41
42#if 0
43tag_t
44client_container::tag () const
45{
46 switch (type)
47 {
48 case CC_INVENTORY:
49 return ns->pl->count;
50 case CC_MAPSPACE:
51 return 0;
52 case CC_CONTAINER:
53 return env->count;
54 }
55
56 abort ();
57}
58
59void
60client_container::clear ()
61{
62 switch (type)
63 {
64 case CC_INVENTORY:
65 abort ();
66
67 case CC_MAPSPACE:
68 case CC_CONTAINER:
69 ns->send_packet_printf ("delinv %d", tag ());
70 break;
71 }
72
73 for (iterator i = begin (); i != end (); ++i)
74 i->op->seen_by = 0;
75
76 vector< refitem, slice_allocator<refitem> >::clear ();
77}
78
79inline iterator
80client_container::merge_item (iterator i, object *op)
81{
82 if (i != end () && i->op == op)
83 return ++i;
84
85 if (op->seen_by)
86 return; // seen by another entity already
87
88 op->seen_by = this;
89
90 refitem ref;
91 ref.op = op;
92
93 return insert (i, ref);
94}
95
96void
97client_container::update (int offset)
98{
99 iterator i = begin ();
100
101 switch (type)
102 {
103 case CC_INVENTORY:
104 case CC_CONTAINER:
105 {
106 object *env = type == CC_INVENTORY
107 ? ns->pl->ob
108 : this->env;
109
110 // pass 1, erase all objects no longer in container
111 for (iterator j = begin (); j != end (); ++j)
112 if (j->op->env != env)
113 {
114 j->op->seen_by = 0;
115 erase (j);
116 }
117
118 // pass 2 merge items
119 for (object *op = env->inv; op; op = op->below)
120 {
121 if (--offset < 0)
122 i = merge_item (i, op);
123 else if (offset < -FLOORBOX_PAGESIZE)
124 break;
125 }
126 }
127 break;
128
129 case CC_MAPSPACE:
130 {
131 // pass 1, erase all objects no longer on space
132 for (iterator j = begin (); j != end (); ++j)
133 if (j->op->x != x || j->op->y != y || j->op->map != map)
134 {
135 j->op->seen_by = 0;
136 erase (j);
137 }
138
139 // pass 2 merge items
140 for (object *op = GET_MAP_OB (map, x, y); op; op = op->above)
141 {
142 if (--offset < 0)
143 i = merge_item (i, op);
144 else if (offset < -FLOORBOX_PAGESIZE)
145 break;
146 }
147 }
148 break;
149 }
150
151 // pass 3, erase all extra items
152 for (iterator j = i; j != end (); ++j)
153 j->op->seen_by = 0;
154
155 if (i != end ())
156 erase (i, end ());
157}
158
159void
160client_container::set_mapspace (maptile *map, int x, int y)
161{
162 if (type == CC_MAPSPACE
163 && this->map == map
164 && this->x == x
165 && this->y == y)
166 return;
167
168 clear ();
169
170 type = CC_MAPSPACE;
171 this->map = map;
172 this->x = x;
173 this->y = y;
174}
175
176void
177client_container::set_container (object *env)
178{
179}
180#endif
181 41
182/******************************************************************************* 42/*******************************************************************************
183 * 43 *
184 * Functions related to sending object data to the client. 44 * Functions related to sending object data to the client.
185 * 45 *
… …
253 * animation of face to the client. 113 * animation of face to the client.
254 */ 114 */
255static void 115static void
256add_object_to_socklist (client &ns, packet &sl, object *head) 116add_object_to_socklist (client &ns, packet &sl, object *head)
257{ 117{
258 int flags, len, anim_speed;
259 char item_n[MAX_BUF]; 118 char item_n[MAX_BUF];
260 const char *item_p; 119 const char *item_p;
261 120
262 flags = query_flags (head); 121 int flags = query_flags (head);
263 if (QUERY_FLAG (head, FLAG_NO_PICK)) 122 if (QUERY_FLAG (head, FLAG_NO_PICK))
264 flags |= F_NOPICK; 123 flags |= F_NOPICK;
265 124
266 ns.send_face (head->face, -50); 125 ns.send_face (head->face, -50);
267 ns.flush_fx (); 126 ns.flush_fx ();
… …
272 sl << uint32 (head->count) 131 sl << uint32 (head->count)
273 << uint32 (flags) 132 << uint32 (flags)
274 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) 133 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
275 << uint32 (head->face); 134 << uint32 (head->face);
276 135
136 int len;
137
277 if (!head->custom_name) 138 if (!head->custom_name)
278 { 139 {
279 strncpy (item_n, query_base_name (head, 0), 127); 140 strncpy (item_n, query_base_name (head, 0), 127);
280 item_n[127] = 0; 141 item_n[127] = 0;
281 len = strlen (item_n); 142 len = strlen (item_n);
… …
294 len += strlen (item_n + 1 + len) + 1; 155 len += strlen (item_n + 1 + len) + 1;
295 156
296 sl << data8 (item_n, len) 157 sl << data8 (item_n, len)
297 << uint16 (head->animation_id); 158 << uint16 (head->animation_id);
298 159
299 anim_speed = 0; 160 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
300 if (QUERY_FLAG (head, FLAG_ANIMATE)) 161 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
301 { 162 : 1. / clamp (fabs (head->speed), 1./255., 1./1.);
302 if (head->anim_speed)
303 anim_speed = head->anim_speed;
304 else
305 {
306 if (fabs (head->speed) < 0.001)
307 anim_speed = 255;
308 else if (fabs (head->speed) >= 1.0)
309 anim_speed = 1;
310 else
311 anim_speed = (int) (1.0 / fabs (head->speed));
312 }
313
314 if (anim_speed > 255)
315 anim_speed = 255;
316 }
317 163
318 sl << uint8 (anim_speed) 164 sl << uint8 (anim_speed)
319 << uint32 (head->nrof); 165 << uint32 (head->nrof);
320 166
321 if (ns.itemcmd == 2) 167 if (ns.itemcmd == 2)
322 sl << uint16 (head->client_type); 168 sl << uint16 (head->client_type);
323
324 SET_FLAG (head, FLAG_CLIENT_SENT);
325} 169}
170
171static faceidx
172need_face_now (player *pl, const char *name)
173{
174 faceidx face = face_find (name, empty_face);
175
176 pl->ns->send_face (face, -50);
177 pl->ns->flush_fx ();
178
179 return face;
180}
181
182#define FINGER_UP "finger_up.x11"
183#define FINGER_DOWN "finger_down.x11"
326 184
327/** 185/**
328 * Send the look window. Don't need to do animations here 186 * Send the look window. Don't need to do animations here
329 * This sends all the faces to the client, not just updates. This is 187 * This sends all the faces to the client, not just updates. This is
330 * because object ordering would otherwise be inconsistent. 188 * because object ordering would otherwise be inconsistent.
331 */ 189 */
332void 190void
333esrv_draw_look (player *pl) 191esrv_draw_look (player *pl)
334{ 192{
335 int got_one = 0, start_look = 0, end_look = 0;
336
337 object *ob = pl->ob; 193 object *ob = pl->ob;
338 194
339 if (!pl->ns->update_look) 195 if (!pl->ns->update_look)
340 { 196 {
341 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); 197 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
… …
355 packet sl; 211 packet sl;
356 sl.printf ("item%d ", pl->ns->itemcmd); 212 sl.printf ("item%d ", pl->ns->itemcmd);
357 213
358 sl << uint32 (0); 214 sl << uint32 (0);
359 215
360 pl->ns->send_face (empty_face, -50); 216 int start_pos = pl->ns->look_position;
361 pl->ns->flush_fx (); 217 bool dirty = false;
362 218
363 if (pl->ns->look_position) 219 mapspace &ms = ob->ms ();
220
221 // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
222 // start from the top
223 object *items [FLOORBOX_PAGESIZE];
224 int item_idx = 0, item_cnt = 0;
225 int pos = 0;
226
227 // find our items by walking down
228 object *item = ms.top;
229
230 for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
231 {
232 if (!item->client_visible ())
233 continue;
234
235 if (++pos < start_pos)
236 continue;
237
238 // record item
239 items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
240 item_cnt++;
241
242 // stop at first floor
243 if (item->flag [FLAG_IS_FLOOR])
244 {
245 // we are finished, don't append "next group of items"
246 // by setting item to ms.bot it becomes zero which is checked after the while loop
247 item = ms.bot;
248 }
364 { 249 }
365 char buf[80];
366 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
367 250
251 // see if there are more if we cared - we ignore invisible objects
252 if (item)
253 {
254 /* What we basically do is make a 'fake' object - when the user applies it,
255 * we notice the special tag the object has, and act accordingly.
256 */
368 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE)) 257 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
369 << uint32 (0) 258 << uint32 (0)
370 << sint32 (-1) 259 << uint32 ((uint32) - 1)
371 << uint32 (empty_face) 260 << uint32 (need_face_now (pl, FINGER_DOWN))
372 << data8 (buf) 261 << data8 ("Apply this to see the items below")
373 << uint16 (0) 262 << uint16 (0)
374 << uint8 (0) 263 << uint8 (0)
375 << uint32 (0); 264 << uint32 (0);
376 265
377 if (pl->ns->itemcmd == 2) 266 if (pl->ns->itemcmd == 2)
378 sl << uint16 (0); 267 sl << uint16 (0);
379 }
380 268
381 object *tmp = ob->ms ().top; 269 dirty = true;
382 for (object *last = 0; tmp != last; tmp = tmp->below)
383 { 270 }
384 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 271
272 // now send out all items in the ring buffer in reverse order
273 while (item_cnt)
274 {
275 --item_cnt;
276 item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
277 object *item = items [item_idx];
278
279 add_object_to_socklist (*pl->ns, sl, item->head_ ());
280
281 dirty = true;
282
283 // if packet got too large, send it and begin a new one
284 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
385 { 285 {
386 last = tmp->below; /* assumes double floor mode */ 286 pl->ns->send_packet (sl);
387 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 287
388 last = last->below; 288 sl.reset ();
289 sl.printf ("item%d ", pl->ns->itemcmd);
290 sl << uint32 (0);
291
292 dirty = false;
389 } 293 }
390
391 if (tmp->client_visible ())
392 {
393 if (++start_look < pl->ns->look_position)
394 continue;
395
396 end_look++;
397
398 if (end_look > FLOORBOX_PAGESIZE)
399 {
400 /* What we basically do is make a 'fake' object - when the user applies it,
401 * we notice the special tag the object has, and act accordingly.
402 */
403 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
404 << uint32 (0)
405 << uint32 ((uint32) - 1)
406 << uint32 (empty_face)
407 << data8 ("Apply this to see next group of items")
408 << uint16 (0)
409 << uint8 (0)
410 << uint32 (0);
411
412 if (pl->ns->itemcmd == 2)
413 sl << uint16 (0);
414
415 break;
416 }
417
418 add_object_to_socklist (*pl->ns, sl, tmp->head_ ());
419 got_one++;
420
421 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
422 {
423 pl->ns->send_packet (sl);
424
425 sl.reset ();
426 sl.printf ("item%d ", pl->ns->itemcmd);
427 sl << uint32 (0);
428 got_one = 0;
429 }
430 }
431 } 294 }
432 295
433 if (got_one) 296 if (start_pos)
297 {
298 sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
299 << uint32 (0)
300 << sint32 (-1)
301 << uint32 (need_face_now (pl, FINGER_UP))
302 << data8 ("Apply this to see the items higher up")
303 << uint16 (0)
304 << uint8 (0)
305 << uint32 (0);
306
307 if (pl->ns->itemcmd == 2)
308 sl << uint16 (0);
309
310 dirty = true;
311 }
312
313 if (dirty)
434 pl->ns->send_packet (sl); 314 pl->ns->send_packet (sl);
435
436} 315}
437 316
438/** 317/**
439 * Sends whole inventory. 318 * Sends whole inventory.
440 */ 319 */
… …
504 383
505 client *ns = pl->contr->ns; 384 client *ns = pl->contr->ns;
506 if (!ns) 385 if (!ns)
507 return; 386 return;
508 387
509 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
510 {
511 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
512 * this is happening - we can set a breakpoint here in the debugger
513 * and track back the call.
514 */
515 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
516 }
517
518 packet sl ("upditem"); 388 packet sl ("upditem");
519 389
520 sl << uint8 (flags); 390 sl << uint8 (flags);
521 391
522 op = op->head_ (); 392 op = op->head_ ();
… …
529 if (flags & UPD_FLAGS) 399 if (flags & UPD_FLAGS)
530 sl << uint32 (query_flags (op)); 400 sl << uint32 (query_flags (op));
531 401
532 if (flags & UPD_WEIGHT) 402 if (flags & UPD_WEIGHT)
533 { 403 {
534 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); 404 sint32 weight = op->client_weight ();
535 405
536 if (op) 406 if (op == pl)
537 ns->last_weight = weight; 407 ns->last_weight = weight;
538 408
539 sl << uint32 (weight); 409 sl << uint32 (weight);
540 } 410 }
541 411
… …
548 418
549 if (flags & UPD_NAME) 419 if (flags & UPD_NAME)
550 { 420 {
551 int len; 421 int len;
552 const char *item_p; 422 const char *item_p;
553 char item_n[MAX_BUF]; 423 char item_n[127 * 2];
554 424
555 if (!op->custom_name) 425 if (!op->custom_name)
556 { 426 {
557 strncpy (item_n, query_base_name (op, 0), 127); 427 len = assign (item_n, query_base_name (op, 0), 127);
558 item_n[127] = 0;
559 len = strlen (item_n);
560 item_p = query_base_name (op, 1); 428 item_p = query_base_name (op, 1);
561 } 429 }
562 else 430 else
563 { 431 {
564 strncpy (item_n, op->custom_name, 127); 432 len = assign (item_n, &op->custom_name, 127);
565 item_n[127] = 0;
566 len = strlen (item_n);
567 item_p = op->custom_name; 433 item_p = &op->custom_name;
568 } 434 }
569 435
570 strncpy (item_n + len + 1, item_p, 127); 436 len += assign (item_n + len, item_p, 127);
571 item_n[254] = 0;
572 len += strlen (item_n + 1 + len) + 1;
573 437
574 sl << data8 (item_n, len); 438 sl << data8 (item_n, len);
575 } 439 }
576 440
577 if (flags & UPD_ANIM) 441 if (flags & UPD_ANIM)
… …
630 sl << uint32 (op->env ? op->env->count : 0); 494 sl << uint32 (op->env ? op->env->count : 0);
631 495
632 add_object_to_socklist (*pl->contr->ns, sl, op); 496 add_object_to_socklist (*pl->contr->ns, sl, op);
633 497
634 pl->contr->ns->send_packet (sl); 498 pl->contr->ns->send_packet (sl);
635 SET_FLAG (op, FLAG_CLIENT_SENT);
636} 499}
637 500
638/** 501/**
639 * Tells the client to delete an item. 502 * Tells the client to delete an item.
640 */ 503 */
… …
699void 562void
700ExamineCmd (char *buf, int len, player *pl) 563ExamineCmd (char *buf, int len, player *pl)
701{ 564{
702 tag_t tag = atoi (buf); 565 tag_t tag = atoi (buf);
703 566
567 /* If the high bit is set, player applied a pseudo object. */
568 if (tag & 0x80000000)
569 {
570 pl->ns->look_position = tag & 0x7fffffff;
571 pl->ns->floorbox_update ();
572 return;
573 }
574
704 object *op = esrv_get_ob_from_count (pl->ob, tag); 575 object *op = esrv_get_ob_from_count (pl->ob, tag);
705 576
706 if (!op) 577 if (!op)
707 { 578 {
708 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 579 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
… …
721 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 592 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
722 { 593 {
723 std::string s = op->describe (pl->ob); 594 std::string s = op->describe (pl->ob);
724 595
725 packet sl ("ex"); 596 packet sl ("ex");
726 sl << ber32 (tag) << s.c_str (); 597 sl << ber32 (tag)
598 << data (*pl->expand_cfpod (s.c_str ()));
727 599
728 pl->ns->send_packet (sl); 600 pl->ns->send_packet (sl);
729 } 601 }
730} 602}
731 603
732/** Client wants to apply some object. Lets do so. */ 604/** Client wants to apply some object. Lets do so. */
733void 605void
734ApplyCmd (char *buf, int len, player *pl) 606ApplyCmd (char *buf, int len, player *pl)
735{ 607{
736 tag_t tag = atoi (buf); 608 tag_t tag = atoi (buf);
737
738 /* sort of a hack, but if the player saves and the player then manually
739 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
740 */
741 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
742 return;
743 609
744 /* If the high bit is set, player applied a pseudo object. */ 610 /* If the high bit is set, player applied a pseudo object. */
745 if (tag & 0x80000000) 611 if (tag & 0x80000000)
746 { 612 {
747 pl->ns->look_position = tag & 0x7fffffff; 613 pl->ns->look_position = tag & 0x7fffffff;
… …
806 * Tero.Haatanen@lut.fi ] 672 * Tero.Haatanen@lut.fi ]
807 */ 673 */
808static void 674static void
809look_at (player *pl, int dx, int dy) 675look_at (player *pl, int dx, int dy)
810{ 676{
811 dynbuf_text buf; 677 dynbuf_text &buf = msg_dynbuf; buf.clear ();
812 object *ob = pl->ob; 678 object *ob = pl->ob;
813 679
814 if (!pl->observe->map) 680 if (!pl->observe->map)
815 return; 681 return;
816 682
683 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
684
817 mapxy pos (pl->observe); 685 mapxy pos (pl->observe);
818 pos.move (dx, dy); 686 pos.move (dx, dy);
819 687
688 if (wiz)
689 {
820 if (pos.normalise ()) 690 if (pos.normalise ())
691 {
692 mapspace &ms = *pos;
693 ms.update ();
694
695 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
696 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; volume %lld\n\n",
697 &pos.m->path, pos.x, pos.y, dx, dy,
698 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
699 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (long long)ms.volume ()
700 );
701 }
702 else
703 buf << "off-map\n\n";
704 }
705
706 int darkness = pl->blocked_los (dx, dy);
707
708 if (darkness == LOS_BLOCKED)
709 buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
710 else if (darkness == LOS_MAX)
711 buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
712 else
713 {
714 if (pos.normalise ())
821 for (object *tmp = pos->top; tmp; tmp = tmp->below) 715 for (object *tmp = pos->top; tmp; tmp = tmp->below)
822 { 716 {
823 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 717 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
824 continue; 718 continue;
825 719
826 if (QUERY_FLAG (ob, FLAG_WIZ)) 720 if (wiz)
827 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count); 721 buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
828 else 722 else
829 buf.printf ("- %s.\n", query_name (tmp)); 723 buf.printf (" - %s.\n", query_name (tmp));
830 724
831 object *head = tmp->head_ (); 725 object *head = tmp->head_ ();
832 726
833 if (head->inv) 727 if (head->inv)
834 if ((head->type != CONTAINER && head->type != FLESH) 728 if ((head->type != CONTAINER && head->type != FLESH)
835 || QUERY_FLAG (ob, FLAG_WIZ)) 729 || QUERY_FLAG (ob, FLAG_WIZ))
836 buf << head->query_inventory (ob, " "); 730 buf << head->query_inventory (ob, " ");
837 731
838 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ 732 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !wiz) /* don't continue under the floor */
839 break; 733 break;
734 }
840 } 735 }
841 736
842 if (buf.empty ()) 737 if (buf.empty ())
843 pl->failmsg ("You see nothing there."); 738 buf << "You see nothing there.";
844 else 739
845 pl->infobox (MSG_CHANNEL ("lookat"), buf); 740 pl->infobox (MSG_CHANNEL ("lookat"), buf);
846} 741}
847 742
848/** Client wants to look at some object. Lets do so. */ 743/** Client wants to look at some object. Lets do so. */
849void 744void
850LookAt (char *buf, int len, player *pl) 745LookAt (char *buf, int len, player *pl)
… …
855 if (!(cp = strchr (buf, ' '))) 750 if (!(cp = strchr (buf, ' ')))
856 return; 751 return;
857 752
858 int dy = atoi (cp); 753 int dy = atoi (cp);
859 754
860 if (player *opl = pl->observe->contr)
861 if (client *ns = opl->ns)
862 {
863 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
864 return;
865
866 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
867 return;
868 }
869
870 look_at (pl, dx, dy); 755 look_at (pl, dx, dy);
871} 756}
872 757
873/** Move an object to a new location */ 758/** Move an object to a new location */
874void 759void
875esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 760esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
876{ 761{
877 object *op, *env;
878
879 op = esrv_get_ob_from_count (pl, tag); 762 object *op = esrv_get_ob_from_count (pl, tag);
880 if (!op) 763 if (!op)
881 { 764 {
882 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 765 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
883 return; 766 return;
884 } 767 }
… …
893 */ 776 */
894 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 777 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
895 { 778 {
896 int cnt = MAX_ITEM_PER_DROP; 779 int cnt = MAX_ITEM_PER_DROP;
897 780
898 for (object *current = op->inv; current; ) 781 for (object *current = op->inv; current && cnt--; )
899 { 782 {
900 object *next = current->below; 783 object *next = current->below;
901
902 drop_object (pl, current, 0); 784 drop_object (pl, current, 0);
903
904 if (--cnt <= 0) break;
905
906 current = next; 785 current = next;
907 } 786 }
908 787
909 if (cnt <= 0) 788 if (cnt <= 0)
910 op->failmsg ("Only dropped some items, can't drop that many items at once."); 789 op->failmsg ("Only dropped some items, can't drop that many items at once.");
… …
923 pl->contr->count = nrof; 802 pl->contr->count = nrof;
924 pick_up (pl, op); 803 pick_up (pl, op);
925 return; 804 return;
926 } 805 }
927 806
928 env = esrv_get_ob_from_count (pl, to); 807 object *env = esrv_get_ob_from_count (pl, to);
929 if (!env) 808 if (!env)
930 { 809 {
931 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 810 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
932 return; 811 return;
933 } 812 }

Diff Legend

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