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.67 by root, Tue May 6 19:47:56 2008 UTC vs.
Revision 1.93 by root, Sun Apr 11 23:32:10 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/** 25/**
… …
37#include <sproto.h> 38#include <sproto.h>
38 39
39/** This is the maximum number of bytes we expect any one item to take up */ 40/** This is the maximum number of bytes we expect any one item to take up */
40#define MAXITEMLEN 300 41#define MAXITEMLEN 300
41 42
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/******************************************************************************* 43/*******************************************************************************
183 * 44 *
184 * Functions related to sending object data to the client. 45 * Functions related to sending object data to the client.
185 * 46 *
186 ******************************************************************************/ 47 ******************************************************************************/
187 48
188/** 49/**
189 * This is a similar to query_name, but returns flags 50 * This is a similar to query_name, but returns flags
190 * to be sent to client. 51 * to be sent to client.
191 */ 52 */
192unsigned int 53static unsigned int
193query_flags (object *op) 54query_flags (object *op)
194{ 55{
195 unsigned int flags = 0; 56 unsigned int flags = 0;
196 57
197 if (QUERY_FLAG (op, FLAG_APPLIED)) 58 if (op->flag [FLAG_APPLIED])
198 switch (op->type) 59 switch (op->type)
199 { 60 {
200 case BOW: 61 case BOW:
201 case WAND: 62 case WAND:
202 case ROD: 63 case ROD:
… …
225 default: 86 default:
226 flags = a_applied; 87 flags = a_applied;
227 break; 88 break;
228 } 89 }
229 90
230 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 91 if (op->is_open_container ())
231 flags |= F_OPEN; 92 flags |= F_OPEN;
232 93
233 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 94 if (op->flag [FLAG_KNOWN_CURSED])
234 { 95 {
235 if (QUERY_FLAG (op, FLAG_DAMNED)) 96 if (op->flag [FLAG_DAMNED])
236 flags |= F_DAMNED; 97 flags |= F_DAMNED;
237 else if (QUERY_FLAG (op, FLAG_CURSED)) 98 else if (op->flag [FLAG_CURSED])
238 flags |= F_CURSED; 99 flags |= F_CURSED;
239 } 100 }
240 101
241 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 102 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
242 flags |= F_MAGIC; 103 flags |= F_MAGIC;
243 if (QUERY_FLAG (op, FLAG_UNPAID)) 104 if (op->flag [FLAG_UNPAID])
244 flags |= F_UNPAID; 105 flags |= F_UNPAID;
245 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 106 if (op->flag [FLAG_INV_LOCKED])
246 flags |= F_LOCKED; 107 flags |= F_LOCKED;
247 108
248 return flags; 109 return flags;
249} 110}
250 111
… …
253 * animation of face to the client. 114 * animation of face to the client.
254 */ 115 */
255static void 116static void
256add_object_to_socklist (client &ns, packet &sl, object *head) 117add_object_to_socklist (client &ns, packet &sl, object *head)
257{ 118{
258 char item_n[MAX_BUF];
259 const char *item_p;
260
261 int flags = query_flags (head); 119 int flags = query_flags (head);
262 if (QUERY_FLAG (head, FLAG_NO_PICK)) 120
121 if (head->flag [FLAG_NO_PICK])
263 flags |= F_NOPICK; 122 flags |= F_NOPICK;
264 123
265 ns.send_face (head->face, -50); 124 ns.send_face (head->face, -50);
266 ns.flush_fx ();
267 125
268 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 126 if (head->flag [FLAG_ANIMATE] && !ns.anims_sent[head->animation_id])
269 ns.send_animation (head->animation_id); 127 ns.send_animation (head->animation_id);
270 128
271 sl << uint32 (head->count) 129 sl << uint32 (head->count)
272 << uint32 (flags) 130 << uint32 (flags)
273 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) 131 << uint32 (head->flag [FLAG_NO_PICK] ? -1 : head->client_weight ())
274 << uint32 (head->face); 132 << uint32 (head->face);
275 133
276 int len;
277
278 if (!head->custom_name) 134 if (!head->custom_name)
279 { 135 {
280 strncpy (item_n, query_base_name (head, 0), 127); 136 const char *name;
281 item_n[127] = 0; 137 uint8 *len = sl.cur++; // patch up length later
282 len = strlen (item_n); 138
283 item_p = query_base_name (head, 1); 139 name = query_base_name (head, 0); sl << data (name, min (127, strlen (name)));
140 sl << uint8 (0);
141 name = query_base_name (head, 1); sl << data (name, min (127, strlen (name)));
142
143 *len = sl.cur - len - 1;
284 } 144 }
285 else 145 else
286 { 146 {
287 strncpy (item_n, head->custom_name, 127); 147 int len = min (head->custom_name.length (), 127);
288 item_n[127] = 0;
289 len = strlen (item_n);
290 item_p = head->custom_name;
291 }
292 148
293 strncpy (item_n + len + 1, item_p, 127); 149 sl << uint8 (len * 2 + 1)
294 item_n[254] = 0; 150 << data (head->custom_name, len)
295 len += strlen (item_n + 1 + len) + 1; 151 << uint8 (0)
152 << data (head->custom_name, len);
153 }
296 154
297 sl << data8 (item_n, len)
298 << uint16 (head->animation_id); 155 sl << uint16 (head->animation_id);
299 156
300 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0 157 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
301 : head->anim_speed ? clamp (head->anim_speed, 1, 255) 158 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
302 : 1. / clamp (fabs (head->speed), 1./255., 1./1.); 159 : 1. / clamp (head->speed, 1./255., 1./1.);
303 160
304 sl << uint8 (anim_speed) 161 sl << uint8 (anim_speed)
305 << uint32 (head->nrof); 162 << uint32 (head->nrof);
306 163
307 if (ns.itemcmd == 2) 164 if (ns.itemcmd == 2)
308 sl << uint16 (head->client_type); 165 sl << uint16 (head->client_type);
309
310 SET_FLAG (head, FLAG_CLIENT_SENT);
311} 166}
312 167
313static faceidx 168static faceidx
314need_face_now (player *pl, const char *name) 169need_face_now (player *pl, const char *name)
315{ 170{
… …
338 { 193 {
339 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); 194 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
340 return; 195 return;
341 } 196 }
342 197
198 pl->ns->send_packet ("delinv 0");
199
200 if (pl->run_on)
201 return;
202
343 pl->ns->update_look = 0; 203 pl->ns->update_look = 0;
344 204
345 if (QUERY_FLAG (ob, FLAG_REMOVED) 205 if (ob->flag [FLAG_REMOVED]
346 || !ob->map 206 || !ob->map
347 || ob->map->in_memory != MAP_ACTIVE 207 || ob->map->in_memory != MAP_ACTIVE
348 || out_of_map (ob->map, ob->x, ob->y)) 208 || out_of_map (ob->map, ob->x, ob->y))
349 return; 209 return;
350
351 pl->ns->send_packet ("delinv 0");
352 210
353 packet sl; 211 packet sl;
354 sl.printf ("item%d ", pl->ns->itemcmd); 212 sl.printf ("item%d ", pl->ns->itemcmd);
355 213
356 sl << uint32 (0); 214 sl << uint32 (0);
… …
423 dirty = true; 281 dirty = true;
424 282
425 // if packet got too large, send it and begin a new one 283 // if packet got too large, send it and begin a new one
426 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 284 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
427 { 285 {
286 pl->ns->flush_fx ();
428 pl->ns->send_packet (sl); 287 pl->ns->send_packet (sl);
429 288
430 sl.reset (); 289 sl.reset ();
431 sl.printf ("item%d ", pl->ns->itemcmd); 290 sl.printf ("item%d ", pl->ns->itemcmd);
432 sl << uint32 (0); 291 sl << uint32 (0);
… …
451 310
452 dirty = true; 311 dirty = true;
453 } 312 }
454 313
455 if (dirty) 314 if (dirty)
315 {
316 pl->ns->flush_fx ();
456 pl->ns->send_packet (sl); 317 pl->ns->send_packet (sl);
318 }
457} 319}
458 320
459/** 321/**
460 * Sends whole inventory. 322 * Sends whole inventory.
461 */ 323 */
… …
493 * items (especially with some of the bags out there) to 355 * items (especially with some of the bags out there) to
494 * overflow the buffer. IF so, send multiple item commands. 356 * overflow the buffer. IF so, send multiple item commands.
495 */ 357 */
496 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 358 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
497 { 359 {
360 pl->contr->ns->flush_fx ();
498 pl->contr->ns->send_packet (sl); 361 pl->contr->ns->send_packet (sl);
499 362
500 sl.reset (); 363 sl.reset ();
501 sl.printf ("item%d ", pl->contr->ns->itemcmd); 364 sl.printf ("item%d ", pl->contr->ns->itemcmd);
502 sl << uint32 (op->count); 365 sl << uint32 (op->count);
… …
504 } 367 }
505 } 368 }
506 } 369 }
507 370
508 if (got_one) 371 if (got_one)
372 {
373 pl->contr->ns->flush_fx ();
509 pl->contr->ns->send_packet (sl); 374 pl->contr->ns->send_packet (sl);
375 }
510} 376}
511 377
512/** 378/**
513 * Updates object *op for player *pl. 379 * Updates object *op for player *pl.
514 * 380 *
… …
525 391
526 client *ns = pl->contr->ns; 392 client *ns = pl->contr->ns;
527 if (!ns) 393 if (!ns)
528 return; 394 return;
529 395
530 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
531 {
532 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
533 * this is happening - we can set a breakpoint here in the debugger
534 * and track back the call.
535 */
536 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
537 }
538
539 packet sl ("upditem"); 396 packet sl ("upditem");
540 397
541 sl << uint8 (flags); 398 sl << uint8 (flags);
542 399
543 op = op->head_ (); 400 op = op->head_ ();
… …
550 if (flags & UPD_FLAGS) 407 if (flags & UPD_FLAGS)
551 sl << uint32 (query_flags (op)); 408 sl << uint32 (query_flags (op));
552 409
553 if (flags & UPD_WEIGHT) 410 if (flags & UPD_WEIGHT)
554 { 411 {
555 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); 412 sint32 weight = op->client_weight ();
556 413
557 if (op) 414 if (op == pl)
558 ns->last_weight = weight; 415 ns->last_weight = weight;
559 416
560 sl << uint32 (weight); 417 sl << uint32 (weight);
561 } 418 }
562 419
… …
569 426
570 if (flags & UPD_NAME) 427 if (flags & UPD_NAME)
571 { 428 {
572 int len; 429 int len;
573 const char *item_p; 430 const char *item_p;
574 char item_n[MAX_BUF]; 431 char item_n[127 * 2];
575 432
576 if (!op->custom_name) 433 if (!op->custom_name)
577 { 434 {
578 strncpy (item_n, query_base_name (op, 0), 127); 435 len = assign (item_n, query_base_name (op, 0), 127);
579 item_n[127] = 0;
580 len = strlen (item_n);
581 item_p = query_base_name (op, 1); 436 item_p = query_base_name (op, 1);
582 } 437 }
583 else 438 else
584 { 439 {
585 strncpy (item_n, op->custom_name, 127); 440 len = assign (item_n, &op->custom_name, 127);
586 item_n[127] = 0;
587 len = strlen (item_n);
588 item_p = op->custom_name; 441 item_p = &op->custom_name;
589 } 442 }
590 443
591 strncpy (item_n + len + 1, item_p, 127); 444 len += assign (item_n + len, item_p, 127);
592 item_n[254] = 0;
593 len += strlen (item_n + 1 + len) + 1;
594 445
595 sl << data8 (item_n, len); 446 sl << data8 (item_n, len);
596 } 447 }
597 448
598 if (flags & UPD_ANIM) 449 if (flags & UPD_ANIM)
… …
600 451
601 if (flags & UPD_ANIMSPEED) 452 if (flags & UPD_ANIMSPEED)
602 { 453 {
603 int anim_speed = 0; 454 int anim_speed = 0;
604 455
605 if (QUERY_FLAG (op, FLAG_ANIMATE)) 456 if (op->flag [FLAG_ANIMATE])
606 { 457 {
607 if (op->anim_speed) 458 if (op->anim_speed)
608 anim_speed = op->anim_speed; 459 anim_speed = op->anim_speed;
609 else 460 else
610 { 461 {
611 if (fabs (op->speed) < 0.001) 462 if (op->speed < 0.001)
612 anim_speed = 255; 463 anim_speed = 255;
613 else if (fabs (op->speed) >= 1.0) 464 else if (op->speed >= 1.0)
614 anim_speed = 1; 465 anim_speed = 1;
615 else 466 else
616 anim_speed = (int) (1.0 / fabs (op->speed)); 467 anim_speed = 1. / op->speed;
617 } 468 }
618 469
619 if (anim_speed > 255) 470 if (anim_speed > 255)
620 anim_speed = 255; 471 anim_speed = 255;
621 } 472 }
… …
650 501
651 sl << uint32 (op->env ? op->env->count : 0); 502 sl << uint32 (op->env ? op->env->count : 0);
652 503
653 add_object_to_socklist (*pl->contr->ns, sl, op); 504 add_object_to_socklist (*pl->contr->ns, sl, op);
654 505
506 pl->contr->ns->flush_fx ();
655 pl->contr->ns->send_packet (sl); 507 pl->contr->ns->send_packet (sl);
656 SET_FLAG (op, FLAG_CLIENT_SENT);
657} 508}
658 509
659/** 510/**
660 * Tells the client to delete an item. 511 * Tells the client to delete an item.
661 */ 512 */
… …
681 532
682/** 533/**
683 * Takes a player and object count (tag) and returns the actual object 534 * Takes a player and object count (tag) and returns the actual object
684 * pointer, or null if it can't be found. 535 * pointer, or null if it can't be found.
685 */ 536 */
686object * 537static object *
687esrv_get_ob_from_count (object *pl, tag_t count) 538esrv_get_ob_from_count (object *pl, tag_t count)
688{ 539{
689 if (pl->count == count) 540 if (pl->count == count)
690 return pl; 541 return pl;
691 542
692 for (object *op = pl->inv; op; op = op->below) 543 for (object *op = pl->inv; op; op = op->below)
693 if (op->count == count) 544 if (op->count == count)
694 return op; 545 return op;
695 else if (op->type == CONTAINER && pl->container == op) 546 else if (op->type == CONTAINER && pl->container_ () == op)
696 for (object *tmp = op->inv; tmp; tmp = tmp->below) 547 for (object *tmp = op->inv; tmp; tmp = tmp->below)
697 if (tmp->count == count) 548 if (tmp->count == count)
698 return tmp; 549 return tmp;
699 550
700 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 551 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
701 if (op->head && op->head->count == count) 552 if (op->head && op->head->count == count)
702 return op; 553 return op;
703 else if (op->count == count) 554 else if (op->count == count)
704 return op; 555 return op;
705 else if (op->type == CONTAINER && pl->container == op) 556 else if (op->type == CONTAINER && pl->container_ () == op)
706 for (object *tmp = op->inv; tmp; tmp = tmp->below) 557 for (object *tmp = op->inv; tmp; tmp = tmp->below)
707 if (tmp->count == count) 558 if (tmp->count == count)
708 return tmp; 559 return tmp;
709 560
710#if 0 561#if 0
… …
750 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 601 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
751 { 602 {
752 std::string s = op->describe (pl->ob); 603 std::string s = op->describe (pl->ob);
753 604
754 packet sl ("ex"); 605 packet sl ("ex");
755 sl << ber32 (tag) << s.c_str (); 606 sl << ber32 (tag)
607 << data (*pl->expand_cfpod (s.c_str ()));
756 608
757 pl->ns->send_packet (sl); 609 pl->ns->send_packet (sl);
758 } 610 }
759} 611}
760 612
… …
778 { 630 {
779 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag); 631 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
780 return; 632 return;
781 } 633 }
782 634
783 player_apply (pl->ob, op, 0, 0); 635 pl->ob->apply (op, AP_TOGGLE);
784} 636}
785 637
786/** Client wants to lock some object. Lets do so. */ 638/** Client wants to lock some object. Lets do so. */
787void 639void
788LockItem (char *data, int len, player *pl) 640LockItem (char *data, int len, player *pl)
… …
796 pl->failmsg ("Could not find object to lock/unlock"); 648 pl->failmsg ("Could not find object to lock/unlock");
797 return; 649 return;
798 } 650 }
799 651
800 if (!flag) 652 if (!flag)
801 CLEAR_FLAG (op, FLAG_INV_LOCKED); 653 op->clr_flag (FLAG_INV_LOCKED);
802 else 654 else
803 SET_FLAG (op, FLAG_INV_LOCKED); 655 op->set_flag (FLAG_INV_LOCKED);
804 656
805 esrv_update_item (UPD_FLAGS, pl->ob, op); 657 esrv_update_item (UPD_FLAGS, pl->ob, op);
806} 658}
807 659
808/** Client wants to mark some object. Lets do so. */ 660/** Client wants to mark some object. Lets do so. */
… …
829 * Tero.Haatanen@lut.fi ] 681 * Tero.Haatanen@lut.fi ]
830 */ 682 */
831static void 683static void
832look_at (player *pl, int dx, int dy) 684look_at (player *pl, int dx, int dy)
833{ 685{
834 dynbuf_text buf; 686 dynbuf_text &buf = msg_dynbuf; buf.clear ();
835 object *ob = pl->ob; 687 object *ob = pl->ob;
836 688
837 if (!pl->observe->map) 689 if (!pl->observe->map)
838 return; 690 return;
691
692 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
839 693
840 mapxy pos (pl->observe); 694 mapxy pos (pl->observe);
841 pos.move (dx, dy); 695 pos.move (dx, dy);
842 696
697 if (wiz)
698 {
843 if (pos.normalise ()) 699 if (pos.normalise ())
700 {
701 mapspace &ms = *pos;
702 ms.update ();
703
704 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
705 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n",
706 &pos.m->path, pos.x, pos.y, dx, dy,
707 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
708 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume ()
709 );
710 }
711 else
712 buf << "off-map\n\n";
713 }
714
715 int darkness = pl->blocked_los (dx, dy);
716
717 if (darkness == LOS_BLOCKED)
718 buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
719 else if (darkness == LOS_MAX)
720 buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
721 else
722 {
723 if (pos.normalise ())
844 for (object *tmp = pos->top; tmp; tmp = tmp->below) 724 for (object *tmp = pos->top; tmp; tmp = tmp->below)
845 { 725 {
846 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 726 if (tmp->invisible && !ob->flag [FLAG_WIZ])
847 continue; 727 continue;
848 728
849 if (QUERY_FLAG (ob, FLAG_WIZ)) 729 if (wiz)
850 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count); 730 buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ());
851 else 731 else
852 buf.printf ("- %s.\n", query_name (tmp)); 732 buf.printf (" - %s.\n", query_name (tmp));
853 733
854 object *head = tmp->head_ (); 734 object *head = tmp->head_ ();
855 735
856 if (head->inv) 736 if (head->inv)
857 if ((head->type != CONTAINER && head->type != FLESH) 737 if ((head->type != CONTAINER && head->type != FLESH)
858 || QUERY_FLAG (ob, FLAG_WIZ)) 738 || ob->flag [FLAG_WIZ])
859 buf << head->query_inventory (ob, " "); 739 buf << head->query_inventory (ob, " ");
860 740
861 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ 741 if (tmp->flag [FLAG_IS_FLOOR] && !wiz) /* don't continue under the floor */
862 break; 742 break;
743 }
863 } 744 }
864 745
865 if (buf.empty ()) 746 if (buf.empty ())
866 pl->failmsg ("You see nothing there."); 747 buf << "You see nothing there.";
867 else 748
868 pl->infobox (MSG_CHANNEL ("lookat"), buf); 749 pl->infobox (MSG_CHANNEL ("lookat"), buf);
869} 750}
870 751
871/** Client wants to look at some object. Lets do so. */ 752/** Client wants to look at some object. Lets do so. */
872void 753void
873LookAt (char *buf, int len, player *pl) 754LookAt (char *buf, int len, player *pl)
… …
877 int dx = atoi (buf); 758 int dx = atoi (buf);
878 if (!(cp = strchr (buf, ' '))) 759 if (!(cp = strchr (buf, ' ')))
879 return; 760 return;
880 761
881 int dy = atoi (cp); 762 int dy = atoi (cp);
882
883 if (player *opl = pl->observe->contr)
884 if (client *ns = opl->ns)
885 {
886 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
887 return;
888
889 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
890 return;
891 }
892 763
893 look_at (pl, dx, dy); 764 look_at (pl, dx, dy);
894} 765}
895 766
896/** Move an object to a new location */ 767/** Move an object to a new location */
… …
910 return; 781 return;
911 782
912 /* If it is an active container, then we should drop all objects 783 /* If it is an active container, then we should drop all objects
913 * in the container and not the container itself. 784 * in the container and not the container itself.
914 */ 785 */
915 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 786 if (op->inv && op->flag [FLAG_APPLIED])
916 { 787 {
917 int cnt = MAX_ITEM_PER_DROP; 788 int cnt = MAX_ITEM_PER_ACTION;
918 789
919 for (object *current = op->inv; current && cnt--; ) 790 for (object *current = op->inv; current && cnt--; )
920 { 791 {
921 object *next = current->below; 792 object *next = current->below;
922 drop_object (pl, current, 0); 793 drop_object (pl, current, 0);

Diff Legend

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