… | |
… | |
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 |
|
|
43 | tag_t |
|
|
44 | client_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 | |
|
|
59 | void |
|
|
60 | client_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 | |
|
|
79 | inline iterator |
|
|
80 | client_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 | |
|
|
96 | void |
|
|
97 | client_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 | |
|
|
159 | void |
|
|
160 | client_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 | |
|
|
176 | void |
|
|
177 | client_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 | */ |
255 | static void |
115 | static void |
256 | add_object_to_socklist (client &ns, packet &sl, object *head) |
116 | add_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 | |
|
|
171 | static faceidx |
|
|
172 | need_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 | */ |
332 | void |
190 | void |
333 | esrv_draw_look (player *pl) |
191 | esrv_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 | |
… | |
… | |
630 | sl << uint32 (op->env ? op->env->count : 0); |
500 | sl << uint32 (op->env ? op->env->count : 0); |
631 | |
501 | |
632 | add_object_to_socklist (*pl->contr->ns, sl, op); |
502 | add_object_to_socklist (*pl->contr->ns, sl, op); |
633 | |
503 | |
634 | pl->contr->ns->send_packet (sl); |
504 | pl->contr->ns->send_packet (sl); |
635 | SET_FLAG (op, FLAG_CLIENT_SENT); |
|
|
636 | } |
505 | } |
637 | |
506 | |
638 | /** |
507 | /** |
639 | * Tells the client to delete an item. |
508 | * Tells the client to delete an item. |
640 | */ |
509 | */ |
… | |
… | |
699 | void |
568 | void |
700 | ExamineCmd (char *buf, int len, player *pl) |
569 | ExamineCmd (char *buf, int len, player *pl) |
701 | { |
570 | { |
702 | tag_t tag = atoi (buf); |
571 | tag_t tag = atoi (buf); |
703 | |
572 | |
|
|
573 | /* If the high bit is set, player applied a pseudo object. */ |
|
|
574 | if (tag & 0x80000000) |
|
|
575 | { |
|
|
576 | pl->ns->look_position = tag & 0x7fffffff; |
|
|
577 | pl->ns->floorbox_update (); |
|
|
578 | return; |
|
|
579 | } |
|
|
580 | |
704 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
581 | object *op = esrv_get_ob_from_count (pl->ob, tag); |
705 | |
582 | |
706 | if (!op) |
583 | if (!op) |
707 | { |
584 | { |
708 | LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); |
585 | 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)) |
598 | if (object *op = esrv_get_ob_from_count (pl->ob, tag)) |
722 | { |
599 | { |
723 | std::string s = op->describe (pl->ob); |
600 | std::string s = op->describe (pl->ob); |
724 | |
601 | |
725 | packet sl ("ex"); |
602 | packet sl ("ex"); |
726 | sl << ber32 (tag) << s.c_str (); |
603 | sl << ber32 (tag) |
|
|
604 | << data (*pl->expand_cfpod (s.c_str ())); |
727 | |
605 | |
728 | pl->ns->send_packet (sl); |
606 | pl->ns->send_packet (sl); |
729 | } |
607 | } |
730 | } |
608 | } |
731 | |
609 | |
732 | /** Client wants to apply some object. Lets do so. */ |
610 | /** Client wants to apply some object. Lets do so. */ |
733 | void |
611 | void |
734 | ApplyCmd (char *buf, int len, player *pl) |
612 | ApplyCmd (char *buf, int len, player *pl) |
735 | { |
613 | { |
736 | tag_t tag = atoi (buf); |
614 | 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 | |
615 | |
744 | /* If the high bit is set, player applied a pseudo object. */ |
616 | /* If the high bit is set, player applied a pseudo object. */ |
745 | if (tag & 0x80000000) |
617 | if (tag & 0x80000000) |
746 | { |
618 | { |
747 | pl->ns->look_position = tag & 0x7fffffff; |
619 | pl->ns->look_position = tag & 0x7fffffff; |
… | |
… | |
822 | { |
694 | { |
823 | if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) |
695 | if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) |
824 | continue; |
696 | continue; |
825 | |
697 | |
826 | if (QUERY_FLAG (ob, FLAG_WIZ)) |
698 | if (QUERY_FLAG (ob, FLAG_WIZ)) |
827 | buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count); |
699 | buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count); |
828 | else |
700 | else |
829 | buf.printf ("- %s.\n", query_name (tmp)); |
701 | buf.printf (" - %s.\n", query_name (tmp)); |
830 | |
702 | |
831 | object *head = tmp->head_ (); |
703 | object *head = tmp->head_ (); |
832 | |
704 | |
833 | if (head->inv) |
705 | if (head->inv) |
834 | if ((head->type != CONTAINER && head->type != FLESH) |
706 | if ((head->type != CONTAINER && head->type != FLESH) |
835 | || QUERY_FLAG (ob, FLAG_WIZ)) |
707 | || QUERY_FLAG (ob, FLAG_WIZ)) |
836 | buf << head->query_inventory (ob, " "); |
708 | buf << head->query_inventory (ob, " "); |
837 | |
709 | |
838 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ |
710 | if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ |
839 | break; |
711 | break; |
840 | } |
712 | } |
841 | |
713 | |
… | |
… | |
872 | |
744 | |
873 | /** Move an object to a new location */ |
745 | /** Move an object to a new location */ |
874 | void |
746 | void |
875 | esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) |
747 | esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) |
876 | { |
748 | { |
877 | object *op, *env; |
|
|
878 | |
|
|
879 | op = esrv_get_ob_from_count (pl, tag); |
749 | object *op = esrv_get_ob_from_count (pl, tag); |
880 | if (!op) |
750 | if (!op) |
881 | { |
751 | { |
882 | LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); |
752 | LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); |
883 | return; |
753 | return; |
884 | } |
754 | } |
… | |
… | |
893 | */ |
763 | */ |
894 | if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) |
764 | if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) |
895 | { |
765 | { |
896 | int cnt = MAX_ITEM_PER_DROP; |
766 | int cnt = MAX_ITEM_PER_DROP; |
897 | |
767 | |
898 | for (object *current = op->inv; current; ) |
768 | for (object *current = op->inv; current && cnt--; ) |
899 | { |
769 | { |
900 | object *next = current->below; |
770 | object *next = current->below; |
901 | |
|
|
902 | drop_object (pl, current, 0); |
771 | drop_object (pl, current, 0); |
903 | |
|
|
904 | if (--cnt <= 0) break; |
|
|
905 | |
|
|
906 | current = next; |
772 | current = next; |
907 | } |
773 | } |
908 | |
774 | |
909 | if (cnt <= 0) |
775 | if (cnt <= 0) |
910 | op->failmsg ("Only dropped some items, can't drop that many items at once."); |
776 | op->failmsg ("Only dropped some items, can't drop that many items at once."); |
… | |
… | |
923 | pl->contr->count = nrof; |
789 | pl->contr->count = nrof; |
924 | pick_up (pl, op); |
790 | pick_up (pl, op); |
925 | return; |
791 | return; |
926 | } |
792 | } |
927 | |
793 | |
928 | env = esrv_get_ob_from_count (pl, to); |
794 | object *env = esrv_get_ob_from_count (pl, to); |
929 | if (!env) |
795 | if (!env) |
930 | { |
796 | { |
931 | LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); |
797 | LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); |
932 | return; |
798 | return; |
933 | } |
799 | } |