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.68 by root, Thu May 8 20:03:50 2008 UTC vs.
Revision 1.98 by root, Sat Dec 31 06:18:02 2011 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,2011 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 (127, head->custom_name.length ());
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 if (pl->ns->need_delinv0)
199 {
200 pl->ns->need_delinv0 = 0;
201 pl->ns->send_packet ("delinv 0");
202 }
203
204 if (pl->run_on)
205 return;
206
343 pl->ns->update_look = 0; 207 pl->ns->update_look = 0;
208 pl->ns->need_delinv0 = 1;
344 209
345 if (QUERY_FLAG (ob, FLAG_REMOVED) 210 if (ob->flag [FLAG_REMOVED]
346 || !ob->map 211 || !ob->map
347 || ob->map->in_memory != MAP_ACTIVE 212 || ob->map->state != MAP_ACTIVE
348 || out_of_map (ob->map, ob->x, ob->y)) 213 || out_of_map (ob->map, ob->x, ob->y))
349 return; 214 return;
350
351 pl->ns->send_packet ("delinv 0");
352 215
353 packet sl; 216 packet sl;
354 sl.printf ("item%d ", pl->ns->itemcmd); 217 sl.printf ("item%d ", pl->ns->itemcmd);
355 218
356 sl << uint32 (0); 219 sl << uint32 (0);
… …
423 dirty = true; 286 dirty = true;
424 287
425 // if packet got too large, send it and begin a new one 288 // if packet got too large, send it and begin a new one
426 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 289 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
427 { 290 {
291 pl->ns->flush_fx ();
428 pl->ns->send_packet (sl); 292 pl->ns->send_packet (sl);
429 293
430 sl.reset (); 294 sl.reset ();
431 sl.printf ("item%d ", pl->ns->itemcmd); 295 sl.printf ("item%d ", pl->ns->itemcmd);
432 sl << uint32 (0); 296 sl << uint32 (0);
… …
451 315
452 dirty = true; 316 dirty = true;
453 } 317 }
454 318
455 if (dirty) 319 if (dirty)
320 {
321 pl->ns->flush_fx ();
456 pl->ns->send_packet (sl); 322 pl->ns->send_packet (sl);
323 }
457} 324}
458 325
459/** 326/**
460 * Sends whole inventory. 327 * Sends whole inventory.
461 */ 328 */
… …
493 * items (especially with some of the bags out there) to 360 * items (especially with some of the bags out there) to
494 * overflow the buffer. IF so, send multiple item commands. 361 * overflow the buffer. IF so, send multiple item commands.
495 */ 362 */
496 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 363 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
497 { 364 {
365 pl->contr->ns->flush_fx ();
498 pl->contr->ns->send_packet (sl); 366 pl->contr->ns->send_packet (sl);
499 367
500 sl.reset (); 368 sl.reset ();
501 sl.printf ("item%d ", pl->contr->ns->itemcmd); 369 sl.printf ("item%d ", pl->contr->ns->itemcmd);
502 sl << uint32 (op->count); 370 sl << uint32 (op->count);
… …
504 } 372 }
505 } 373 }
506 } 374 }
507 375
508 if (got_one) 376 if (got_one)
377 {
378 pl->contr->ns->flush_fx ();
509 pl->contr->ns->send_packet (sl); 379 pl->contr->ns->send_packet (sl);
380 }
510} 381}
511 382
512/** 383/**
513 * Updates object *op for player *pl. 384 * Updates object *op for player *pl.
514 * 385 *
… …
525 396
526 client *ns = pl->contr->ns; 397 client *ns = pl->contr->ns;
527 if (!ns) 398 if (!ns)
528 return; 399 return;
529 400
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"); 401 packet sl ("upditem");
540 402
541 sl << uint8 (flags); 403 sl << uint8 (flags);
542 404
543 op = op->head_ (); 405 op = op->head_ ();
… …
550 if (flags & UPD_FLAGS) 412 if (flags & UPD_FLAGS)
551 sl << uint32 (query_flags (op)); 413 sl << uint32 (query_flags (op));
552 414
553 if (flags & UPD_WEIGHT) 415 if (flags & UPD_WEIGHT)
554 { 416 {
555 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); 417 sint32 weight = op->client_weight ();
556 418
557 if (op) 419 if (op == pl)
558 ns->last_weight = weight; 420 ns->last_weight = weight;
559 421
560 sl << uint32 (weight); 422 sl << uint32 (weight);
561 } 423 }
562 424
… …
569 431
570 if (flags & UPD_NAME) 432 if (flags & UPD_NAME)
571 { 433 {
572 int len; 434 int len;
573 const char *item_p; 435 const char *item_p;
574 char item_n[MAX_BUF]; 436 char item_n[127 * 2];
575 437
576 if (!op->custom_name) 438 if (!op->custom_name)
577 { 439 {
578 strncpy (item_n, query_base_name (op, 0), 127); 440 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); 441 item_p = query_base_name (op, 1);
582 } 442 }
583 else 443 else
584 { 444 {
585 strncpy (item_n, op->custom_name, 127); 445 len = assign (item_n, &op->custom_name, 127);
586 item_n[127] = 0;
587 len = strlen (item_n);
588 item_p = op->custom_name; 446 item_p = &op->custom_name;
589 } 447 }
590 448
591 strncpy (item_n + len + 1, item_p, 127); 449 len += assign (item_n + len, item_p, 127);
592 item_n[254] = 0;
593 len += strlen (item_n + 1 + len) + 1;
594 450
595 sl << data8 (item_n, len); 451 sl << data8 (item_n, len);
596 } 452 }
597 453
598 if (flags & UPD_ANIM) 454 if (flags & UPD_ANIM)
… …
600 456
601 if (flags & UPD_ANIMSPEED) 457 if (flags & UPD_ANIMSPEED)
602 { 458 {
603 int anim_speed = 0; 459 int anim_speed = 0;
604 460
605 if (QUERY_FLAG (op, FLAG_ANIMATE)) 461 if (op->flag [FLAG_ANIMATE])
606 { 462 {
607 if (op->anim_speed) 463 if (op->anim_speed)
608 anim_speed = op->anim_speed; 464 anim_speed = op->anim_speed;
609 else 465 else
610 { 466 {
611 if (fabs (op->speed) < 0.001) 467 if (op->speed < 0.001)
612 anim_speed = 255; 468 anim_speed = 255;
613 else if (fabs (op->speed) >= 1.0) 469 else if (op->speed >= 1.0)
614 anim_speed = 1; 470 anim_speed = 1;
615 else 471 else
616 anim_speed = (int) (1.0 / fabs (op->speed)); 472 anim_speed = 1. / op->speed;
617 } 473 }
618 474
619 if (anim_speed > 255) 475 if (anim_speed > 255)
620 anim_speed = 255; 476 anim_speed = 255;
621 } 477 }
… …
650 506
651 sl << uint32 (op->env ? op->env->count : 0); 507 sl << uint32 (op->env ? op->env->count : 0);
652 508
653 add_object_to_socklist (*pl->contr->ns, sl, op); 509 add_object_to_socklist (*pl->contr->ns, sl, op);
654 510
511 pl->contr->ns->flush_fx ();
655 pl->contr->ns->send_packet (sl); 512 pl->contr->ns->send_packet (sl);
656 SET_FLAG (op, FLAG_CLIENT_SENT);
657} 513}
658 514
659/** 515/**
660 * Tells the client to delete an item. 516 * Tells the client to delete an item.
661 */ 517 */
… …
681 537
682/** 538/**
683 * Takes a player and object count (tag) and returns the actual object 539 * Takes a player and object count (tag) and returns the actual object
684 * pointer, or null if it can't be found. 540 * pointer, or null if it can't be found.
685 */ 541 */
686object * 542static object *
687esrv_get_ob_from_count (object *pl, tag_t count) 543esrv_get_ob_from_count (object *pl, tag_t count)
688{ 544{
689 if (pl->count == count) 545 if (pl->count == count)
690 return pl; 546 return pl;
691 547
692 for (object *op = pl->inv; op; op = op->below) 548 for (object *op = pl->inv; op; op = op->below)
693 if (op->count == count) 549 if (op->count == count)
694 return op; 550 return op;
695 else if (op->type == CONTAINER && pl->container == op) 551 else if (op->type == CONTAINER && pl->container_ () == op)
696 for (object *tmp = op->inv; tmp; tmp = tmp->below) 552 for (object *tmp = op->inv; tmp; tmp = tmp->below)
697 if (tmp->count == count) 553 if (tmp->count == count)
698 return tmp; 554 return tmp;
699 555
700 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 556 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
701 if (op->head && op->head->count == count) 557 if (op->head && op->head->count == count)
702 return op; 558 return op;
703 else if (op->count == count) 559 else if (op->count == count)
704 return op; 560 return op;
705 else if (op->type == CONTAINER && pl->container == op) 561 else if (op->type == CONTAINER && pl->container_ () == op)
706 for (object *tmp = op->inv; tmp; tmp = tmp->below) 562 for (object *tmp = op->inv; tmp; tmp = tmp->below)
707 if (tmp->count == count) 563 if (tmp->count == count)
708 return tmp; 564 return tmp;
709 565
710#if 0 566#if 0
… …
749 605
750 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 606 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
751 { 607 {
752 std::string s = op->describe (pl->ob); 608 std::string s = op->describe (pl->ob);
753 609
754 if (msg_is_special (s.c_str (), false))
755 cfperl_expand_cfpod (pl, s);
756
757 packet sl ("ex"); 610 packet sl ("ex");
758 sl << ber32 (tag) << s.c_str (); 611 sl << ber32 (tag)
612 << data (*pl->expand_cfpod (s.c_str ()));
759 613
760 pl->ns->send_packet (sl); 614 pl->ns->send_packet (sl);
761 } 615 }
762} 616}
763 617
… …
773 pl->ns->look_position = tag & 0x7fffffff; 627 pl->ns->look_position = tag & 0x7fffffff;
774 pl->ns->floorbox_update (); 628 pl->ns->floorbox_update ();
775 return; 629 return;
776 } 630 }
777 631
632 // the object might be legally gone already
778 object *op = esrv_get_ob_from_count (pl->ob, tag); 633 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
779 634 pl->ob->apply (op, AP_TOGGLE);
780 if (!op)
781 {
782 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
783 return;
784 }
785
786 player_apply (pl->ob, op, 0, 0);
787} 635}
788 636
789/** Client wants to lock some object. Lets do so. */ 637/** Client wants to lock some object. Lets do so. */
790void 638void
791LockItem (char *data, int len, player *pl) 639LockItem (char *data, int len, player *pl)
… …
799 pl->failmsg ("Could not find object to lock/unlock"); 647 pl->failmsg ("Could not find object to lock/unlock");
800 return; 648 return;
801 } 649 }
802 650
803 if (!flag) 651 if (!flag)
804 CLEAR_FLAG (op, FLAG_INV_LOCKED); 652 op->clr_flag (FLAG_INV_LOCKED);
805 else 653 else
806 SET_FLAG (op, FLAG_INV_LOCKED); 654 op->set_flag (FLAG_INV_LOCKED);
807 655
808 esrv_update_item (UPD_FLAGS, pl->ob, op); 656 esrv_update_item (UPD_FLAGS, pl->ob, op);
809} 657}
810 658
811/** Client wants to mark some object. Lets do so. */ 659/** Client wants to mark some object. Lets do so. */
… …
832 * Tero.Haatanen@lut.fi ] 680 * Tero.Haatanen@lut.fi ]
833 */ 681 */
834static void 682static void
835look_at (player *pl, int dx, int dy) 683look_at (player *pl, int dx, int dy)
836{ 684{
837 dynbuf_text buf; 685 dynbuf_text &buf = msg_dynbuf; buf.clear ();
838 object *ob = pl->ob; 686 object *ob = pl->ob;
839 687
840 if (!pl->observe->map) 688 if (!pl->observe->map)
841 return; 689 return;
690
691 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
842 692
843 mapxy pos (pl->observe); 693 mapxy pos (pl->observe);
844 pos.move (dx, dy); 694 pos.move (dx, dy);
845 695
696 if (wiz)
697 {
846 if (pos.normalise ()) 698 if (pos.normalise ())
699 {
700 mapspace &ms = *pos;
701 ms.update ();
702
703 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
704 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n",
705 &pos.m->path, pos.x, pos.y, dx, dy,
706 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
707 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume ()
708 );
709 }
710 else
711 buf << "off-map\n\n";
712 }
713
714 int darkness = pl->blocked_los (dx, dy);
715
716 if (darkness == LOS_BLOCKED)
717 buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
718 else if (darkness == LOS_MAX)
719 buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
720 else
721 {
722 if (pos.normalise ())
847 for (object *tmp = pos->top; tmp; tmp = tmp->below) 723 for (object *tmp = pos->top; tmp; tmp = tmp->below)
848 { 724 {
849 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 725 if (tmp->invisible && !ob->flag [FLAG_WIZ])
850 continue; 726 continue;
851 727
852 if (QUERY_FLAG (ob, FLAG_WIZ)) 728 if (wiz)
853 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count); 729 buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ());
854 else 730 else
855 buf.printf ("- %s.\n", query_name (tmp)); 731 buf.printf (" - %s.\n", query_name (tmp));
856 732
857 object *head = tmp->head_ (); 733 object *head = tmp->head_ ();
858 734
859 if (head->inv) 735 if (head->inv)
860 if ((head->type != CONTAINER && head->type != FLESH) 736 if ((head->type != CONTAINER && head->type != FLESH)
861 || QUERY_FLAG (ob, FLAG_WIZ)) 737 || ob->flag [FLAG_WIZ])
862 buf << head->query_inventory (ob, " "); 738 buf << head->query_inventory (ob, " ");
863 739
864 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ 740 if (tmp->flag [FLAG_IS_FLOOR] && !wiz) /* don't continue under the floor */
865 break; 741 break;
742 }
866 } 743 }
867 744
868 if (buf.empty ()) 745 if (buf.empty ())
869 pl->failmsg ("You see nothing there."); 746 buf << "You see nothing there.";
870 else 747
871 pl->infobox (MSG_CHANNEL ("lookat"), buf); 748 pl->infobox (MSG_CHANNEL ("lookat"), buf);
872} 749}
873 750
874/** Client wants to look at some object. Lets do so. */ 751/** Client wants to look at some object. Lets do so. */
875void 752void
876LookAt (char *buf, int len, player *pl) 753LookAt (char *buf, int len, player *pl)
… …
880 int dx = atoi (buf); 757 int dx = atoi (buf);
881 if (!(cp = strchr (buf, ' '))) 758 if (!(cp = strchr (buf, ' ')))
882 return; 759 return;
883 760
884 int dy = atoi (cp); 761 int dy = atoi (cp);
885
886 if (player *opl = pl->observe->contr)
887 if (client *ns = opl->ns)
888 {
889 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
890 return;
891
892 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
893 return;
894 }
895 762
896 look_at (pl, dx, dy); 763 look_at (pl, dx, dy);
897} 764}
898 765
899/** Move an object to a new location */ 766/** Move an object to a new location */
… …
913 return; 780 return;
914 781
915 /* If it is an active container, then we should drop all objects 782 /* If it is an active container, then we should drop all objects
916 * in the container and not the container itself. 783 * in the container and not the container itself.
917 */ 784 */
918 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 785 if (op->inv && op->flag [FLAG_APPLIED])
919 { 786 {
920 int cnt = MAX_ITEM_PER_DROP; 787 int cnt = MAX_ITEM_PER_ACTION;
921 788
922 for (object *current = op->inv; current && cnt--; ) 789 for (object *current = op->inv; current && cnt--; )
923 { 790 {
924 object *next = current->below; 791 object *next = current->below;
925 drop_object (pl, current, 0); 792 drop_object (pl, current, 0);

Diff Legend

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