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.59 by root, Tue Apr 22 02:46:18 2008 UTC vs.
Revision 1.78 by root, Mon Apr 27 01:38:49 2009 UTC

… …
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 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
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 *
186 ******************************************************************************/ 46 ******************************************************************************/
… …
193query_flags (object *op) 53query_flags (object *op)
194{ 54{
195 unsigned int flags = 0; 55 unsigned int flags = 0;
196 56
197 if (QUERY_FLAG (op, FLAG_APPLIED)) 57 if (QUERY_FLAG (op, FLAG_APPLIED))
198 {
199 switch (op->type) 58 switch (op->type)
200 { 59 {
201 case BOW: 60 case BOW:
202 case WAND: 61 case WAND:
203 case ROD: 62 case ROD:
204 case HORN: 63 case HORN:
205 flags = a_readied; 64 flags = a_readied;
206 break; 65 break;
207 case WEAPON: 66 case WEAPON:
208 flags = a_wielded; 67 flags = a_wielded;
209 break; 68 break;
210 case SKILL: 69 case SKILL:
211 case ARMOUR: 70 case ARMOUR:
212 case HELMET: 71 case HELMET:
213 case SHIELD: 72 case SHIELD:
214 case RING: 73 case RING:
215 case BOOTS: 74 case BOOTS:
216 case GLOVES: 75 case GLOVES:
217 case AMULET: 76 case AMULET:
218 case GIRDLE: 77 case GIRDLE:
219 case BRACERS: 78 case BRACERS:
220 case CLOAK: 79 case CLOAK:
221 flags = a_worn; 80 flags = a_worn;
222 break; 81 break;
223 case CONTAINER: 82 case CONTAINER:
224 flags = a_active; 83 flags = a_active;
225 break; 84 break;
226 default: 85 default:
227 flags = a_applied; 86 flags = a_applied;
228 break; 87 break;
229 } 88 }
230 }
231 89
232 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 90 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
233 flags |= F_OPEN; 91 flags |= F_OPEN;
234 92
235 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 93 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
… …
255 * animation of face to the client. 113 * animation of face to the client.
256 */ 114 */
257static void 115static void
258add_object_to_socklist (client &ns, packet &sl, object *head) 116add_object_to_socklist (client &ns, packet &sl, object *head)
259{ 117{
260 int flags, len, anim_speed;
261 char item_n[MAX_BUF]; 118 char item_n[MAX_BUF];
262 const char *item_p; 119 const char *item_p;
263 120
264 flags = query_flags (head); 121 int flags = query_flags (head);
265 if (QUERY_FLAG (head, FLAG_NO_PICK)) 122 if (QUERY_FLAG (head, FLAG_NO_PICK))
266 flags |= F_NOPICK; 123 flags |= F_NOPICK;
267 124
268 ns.send_face (head->face, -50); 125 ns.send_face (head->face, -50);
269 ns.flush_fx (); 126 ns.flush_fx ();
… …
271 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 128 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
272 ns.send_animation (head->animation_id); 129 ns.send_animation (head->animation_id);
273 130
274 sl << uint32 (head->count) 131 sl << uint32 (head->count)
275 << uint32 (flags) 132 << uint32 (flags)
276 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 133 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
277 << uint32 (head->face); 134 << uint32 (head->face);
135
136 int len;
278 137
279 if (!head->custom_name) 138 if (!head->custom_name)
280 { 139 {
281 strncpy (item_n, query_base_name (head, 0), 127); 140 strncpy (item_n, query_base_name (head, 0), 127);
282 item_n[127] = 0; 141 item_n[127] = 0;
… …
296 len += strlen (item_n + 1 + len) + 1; 155 len += strlen (item_n + 1 + len) + 1;
297 156
298 sl << data8 (item_n, len) 157 sl << data8 (item_n, len)
299 << uint16 (head->animation_id); 158 << uint16 (head->animation_id);
300 159
301 anim_speed = 0; 160 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
302 if (QUERY_FLAG (head, FLAG_ANIMATE)) 161 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
303 { 162 : 1. / clamp (fabs (head->speed), 1./255., 1./1.);
304 if (head->anim_speed)
305 anim_speed = head->anim_speed;
306 else
307 {
308 if (fabs (head->speed) < 0.001)
309 anim_speed = 255;
310 else if (fabs (head->speed) >= 1.0)
311 anim_speed = 1;
312 else
313 anim_speed = (int) (1.0 / fabs (head->speed));
314 }
315
316 if (anim_speed > 255)
317 anim_speed = 255;
318 }
319 163
320 sl << uint8 (anim_speed) 164 sl << uint8 (anim_speed)
321 << uint32 (head->nrof); 165 << uint32 (head->nrof);
322 166
323 if (ns.itemcmd == 2) 167 if (ns.itemcmd == 2)
324 sl << uint16 (head->client_type); 168 sl << uint16 (head->client_type);
325
326 SET_FLAG (head, FLAG_CLIENT_SENT);
327} 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"
328 184
329/** 185/**
330 * Send the look window. Don't need to do animations here 186 * Send the look window. Don't need to do animations here
331 * 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
332 * because object ordering would otherwise be inconsistent. 188 * because object ordering would otherwise be inconsistent.
333 */ 189 */
334void 190void
335esrv_draw_look (player *pl) 191esrv_draw_look (player *pl)
336{ 192{
337 int got_one = 0, start_look = 0, end_look = 0;
338
339 object *ob = pl->ob; 193 object *ob = pl->ob;
340 194
341 if (!pl->ns->update_look) 195 if (!pl->ns->update_look)
342 { 196 {
343 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);
344 return; 198 return;
345 } 199 }
346 else 200
347 pl->ns->update_look = 0; 201 pl->ns->update_look = 0;
348 202
349 if (QUERY_FLAG (ob, FLAG_REMOVED) 203 if (QUERY_FLAG (ob, FLAG_REMOVED)
350 || !ob->map 204 || !ob->map
351 || ob->map->in_memory != MAP_ACTIVE 205 || ob->map->in_memory != MAP_ACTIVE
352 || out_of_map (ob->map, ob->x, ob->y)) 206 || out_of_map (ob->map, ob->x, ob->y))
… …
357 packet sl; 211 packet sl;
358 sl.printf ("item%d ", pl->ns->itemcmd); 212 sl.printf ("item%d ", pl->ns->itemcmd);
359 213
360 sl << uint32 (0); 214 sl << uint32 (0);
361 215
362 pl->ns->send_face (empty_face, -50); 216 int start_pos = pl->ns->look_position;
363 pl->ns->flush_fx (); 217 bool dirty = false;
364 218
365 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 }
366 { 249 }
367 char buf[80];
368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
369 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 */
370 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE)) 257 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
371 << uint32 (0) 258 << uint32 (0)
372 << sint32 (-1) 259 << uint32 ((uint32) - 1)
373 << uint32 (empty_face) 260 << uint32 (need_face_now (pl, FINGER_DOWN))
374 << data8 (buf) 261 << data8 ("Apply this to see the items below")
375 << uint16 (0) 262 << uint16 (0)
376 << uint8 (0) 263 << uint8 (0)
377 << uint32 (0); 264 << uint32 (0);
378 265
379 if (pl->ns->itemcmd == 2) 266 if (pl->ns->itemcmd == 2)
380 sl << uint16 (0); 267 sl << uint16 (0);
381 }
382 268
383 object *tmp = ob->ms ().top; 269 dirty = true;
384 for (object *last = 0; tmp != last; tmp = tmp->below)
385 { 270 }
386 object *head;
387 271
388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 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)
389 { 285 {
390 last = tmp->below; /* assumes double floor mode */ 286 pl->ns->send_packet (sl);
391 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 287
392 last = last->below; 288 sl.reset ();
289 sl.printf ("item%d ", pl->ns->itemcmd);
290 sl << uint32 (0);
291
292 dirty = false;
393 } 293 }
394
395 if (tmp->client_visible ())
396 {
397 if (++start_look < pl->ns->look_position)
398 continue;
399
400 end_look++;
401
402 if (end_look > FLOORBOX_PAGESIZE)
403 {
404 /* What we basically do is make a 'fake' object - when the user applies it,
405 * we notice the special tag the object has, and act accordingly.
406 */
407 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
408 << uint32 (0)
409 << uint32 ((uint32) - 1)
410 << uint32 (empty_face)
411 << data8 ("Apply this to see next group of items")
412 << uint16 (0)
413 << uint8 (0)
414 << uint32 (0);
415
416 if (pl->ns->itemcmd == 2)
417 sl << uint16 (0);
418
419 break;
420 }
421
422 if (tmp->head)
423 head = tmp->head;
424 else
425 head = tmp;
426
427 add_object_to_socklist (*pl->ns, sl, head);
428 got_one++;
429
430 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
431 {
432 pl->ns->send_packet (sl);
433
434 sl.reset ();
435 sl.printf ("item%d ", pl->ns->itemcmd);
436 sl << uint32 (0);
437 got_one = 0;
438 }
439 }
440 } 294 }
441 295
442 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)
443 pl->ns->send_packet (sl); 314 pl->ns->send_packet (sl);
444
445} 315}
446 316
447/** 317/**
448 * Sends whole inventory. 318 * Sends whole inventory.
449 */ 319 */
… …
506 */ 376 */
507void 377void
508esrv_update_item (int flags, object *pl, object *op) 378esrv_update_item (int flags, object *pl, object *op)
509{ 379{
510 /* If we have a request to send the player item, skip a few checks. */ 380 /* If we have a request to send the player item, skip a few checks. */
511 if (op != pl)
512 {
513 if (!op->client_visible ()) 381 if (op != pl && !op->client_visible ())
514 return; 382 return;
515 /* we remove the check for op->env, because in theory, the object
516 * is hopefully in the same place, so the client should preserve
517 * order.
518 */
519 }
520 383
521 client *ns = pl->contr->ns; 384 client *ns = pl->contr->ns;
522 if (!ns) 385 if (!ns)
523 return; 386 return;
524 387
525 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
526 {
527 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
528 * this is happening - we can set a breakpoint here in the debugger
529 * and track back the call.
530 */
531 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
532 }
533
534 packet sl ("upditem"); 388 packet sl ("upditem");
535 389
536 sl << uint8 (flags); 390 sl << uint8 (flags);
537 391
538 if (op->head)
539 op = op->head; 392 op = op->head_ ();
540 393
541 sl << uint32 (op->count); 394 sl << uint32 (op->count);
542 395
543 if (flags & UPD_LOCATION) 396 if (flags & UPD_LOCATION)
544 sl << uint32 (op->env ? op->env->count : 0); 397 sl << uint32 (op->env ? op->env->count : 0);
… …
546 if (flags & UPD_FLAGS) 399 if (flags & UPD_FLAGS)
547 sl << uint32 (query_flags (op)); 400 sl << uint32 (query_flags (op));
548 401
549 if (flags & UPD_WEIGHT) 402 if (flags & UPD_WEIGHT)
550 { 403 {
551 sint32 weight = WEIGHT (op); 404 sint32 weight = op->client_weight ();
552 405
553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 406 if (op == pl)
554
555 if (pl == op)
556 ns->last_weight = weight; 407 ns->last_weight = weight;
408
409 sl << uint32 (weight);
557 } 410 }
558 411
559 if (flags & UPD_FACE) 412 if (flags & UPD_FACE)
560 { 413 {
561 ns->send_face (op->face, -50); 414 ns->send_face (op->face, -50);
… …
565 418
566 if (flags & UPD_NAME) 419 if (flags & UPD_NAME)
567 { 420 {
568 int len; 421 int len;
569 const char *item_p; 422 const char *item_p;
570 char item_n[MAX_BUF]; 423 char item_n[127 * 2];
571 424
572 if (!op->custom_name) 425 if (!op->custom_name)
573 { 426 {
574 strncpy (item_n, query_base_name (op, 0), 127); 427 len = assign (item_n, query_base_name (op, 0), 127);
575 item_n[127] = 0;
576 len = strlen (item_n);
577 item_p = query_base_name (op, 1); 428 item_p = query_base_name (op, 1);
578 } 429 }
579 else 430 else
580 { 431 {
581 strncpy (item_n, op->custom_name, 127); 432 len = assign (item_n, &op->custom_name, 127);
582 item_n[127] = 0;
583 len = strlen (item_n);
584 item_p = op->custom_name; 433 item_p = &op->custom_name;
585 } 434 }
586 435
587 strncpy (item_n + len + 1, item_p, 127); 436 len += assign (item_n + len, item_p, 127);
588 item_n[254] = 0;
589 len += strlen (item_n + 1 + len) + 1;
590 437
591 sl << data8 (item_n, len); 438 sl << data8 (item_n, len);
592 } 439 }
593 440
594 if (flags & UPD_ANIM) 441 if (flags & UPD_ANIM)
… …
632esrv_send_item (object *pl, object *op) 479esrv_send_item (object *pl, object *op)
633{ 480{
634 if (!pl->contr->ns) 481 if (!pl->contr->ns)
635 return; 482 return;
636 483
637 /* If this is not the player object, do some more checks */
638 if (op != pl)
639 {
640 /* We only send 'visibile' objects to the client */ 484 /* We only send 'visible' objects to the client, and sometimes the player */
641 if (!op->client_visible ()) 485 if (!op->client_visible () && op->type != PLAYER)
642 return; 486 return;
643
644 /* if the item is on the ground, mark that the look needs to
645 * be updated.
646 */
647 if (!op->env)
648 {
649 pl->contr->ns->floorbox_update ();
650 return;
651 }
652 }
653 487
654 packet sl; 488 packet sl;
655 489
656 sl.printf ("item%d ", pl->contr->ns->itemcmd); 490 sl.printf ("item%d ", pl->contr->ns->itemcmd);
657 491
658 if (op->head)
659 op = op->head; 492 op = op->head_ ();
660 493
661 sl << uint32 (op->env ? op->env->count : 0); 494 sl << uint32 (op->env ? op->env->count : 0);
662 495
663 add_object_to_socklist (*pl->contr->ns, sl, op); 496 add_object_to_socklist (*pl->contr->ns, sl, op);
664 497
665 pl->contr->ns->send_packet (sl); 498 pl->contr->ns->send_packet (sl);
666 SET_FLAG (op, FLAG_CLIENT_SENT);
667} 499}
668 500
669/** 501/**
670 * Tells the client to delete an item. 502 * Tells the client to delete an item.
671 */ 503 */
… …
730void 562void
731ExamineCmd (char *buf, int len, player *pl) 563ExamineCmd (char *buf, int len, player *pl)
732{ 564{
733 tag_t tag = atoi (buf); 565 tag_t tag = atoi (buf);
734 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
735 object *op = esrv_get_ob_from_count (pl->ob, tag); 575 object *op = esrv_get_ob_from_count (pl->ob, tag);
736 576
737 if (!op) 577 if (!op)
738 { 578 {
739 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);
… …
752 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 592 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
753 { 593 {
754 std::string s = op->describe (pl->ob); 594 std::string s = op->describe (pl->ob);
755 595
756 packet sl ("ex"); 596 packet sl ("ex");
757 sl << ber32 (tag) << s.c_str (); 597 sl << ber32 (tag)
598 << data (*pl->expand_cfpod (s.c_str ()));
758 599
759 pl->ns->send_packet (sl); 600 pl->ns->send_packet (sl);
760 } 601 }
761} 602}
762 603
763/** Client wants to apply some object. Lets do so. */ 604/** Client wants to apply some object. Lets do so. */
764void 605void
765ApplyCmd (char *buf, int len, player *pl) 606ApplyCmd (char *buf, int len, player *pl)
766{ 607{
767 tag_t tag = atoi (buf); 608 tag_t tag = atoi (buf);
768
769 /* sort of a hack, but if the player saves and the player then manually
770 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
771 */
772 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
773 return;
774 609
775 /* If the high bit is set, player applied a pseudo object. */ 610 /* If the high bit is set, player applied a pseudo object. */
776 if (tag & 0x80000000) 611 if (tag & 0x80000000)
777 { 612 {
778 pl->ns->look_position = tag & 0x7fffffff; 613 pl->ns->look_position = tag & 0x7fffffff;
… …
837 * Tero.Haatanen@lut.fi ] 672 * Tero.Haatanen@lut.fi ]
838 */ 673 */
839static void 674static void
840look_at (player *pl, int dx, int dy) 675look_at (player *pl, int dx, int dy)
841{ 676{
842 dynbuf_text buf; 677 dynbuf_text &buf = msg_dynbuf; buf.clear ();
843 object *ob = pl->ob; 678 object *ob = pl->ob;
844 679
845 if (!pl->observe->map) 680 if (!pl->observe->map)
846 return; 681 return;
847 682
683 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
684
848 mapxy pos (pl->observe); 685 mapxy pos (pl->observe);
849 pos.move (dx, dy); 686 pos.move (dx, dy);
850 687
688 if (wiz)
689 {
851 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 ())
852 for (object *tmp = pos->top; tmp; tmp = tmp->below) 715 for (object *tmp = pos->top; tmp; tmp = tmp->below)
853 { 716 {
854 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 717 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
855 continue; 718 continue;
856 719
857 if (QUERY_FLAG (ob, FLAG_WIZ)) 720 if (wiz)
858 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count); 721 buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
859 else 722 else
860 buf.printf ("- %s.\n", query_name (tmp)); 723 buf.printf (" - %s.\n", query_name (tmp));
861 724
862 object *head = tmp->head_ (); 725 object *head = tmp->head_ ();
863 726
864 if (head->inv) 727 if (head->inv)
865 if ((head->type != CONTAINER && head->type != FLESH) 728 if ((head->type != CONTAINER && head->type != FLESH)
866 || QUERY_FLAG (ob, FLAG_WIZ)) 729 || QUERY_FLAG (ob, FLAG_WIZ))
867 buf << head->query_inventory (ob, " "); 730 buf << head->query_inventory (ob, " ");
868 731
869 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 */
870 break; 733 break;
734 }
871 } 735 }
872 736
873 if (buf.empty ()) 737 if (buf.empty ())
874 pl->failmsg ("You see nothing there."); 738 buf << "You see nothing there.";
875 else 739
876 pl->infobox (MSG_CHANNEL ("lookat"), buf); 740 pl->infobox (MSG_CHANNEL ("lookat"), buf);
877} 741}
878 742
879/** Client wants to look at some object. Lets do so. */ 743/** Client wants to look at some object. Lets do so. */
880void 744void
881LookAt (char *buf, int len, player *pl) 745LookAt (char *buf, int len, player *pl)
… …
886 if (!(cp = strchr (buf, ' '))) 750 if (!(cp = strchr (buf, ' ')))
887 return; 751 return;
888 752
889 int dy = atoi (cp); 753 int dy = atoi (cp);
890 754
891 if (player *opl = pl->observe->contr)
892 if (client *ns = opl->ns)
893 {
894 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
895 return;
896
897 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
898 return;
899 }
900
901 look_at (pl, dx, dy); 755 look_at (pl, dx, dy);
902} 756}
903 757
904/** Move an object to a new location */ 758/** Move an object to a new location */
905void 759void
906esrv_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)
907{ 761{
908 object *op, *env;
909
910 op = esrv_get_ob_from_count (pl, tag); 762 object *op = esrv_get_ob_from_count (pl, tag);
911 if (!op) 763 if (!op)
912 { 764 {
913 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);
914 return; 766 return;
915 } 767 }
… …
922 /* If it is an active container, then we should drop all objects 774 /* If it is an active container, then we should drop all objects
923 * in the container and not the container itself. 775 * in the container and not the container itself.
924 */ 776 */
925 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 777 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
926 { 778 {
927 object *current, *next;
928
929 int cnt = MAX_ITEM_PER_DROP; 779 int cnt = MAX_ITEM_PER_DROP;
930 780
931 for (current = op->inv; current != NULL; current = next) 781 for (object *current = op->inv; current && cnt--; )
932 { 782 {
933 next = current->below; 783 object *next = current->below;
934 drop_object (pl, current, 0); 784 drop_object (pl, current, 0);
935 785 current = next;
936 if (--cnt <= 0) break;
937 } 786 }
938 787
939 if (cnt <= 0) 788 if (cnt <= 0)
940 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.");
941
942 esrv_update_item (UPD_WEIGHT, pl, op);
943 } 790 }
944 else 791 else
945 drop_object (pl, op, nrof); 792 drop_object (pl, op, nrof);
946
947 update_after_inventory_change (pl);
948 793
949 return; 794 return;
950 } 795 }
951 else if (to == pl->count) 796 else if (to == pl->count)
952 { /* pick it up to the inventory */ 797 { /* pick it up to the inventory */
… …
957 pl->contr->count = nrof; 802 pl->contr->count = nrof;
958 pick_up (pl, op); 803 pick_up (pl, op);
959 return; 804 return;
960 } 805 }
961 806
962 env = esrv_get_ob_from_count (pl, to); 807 object *env = esrv_get_ob_from_count (pl, to);
963 if (!env) 808 if (!env)
964 { 809 {
965 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);
966 return; 811 return;
967 } 812 }
… …
969 /* put_object_in_sack presumes that necessary sanity checking 814 /* put_object_in_sack presumes that necessary sanity checking
970 * has already been done (eg, it can be picked up and fits in 815 * has already been done (eg, it can be picked up and fits in
971 * in a sack, so check for those things. We should also check 816 * in a sack, so check for those things. We should also check
972 * an make sure env is in fact a container for that matter. 817 * an make sure env is in fact a container for that matter.
973 */ 818 */
974 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 819 if (env->type == CONTAINER
975 { 820 && can_pick (pl, op)
821 && sack_can_hold (pl, env, op, nrof))
976 put_object_in_sack (pl, env, op, nrof); 822 put_object_in_sack (pl, env, op, nrof);
977 update_after_inventory_change (pl);
978 }
979} 823}
980 824

Diff Legend

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