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.64 by root, Mon May 5 22:03:22 2008 UTC vs.
Revision 1.97 by root, Wed May 4 07:41:14 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 int flags, len, anim_speed;
259 char item_n[MAX_BUF];
260 const char *item_p;
261
262 flags = query_flags (head); 119 int flags = query_flags (head);
263 if (QUERY_FLAG (head, FLAG_NO_PICK)) 120
121 if (head->flag [FLAG_NO_PICK])
264 flags |= F_NOPICK; 122 flags |= F_NOPICK;
265 123
266 ns.send_face (head->face, -50); 124 ns.send_face (head->face, -50);
267 ns.flush_fx ();
268 125
269 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 126 if (head->flag [FLAG_ANIMATE] && !ns.anims_sent[head->animation_id])
270 ns.send_animation (head->animation_id); 127 ns.send_animation (head->animation_id);
271 128
272 sl << uint32 (head->count) 129 sl << uint32 (head->count)
273 << uint32 (flags) 130 << uint32 (flags)
274 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) 131 << uint32 (head->flag [FLAG_NO_PICK] ? -1 : head->client_weight ())
275 << uint32 (head->face); 132 << uint32 (head->face);
276 133
277 if (!head->custom_name) 134 if (!head->custom_name)
278 { 135 {
279 strncpy (item_n, query_base_name (head, 0), 127); 136 const char *name;
280 item_n[127] = 0; 137 uint8 *len = sl.cur++; // patch up length later
281 len = strlen (item_n); 138
282 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;
283 } 144 }
284 else 145 else
285 { 146 {
286 strncpy (item_n, head->custom_name, 127); 147 int len = min (head->custom_name.length (), 127);
287 item_n[127] = 0;
288 len = strlen (item_n);
289 item_p = head->custom_name;
290 }
291 148
292 strncpy (item_n + len + 1, item_p, 127); 149 sl << uint8 (len * 2 + 1)
293 item_n[254] = 0; 150 << data (head->custom_name, len)
294 len += strlen (item_n + 1 + len) + 1; 151 << uint8 (0)
152 << data (head->custom_name, len);
153 }
295 154
296 sl << data8 (item_n, len)
297 << uint16 (head->animation_id); 155 sl << uint16 (head->animation_id);
298 156
299 anim_speed = 0; 157 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
300 if (QUERY_FLAG (head, FLAG_ANIMATE)) 158 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
301 { 159 : 1. / clamp (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 160
318 sl << uint8 (anim_speed) 161 sl << uint8 (anim_speed)
319 << uint32 (head->nrof); 162 << uint32 (head->nrof);
320 163
321 if (ns.itemcmd == 2) 164 if (ns.itemcmd == 2)
322 sl << uint16 (head->client_type); 165 sl << uint16 (head->client_type);
323
324 SET_FLAG (head, FLAG_CLIENT_SENT);
325} 166}
326 167
327static faceidx 168static faceidx
328need_face_now (player *pl, const char *name) 169need_face_now (player *pl, const char *name)
329{ 170{
… …
352 { 193 {
353 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);
354 return; 195 return;
355 } 196 }
356 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
357 pl->ns->update_look = 0; 207 pl->ns->update_look = 0;
208 pl->ns->need_delinv0 = 1;
358 209
359 if (QUERY_FLAG (ob, FLAG_REMOVED) 210 if (ob->flag [FLAG_REMOVED]
360 || !ob->map 211 || !ob->map
361 || ob->map->in_memory != MAP_ACTIVE 212 || ob->map->state != MAP_ACTIVE
362 || out_of_map (ob->map, ob->x, ob->y)) 213 || out_of_map (ob->map, ob->x, ob->y))
363 return; 214 return;
364
365 pl->ns->send_packet ("delinv 0");
366 215
367 packet sl; 216 packet sl;
368 sl.printf ("item%d ", pl->ns->itemcmd); 217 sl.printf ("item%d ", pl->ns->itemcmd);
369 218
370 sl << uint32 (0); 219 sl << uint32 (0);
… …
437 dirty = true; 286 dirty = true;
438 287
439 // 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
440 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 289 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
441 { 290 {
291 pl->ns->flush_fx ();
442 pl->ns->send_packet (sl); 292 pl->ns->send_packet (sl);
443 293
444 sl.reset (); 294 sl.reset ();
445 sl.printf ("item%d ", pl->ns->itemcmd); 295 sl.printf ("item%d ", pl->ns->itemcmd);
446 sl << uint32 (0); 296 sl << uint32 (0);
… …
465 315
466 dirty = true; 316 dirty = true;
467 } 317 }
468 318
469 if (dirty) 319 if (dirty)
320 {
321 pl->ns->flush_fx ();
470 pl->ns->send_packet (sl); 322 pl->ns->send_packet (sl);
323 }
471} 324}
472 325
473/** 326/**
474 * Sends whole inventory. 327 * Sends whole inventory.
475 */ 328 */
… …
507 * items (especially with some of the bags out there) to 360 * items (especially with some of the bags out there) to
508 * overflow the buffer. IF so, send multiple item commands. 361 * overflow the buffer. IF so, send multiple item commands.
509 */ 362 */
510 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 363 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
511 { 364 {
365 pl->contr->ns->flush_fx ();
512 pl->contr->ns->send_packet (sl); 366 pl->contr->ns->send_packet (sl);
513 367
514 sl.reset (); 368 sl.reset ();
515 sl.printf ("item%d ", pl->contr->ns->itemcmd); 369 sl.printf ("item%d ", pl->contr->ns->itemcmd);
516 sl << uint32 (op->count); 370 sl << uint32 (op->count);
… …
518 } 372 }
519 } 373 }
520 } 374 }
521 375
522 if (got_one) 376 if (got_one)
377 {
378 pl->contr->ns->flush_fx ();
523 pl->contr->ns->send_packet (sl); 379 pl->contr->ns->send_packet (sl);
380 }
524} 381}
525 382
526/** 383/**
527 * Updates object *op for player *pl. 384 * Updates object *op for player *pl.
528 * 385 *
… …
539 396
540 client *ns = pl->contr->ns; 397 client *ns = pl->contr->ns;
541 if (!ns) 398 if (!ns)
542 return; 399 return;
543 400
544 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
545 {
546 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
547 * this is happening - we can set a breakpoint here in the debugger
548 * and track back the call.
549 */
550 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
551 }
552
553 packet sl ("upditem"); 401 packet sl ("upditem");
554 402
555 sl << uint8 (flags); 403 sl << uint8 (flags);
556 404
557 op = op->head_ (); 405 op = op->head_ ();
… …
564 if (flags & UPD_FLAGS) 412 if (flags & UPD_FLAGS)
565 sl << uint32 (query_flags (op)); 413 sl << uint32 (query_flags (op));
566 414
567 if (flags & UPD_WEIGHT) 415 if (flags & UPD_WEIGHT)
568 { 416 {
569 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); 417 sint32 weight = op->client_weight ();
570 418
571 if (op) 419 if (op == pl)
572 ns->last_weight = weight; 420 ns->last_weight = weight;
573 421
574 sl << uint32 (weight); 422 sl << uint32 (weight);
575 } 423 }
576 424
… …
583 431
584 if (flags & UPD_NAME) 432 if (flags & UPD_NAME)
585 { 433 {
586 int len; 434 int len;
587 const char *item_p; 435 const char *item_p;
588 char item_n[MAX_BUF]; 436 char item_n[127 * 2];
589 437
590 if (!op->custom_name) 438 if (!op->custom_name)
591 { 439 {
592 strncpy (item_n, query_base_name (op, 0), 127); 440 len = assign (item_n, query_base_name (op, 0), 127);
593 item_n[127] = 0;
594 len = strlen (item_n);
595 item_p = query_base_name (op, 1); 441 item_p = query_base_name (op, 1);
596 } 442 }
597 else 443 else
598 { 444 {
599 strncpy (item_n, op->custom_name, 127); 445 len = assign (item_n, &op->custom_name, 127);
600 item_n[127] = 0;
601 len = strlen (item_n);
602 item_p = op->custom_name; 446 item_p = &op->custom_name;
603 } 447 }
604 448
605 strncpy (item_n + len + 1, item_p, 127); 449 len += assign (item_n + len, item_p, 127);
606 item_n[254] = 0;
607 len += strlen (item_n + 1 + len) + 1;
608 450
609 sl << data8 (item_n, len); 451 sl << data8 (item_n, len);
610 } 452 }
611 453
612 if (flags & UPD_ANIM) 454 if (flags & UPD_ANIM)
… …
614 456
615 if (flags & UPD_ANIMSPEED) 457 if (flags & UPD_ANIMSPEED)
616 { 458 {
617 int anim_speed = 0; 459 int anim_speed = 0;
618 460
619 if (QUERY_FLAG (op, FLAG_ANIMATE)) 461 if (op->flag [FLAG_ANIMATE])
620 { 462 {
621 if (op->anim_speed) 463 if (op->anim_speed)
622 anim_speed = op->anim_speed; 464 anim_speed = op->anim_speed;
623 else 465 else
624 { 466 {
625 if (fabs (op->speed) < 0.001) 467 if (op->speed < 0.001)
626 anim_speed = 255; 468 anim_speed = 255;
627 else if (fabs (op->speed) >= 1.0) 469 else if (op->speed >= 1.0)
628 anim_speed = 1; 470 anim_speed = 1;
629 else 471 else
630 anim_speed = (int) (1.0 / fabs (op->speed)); 472 anim_speed = 1. / op->speed;
631 } 473 }
632 474
633 if (anim_speed > 255) 475 if (anim_speed > 255)
634 anim_speed = 255; 476 anim_speed = 255;
635 } 477 }
… …
664 506
665 sl << uint32 (op->env ? op->env->count : 0); 507 sl << uint32 (op->env ? op->env->count : 0);
666 508
667 add_object_to_socklist (*pl->contr->ns, sl, op); 509 add_object_to_socklist (*pl->contr->ns, sl, op);
668 510
511 pl->contr->ns->flush_fx ();
669 pl->contr->ns->send_packet (sl); 512 pl->contr->ns->send_packet (sl);
670 SET_FLAG (op, FLAG_CLIENT_SENT);
671} 513}
672 514
673/** 515/**
674 * Tells the client to delete an item. 516 * Tells the client to delete an item.
675 */ 517 */
… …
695 537
696/** 538/**
697 * 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
698 * pointer, or null if it can't be found. 540 * pointer, or null if it can't be found.
699 */ 541 */
700object * 542static object *
701esrv_get_ob_from_count (object *pl, tag_t count) 543esrv_get_ob_from_count (object *pl, tag_t count)
702{ 544{
703 if (pl->count == count) 545 if (pl->count == count)
704 return pl; 546 return pl;
705 547
706 for (object *op = pl->inv; op; op = op->below) 548 for (object *op = pl->inv; op; op = op->below)
707 if (op->count == count) 549 if (op->count == count)
708 return op; 550 return op;
709 else if (op->type == CONTAINER && pl->container == op) 551 else if (op->type == CONTAINER && pl->container_ () == op)
710 for (object *tmp = op->inv; tmp; tmp = tmp->below) 552 for (object *tmp = op->inv; tmp; tmp = tmp->below)
711 if (tmp->count == count) 553 if (tmp->count == count)
712 return tmp; 554 return tmp;
713 555
714 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)
715 if (op->head && op->head->count == count) 557 if (op->head && op->head->count == count)
716 return op; 558 return op;
717 else if (op->count == count) 559 else if (op->count == count)
718 return op; 560 return op;
719 else if (op->type == CONTAINER && pl->container == op) 561 else if (op->type == CONTAINER && pl->container_ () == op)
720 for (object *tmp = op->inv; tmp; tmp = tmp->below) 562 for (object *tmp = op->inv; tmp; tmp = tmp->below)
721 if (tmp->count == count) 563 if (tmp->count == count)
722 return tmp; 564 return tmp;
723 565
724#if 0 566#if 0
… …
764 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 606 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
765 { 607 {
766 std::string s = op->describe (pl->ob); 608 std::string s = op->describe (pl->ob);
767 609
768 packet sl ("ex"); 610 packet sl ("ex");
769 sl << ber32 (tag) << s.c_str (); 611 sl << ber32 (tag)
612 << data (*pl->expand_cfpod (s.c_str ()));
770 613
771 pl->ns->send_packet (sl); 614 pl->ns->send_packet (sl);
772 } 615 }
773} 616}
774 617
… …
784 pl->ns->look_position = tag & 0x7fffffff; 627 pl->ns->look_position = tag & 0x7fffffff;
785 pl->ns->floorbox_update (); 628 pl->ns->floorbox_update ();
786 return; 629 return;
787 } 630 }
788 631
632 // the object might be legally gone already
789 object *op = esrv_get_ob_from_count (pl->ob, tag); 633 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
790 634 pl->ob->apply (op, AP_TOGGLE);
791 if (!op)
792 {
793 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
794 return;
795 }
796
797 player_apply (pl->ob, op, 0, 0);
798} 635}
799 636
800/** Client wants to lock some object. Lets do so. */ 637/** Client wants to lock some object. Lets do so. */
801void 638void
802LockItem (char *data, int len, player *pl) 639LockItem (char *data, int len, player *pl)
… …
810 pl->failmsg ("Could not find object to lock/unlock"); 647 pl->failmsg ("Could not find object to lock/unlock");
811 return; 648 return;
812 } 649 }
813 650
814 if (!flag) 651 if (!flag)
815 CLEAR_FLAG (op, FLAG_INV_LOCKED); 652 op->clr_flag (FLAG_INV_LOCKED);
816 else 653 else
817 SET_FLAG (op, FLAG_INV_LOCKED); 654 op->set_flag (FLAG_INV_LOCKED);
818 655
819 esrv_update_item (UPD_FLAGS, pl->ob, op); 656 esrv_update_item (UPD_FLAGS, pl->ob, op);
820} 657}
821 658
822/** Client wants to mark some object. Lets do so. */ 659/** Client wants to mark some object. Lets do so. */
… …
843 * Tero.Haatanen@lut.fi ] 680 * Tero.Haatanen@lut.fi ]
844 */ 681 */
845static void 682static void
846look_at (player *pl, int dx, int dy) 683look_at (player *pl, int dx, int dy)
847{ 684{
848 dynbuf_text buf; 685 dynbuf_text &buf = msg_dynbuf; buf.clear ();
849 object *ob = pl->ob; 686 object *ob = pl->ob;
850 687
851 if (!pl->observe->map) 688 if (!pl->observe->map)
852 return; 689 return;
690
691 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
853 692
854 mapxy pos (pl->observe); 693 mapxy pos (pl->observe);
855 pos.move (dx, dy); 694 pos.move (dx, dy);
856 695
696 if (wiz)
697 {
857 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 ())
858 for (object *tmp = pos->top; tmp; tmp = tmp->below) 723 for (object *tmp = pos->top; tmp; tmp = tmp->below)
859 { 724 {
860 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 725 if (tmp->invisible && !ob->flag [FLAG_WIZ])
861 continue; 726 continue;
862 727
863 if (QUERY_FLAG (ob, FLAG_WIZ)) 728 if (wiz)
864 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 ());
865 else 730 else
866 buf.printf ("- %s.\n", query_name (tmp)); 731 buf.printf (" - %s.\n", query_name (tmp));
867 732
868 object *head = tmp->head_ (); 733 object *head = tmp->head_ ();
869 734
870 if (head->inv) 735 if (head->inv)
871 if ((head->type != CONTAINER && head->type != FLESH) 736 if ((head->type != CONTAINER && head->type != FLESH)
872 || QUERY_FLAG (ob, FLAG_WIZ)) 737 || ob->flag [FLAG_WIZ])
873 buf << head->query_inventory (ob, " "); 738 buf << head->query_inventory (ob, " ");
874 739
875 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 */
876 break; 741 break;
742 }
877 } 743 }
878 744
879 if (buf.empty ()) 745 if (buf.empty ())
880 pl->failmsg ("You see nothing there."); 746 buf << "You see nothing there.";
881 else 747
882 pl->infobox (MSG_CHANNEL ("lookat"), buf); 748 pl->infobox (MSG_CHANNEL ("lookat"), buf);
883} 749}
884 750
885/** Client wants to look at some object. Lets do so. */ 751/** Client wants to look at some object. Lets do so. */
886void 752void
887LookAt (char *buf, int len, player *pl) 753LookAt (char *buf, int len, player *pl)
… …
892 if (!(cp = strchr (buf, ' '))) 758 if (!(cp = strchr (buf, ' ')))
893 return; 759 return;
894 760
895 int dy = atoi (cp); 761 int dy = atoi (cp);
896 762
897 if (player *opl = pl->observe->contr)
898 if (client *ns = opl->ns)
899 {
900 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
901 return;
902
903 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
904 return;
905 }
906
907 look_at (pl, dx, dy); 763 look_at (pl, dx, dy);
908} 764}
909 765
910/** Move an object to a new location */ 766/** Move an object to a new location */
911void 767void
912esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 768esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
913{ 769{
914 object *op, *env;
915
916 op = esrv_get_ob_from_count (pl, tag); 770 object *op = esrv_get_ob_from_count (pl, tag);
917 if (!op) 771 if (!op)
918 { 772 {
919 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 773 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
920 return; 774 return;
921 } 775 }
… …
926 return; 780 return;
927 781
928 /* 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
929 * in the container and not the container itself. 783 * in the container and not the container itself.
930 */ 784 */
931 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 785 if (op->inv && op->flag [FLAG_APPLIED])
932 { 786 {
933 int cnt = MAX_ITEM_PER_DROP; 787 int cnt = MAX_ITEM_PER_ACTION;
934 788
935 for (object *current = op->inv; current; ) 789 for (object *current = op->inv; current && cnt--; )
936 { 790 {
937 object *next = current->below; 791 object *next = current->below;
938
939 drop_object (pl, current, 0); 792 drop_object (pl, current, 0);
940
941 if (--cnt <= 0) break;
942
943 current = next; 793 current = next;
944 } 794 }
945 795
946 if (cnt <= 0) 796 if (cnt <= 0)
947 op->failmsg ("Only dropped some items, can't drop that many items at once."); 797 op->failmsg ("Only dropped some items, can't drop that many items at once.");
… …
960 pl->contr->count = nrof; 810 pl->contr->count = nrof;
961 pick_up (pl, op); 811 pick_up (pl, op);
962 return; 812 return;
963 } 813 }
964 814
965 env = esrv_get_ob_from_count (pl, to); 815 object *env = esrv_get_ob_from_count (pl, to);
966 if (!env) 816 if (!env)
967 { 817 {
968 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 818 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
969 return; 819 return;
970 } 820 }

Diff Legend

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