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.69 by root, Mon Jul 14 23:47:06 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/**
… …
47 48
48/** 49/**
49 * This is a similar to query_name, but returns flags 50 * This is a similar to query_name, but returns flags
50 * to be sent to client. 51 * to be sent to client.
51 */ 52 */
52unsigned int 53static unsigned int
53query_flags (object *op) 54query_flags (object *op)
54{ 55{
55 unsigned int flags = 0; 56 unsigned int flags = 0;
56 57
57 if (QUERY_FLAG (op, FLAG_APPLIED)) 58 if (op->flag [FLAG_APPLIED])
58 switch (op->type) 59 switch (op->type)
59 { 60 {
60 case BOW: 61 case BOW:
61 case WAND: 62 case WAND:
62 case ROD: 63 case ROD:
… …
85 default: 86 default:
86 flags = a_applied; 87 flags = a_applied;
87 break; 88 break;
88 } 89 }
89 90
90 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 91 if (op->is_open_container ())
91 flags |= F_OPEN; 92 flags |= F_OPEN;
92 93
93 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 94 if (op->flag [FLAG_KNOWN_CURSED])
94 { 95 {
95 if (QUERY_FLAG (op, FLAG_DAMNED)) 96 if (op->flag [FLAG_DAMNED])
96 flags |= F_DAMNED; 97 flags |= F_DAMNED;
97 else if (QUERY_FLAG (op, FLAG_CURSED)) 98 else if (op->flag [FLAG_CURSED])
98 flags |= F_CURSED; 99 flags |= F_CURSED;
99 } 100 }
100 101
101 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 102 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
102 flags |= F_MAGIC; 103 flags |= F_MAGIC;
103 if (QUERY_FLAG (op, FLAG_UNPAID)) 104 if (op->flag [FLAG_UNPAID])
104 flags |= F_UNPAID; 105 flags |= F_UNPAID;
105 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 106 if (op->flag [FLAG_INV_LOCKED])
106 flags |= F_LOCKED; 107 flags |= F_LOCKED;
107 108
108 return flags; 109 return flags;
109} 110}
110 111
… …
113 * animation of face to the client. 114 * animation of face to the client.
114 */ 115 */
115static void 116static void
116add_object_to_socklist (client &ns, packet &sl, object *head) 117add_object_to_socklist (client &ns, packet &sl, object *head)
117{ 118{
118 char item_n[MAX_BUF];
119 const char *item_p;
120
121 int flags = query_flags (head); 119 int flags = query_flags (head);
122 if (QUERY_FLAG (head, FLAG_NO_PICK)) 120
121 if (head->flag [FLAG_NO_PICK])
123 flags |= F_NOPICK; 122 flags |= F_NOPICK;
124 123
125 ns.send_face (head->face, -50); 124 ns.send_face (head->face, -50);
126 ns.flush_fx ();
127 125
128 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 126 if (head->flag [FLAG_ANIMATE] && !ns.anims_sent[head->animation_id])
129 ns.send_animation (head->animation_id); 127 ns.send_animation (head->animation_id);
130 128
131 sl << uint32 (head->count) 129 sl << uint32 (head->count)
132 << uint32 (flags) 130 << uint32 (flags)
133 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) 131 << uint32 (head->flag [FLAG_NO_PICK] ? -1 : head->client_weight ())
134 << uint32 (head->face); 132 << uint32 (head->face);
135 133
136 int len;
137
138 if (!head->custom_name) 134 if (!head->custom_name)
139 { 135 {
140 strncpy (item_n, query_base_name (head, 0), 127); 136 const char *name;
141 item_n[127] = 0; 137 uint8 *len = sl.cur++; // patch up length later
142 len = strlen (item_n); 138
143 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;
144 } 144 }
145 else 145 else
146 { 146 {
147 strncpy (item_n, head->custom_name, 127); 147 int len = min (head->custom_name.length (), 127);
148 item_n[127] = 0;
149 len = strlen (item_n);
150 item_p = head->custom_name;
151 }
152 148
153 strncpy (item_n + len + 1, item_p, 127); 149 sl << uint8 (len * 2 + 1)
154 item_n[254] = 0; 150 << data (head->custom_name, len)
155 len += strlen (item_n + 1 + len) + 1; 151 << uint8 (0)
152 << data (head->custom_name, len);
153 }
156 154
157 sl << data8 (item_n, len)
158 << uint16 (head->animation_id); 155 sl << uint16 (head->animation_id);
159 156
160 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0 157 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
161 : head->anim_speed ? clamp (head->anim_speed, 1, 255) 158 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
162 : 1. / clamp (fabs (head->speed), 1./255., 1./1.); 159 : 1. / clamp (head->speed, 1./255., 1./1.);
163 160
164 sl << uint8 (anim_speed) 161 sl << uint8 (anim_speed)
165 << uint32 (head->nrof); 162 << uint32 (head->nrof);
166 163
167 if (ns.itemcmd == 2) 164 if (ns.itemcmd == 2)
168 sl << uint16 (head->client_type); 165 sl << uint16 (head->client_type);
169
170 SET_FLAG (head, FLAG_CLIENT_SENT);
171} 166}
172 167
173static faceidx 168static faceidx
174need_face_now (player *pl, const char *name) 169need_face_now (player *pl, const char *name)
175{ 170{
… …
198 { 193 {
199 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);
200 return; 195 return;
201 } 196 }
202 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
203 pl->ns->update_look = 0; 207 pl->ns->update_look = 0;
208 pl->ns->need_delinv0 = 1;
204 209
205 if (QUERY_FLAG (ob, FLAG_REMOVED) 210 if (ob->flag [FLAG_REMOVED]
206 || !ob->map 211 || !ob->map
207 || ob->map->in_memory != MAP_ACTIVE 212 || ob->map->state != MAP_ACTIVE
208 || out_of_map (ob->map, ob->x, ob->y)) 213 || out_of_map (ob->map, ob->x, ob->y))
209 return; 214 return;
210
211 pl->ns->send_packet ("delinv 0");
212 215
213 packet sl; 216 packet sl;
214 sl.printf ("item%d ", pl->ns->itemcmd); 217 sl.printf ("item%d ", pl->ns->itemcmd);
215 218
216 sl << uint32 (0); 219 sl << uint32 (0);
… …
283 dirty = true; 286 dirty = true;
284 287
285 // 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
286 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 289 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
287 { 290 {
291 pl->ns->flush_fx ();
288 pl->ns->send_packet (sl); 292 pl->ns->send_packet (sl);
289 293
290 sl.reset (); 294 sl.reset ();
291 sl.printf ("item%d ", pl->ns->itemcmd); 295 sl.printf ("item%d ", pl->ns->itemcmd);
292 sl << uint32 (0); 296 sl << uint32 (0);
… …
311 315
312 dirty = true; 316 dirty = true;
313 } 317 }
314 318
315 if (dirty) 319 if (dirty)
320 {
321 pl->ns->flush_fx ();
316 pl->ns->send_packet (sl); 322 pl->ns->send_packet (sl);
323 }
317} 324}
318 325
319/** 326/**
320 * Sends whole inventory. 327 * Sends whole inventory.
321 */ 328 */
… …
353 * items (especially with some of the bags out there) to 360 * items (especially with some of the bags out there) to
354 * overflow the buffer. IF so, send multiple item commands. 361 * overflow the buffer. IF so, send multiple item commands.
355 */ 362 */
356 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 363 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
357 { 364 {
365 pl->contr->ns->flush_fx ();
358 pl->contr->ns->send_packet (sl); 366 pl->contr->ns->send_packet (sl);
359 367
360 sl.reset (); 368 sl.reset ();
361 sl.printf ("item%d ", pl->contr->ns->itemcmd); 369 sl.printf ("item%d ", pl->contr->ns->itemcmd);
362 sl << uint32 (op->count); 370 sl << uint32 (op->count);
… …
364 } 372 }
365 } 373 }
366 } 374 }
367 375
368 if (got_one) 376 if (got_one)
377 {
378 pl->contr->ns->flush_fx ();
369 pl->contr->ns->send_packet (sl); 379 pl->contr->ns->send_packet (sl);
380 }
370} 381}
371 382
372/** 383/**
373 * Updates object *op for player *pl. 384 * Updates object *op for player *pl.
374 * 385 *
… …
385 396
386 client *ns = pl->contr->ns; 397 client *ns = pl->contr->ns;
387 if (!ns) 398 if (!ns)
388 return; 399 return;
389 400
390 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
391 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
392 * this is happening - we can set a breakpoint here in the debugger
393 * and track back the call.
394 */
395 LOG (llevDebug | logBacktrace, "We have not sent item %s (%d)\n", &op->name, op->count);
396
397 packet sl ("upditem"); 401 packet sl ("upditem");
398 402
399 sl << uint8 (flags); 403 sl << uint8 (flags);
400 404
401 op = op->head_ (); 405 op = op->head_ ();
… …
408 if (flags & UPD_FLAGS) 412 if (flags & UPD_FLAGS)
409 sl << uint32 (query_flags (op)); 413 sl << uint32 (query_flags (op));
410 414
411 if (flags & UPD_WEIGHT) 415 if (flags & UPD_WEIGHT)
412 { 416 {
413 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); 417 sint32 weight = op->client_weight ();
414 418
415 if (op) 419 if (op == pl)
416 ns->last_weight = weight; 420 ns->last_weight = weight;
417 421
418 sl << uint32 (weight); 422 sl << uint32 (weight);
419 } 423 }
420 424
… …
427 431
428 if (flags & UPD_NAME) 432 if (flags & UPD_NAME)
429 { 433 {
430 int len; 434 int len;
431 const char *item_p; 435 const char *item_p;
432 char item_n[MAX_BUF]; 436 char item_n[127 * 2];
433 437
434 if (!op->custom_name) 438 if (!op->custom_name)
435 { 439 {
436 strncpy (item_n, query_base_name (op, 0), 127); 440 len = assign (item_n, query_base_name (op, 0), 127);
437 item_n[127] = 0;
438 len = strlen (item_n);
439 item_p = query_base_name (op, 1); 441 item_p = query_base_name (op, 1);
440 } 442 }
441 else 443 else
442 { 444 {
443 strncpy (item_n, op->custom_name, 127); 445 len = assign (item_n, &op->custom_name, 127);
444 item_n[127] = 0;
445 len = strlen (item_n);
446 item_p = op->custom_name; 446 item_p = &op->custom_name;
447 } 447 }
448 448
449 strncpy (item_n + len + 1, item_p, 127); 449 len += assign (item_n + len, item_p, 127);
450 item_n[254] = 0;
451 len += strlen (item_n + 1 + len) + 1;
452 450
453 sl << data8 (item_n, len); 451 sl << data8 (item_n, len);
454 } 452 }
455 453
456 if (flags & UPD_ANIM) 454 if (flags & UPD_ANIM)
… …
458 456
459 if (flags & UPD_ANIMSPEED) 457 if (flags & UPD_ANIMSPEED)
460 { 458 {
461 int anim_speed = 0; 459 int anim_speed = 0;
462 460
463 if (QUERY_FLAG (op, FLAG_ANIMATE)) 461 if (op->flag [FLAG_ANIMATE])
464 { 462 {
465 if (op->anim_speed) 463 if (op->anim_speed)
466 anim_speed = op->anim_speed; 464 anim_speed = op->anim_speed;
467 else 465 else
468 { 466 {
469 if (fabs (op->speed) < 0.001) 467 if (op->speed < 0.001)
470 anim_speed = 255; 468 anim_speed = 255;
471 else if (fabs (op->speed) >= 1.0) 469 else if (op->speed >= 1.0)
472 anim_speed = 1; 470 anim_speed = 1;
473 else 471 else
474 anim_speed = (int) (1.0 / fabs (op->speed)); 472 anim_speed = 1. / op->speed;
475 } 473 }
476 474
477 if (anim_speed > 255) 475 if (anim_speed > 255)
478 anim_speed = 255; 476 anim_speed = 255;
479 } 477 }
… …
508 506
509 sl << uint32 (op->env ? op->env->count : 0); 507 sl << uint32 (op->env ? op->env->count : 0);
510 508
511 add_object_to_socklist (*pl->contr->ns, sl, op); 509 add_object_to_socklist (*pl->contr->ns, sl, op);
512 510
511 pl->contr->ns->flush_fx ();
513 pl->contr->ns->send_packet (sl); 512 pl->contr->ns->send_packet (sl);
514 SET_FLAG (op, FLAG_CLIENT_SENT);
515} 513}
516 514
517/** 515/**
518 * Tells the client to delete an item. 516 * Tells the client to delete an item.
519 */ 517 */
… …
539 537
540/** 538/**
541 * 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
542 * pointer, or null if it can't be found. 540 * pointer, or null if it can't be found.
543 */ 541 */
544object * 542static object *
545esrv_get_ob_from_count (object *pl, tag_t count) 543esrv_get_ob_from_count (object *pl, tag_t count)
546{ 544{
547 if (pl->count == count) 545 if (pl->count == count)
548 return pl; 546 return pl;
549 547
550 for (object *op = pl->inv; op; op = op->below) 548 for (object *op = pl->inv; op; op = op->below)
551 if (op->count == count) 549 if (op->count == count)
552 return op; 550 return op;
553 else if (op->type == CONTAINER && pl->container == op) 551 else if (op->type == CONTAINER && pl->container_ () == op)
554 for (object *tmp = op->inv; tmp; tmp = tmp->below) 552 for (object *tmp = op->inv; tmp; tmp = tmp->below)
555 if (tmp->count == count) 553 if (tmp->count == count)
556 return tmp; 554 return tmp;
557 555
558 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)
559 if (op->head && op->head->count == count) 557 if (op->head && op->head->count == count)
560 return op; 558 return op;
561 else if (op->count == count) 559 else if (op->count == count)
562 return op; 560 return op;
563 else if (op->type == CONTAINER && pl->container == op) 561 else if (op->type == CONTAINER && pl->container_ () == op)
564 for (object *tmp = op->inv; tmp; tmp = tmp->below) 562 for (object *tmp = op->inv; tmp; tmp = tmp->below)
565 if (tmp->count == count) 563 if (tmp->count == count)
566 return tmp; 564 return tmp;
567 565
568#if 0 566#if 0
… …
607 605
608 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 606 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
609 { 607 {
610 std::string s = op->describe (pl->ob); 608 std::string s = op->describe (pl->ob);
611 609
612 if (msg_is_special (s.c_str (), false))
613 cfperl_expand_cfpod (pl, s);
614
615 packet sl ("ex"); 610 packet sl ("ex");
616 sl << ber32 (tag) << s.c_str (); 611 sl << ber32 (tag)
612 << data (*pl->expand_cfpod (s.c_str ()));
617 613
618 pl->ns->send_packet (sl); 614 pl->ns->send_packet (sl);
619 } 615 }
620} 616}
621 617
… …
631 pl->ns->look_position = tag & 0x7fffffff; 627 pl->ns->look_position = tag & 0x7fffffff;
632 pl->ns->floorbox_update (); 628 pl->ns->floorbox_update ();
633 return; 629 return;
634 } 630 }
635 631
632 // the object might be legally gone already
636 object *op = esrv_get_ob_from_count (pl->ob, tag); 633 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
637 634 pl->ob->apply (op, AP_TOGGLE);
638 if (!op)
639 {
640 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
641 return;
642 }
643
644 player_apply (pl->ob, op, 0, 0);
645} 635}
646 636
647/** Client wants to lock some object. Lets do so. */ 637/** Client wants to lock some object. Lets do so. */
648void 638void
649LockItem (char *data, int len, player *pl) 639LockItem (char *data, int len, player *pl)
… …
657 pl->failmsg ("Could not find object to lock/unlock"); 647 pl->failmsg ("Could not find object to lock/unlock");
658 return; 648 return;
659 } 649 }
660 650
661 if (!flag) 651 if (!flag)
662 CLEAR_FLAG (op, FLAG_INV_LOCKED); 652 op->clr_flag (FLAG_INV_LOCKED);
663 else 653 else
664 SET_FLAG (op, FLAG_INV_LOCKED); 654 op->set_flag (FLAG_INV_LOCKED);
665 655
666 esrv_update_item (UPD_FLAGS, pl->ob, op); 656 esrv_update_item (UPD_FLAGS, pl->ob, op);
667} 657}
668 658
669/** Client wants to mark some object. Lets do so. */ 659/** Client wants to mark some object. Lets do so. */
… …
690 * Tero.Haatanen@lut.fi ] 680 * Tero.Haatanen@lut.fi ]
691 */ 681 */
692static void 682static void
693look_at (player *pl, int dx, int dy) 683look_at (player *pl, int dx, int dy)
694{ 684{
695 dynbuf_text buf; 685 dynbuf_text &buf = msg_dynbuf; buf.clear ();
696 object *ob = pl->ob; 686 object *ob = pl->ob;
697 687
698 if (!pl->observe->map) 688 if (!pl->observe->map)
699 return; 689 return;
690
691 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
700 692
701 mapxy pos (pl->observe); 693 mapxy pos (pl->observe);
702 pos.move (dx, dy); 694 pos.move (dx, dy);
703 695
696 if (wiz)
697 {
704 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 ())
705 for (object *tmp = pos->top; tmp; tmp = tmp->below) 723 for (object *tmp = pos->top; tmp; tmp = tmp->below)
706 { 724 {
707 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 725 if (tmp->invisible && !ob->flag [FLAG_WIZ])
708 continue; 726 continue;
709 727
710 if (QUERY_FLAG (ob, FLAG_WIZ)) 728 if (wiz)
711 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 ());
712 else 730 else
713 buf.printf ("- %s.\n", query_name (tmp)); 731 buf.printf (" - %s.\n", query_name (tmp));
714 732
715 object *head = tmp->head_ (); 733 object *head = tmp->head_ ();
716 734
717 if (head->inv) 735 if (head->inv)
718 if ((head->type != CONTAINER && head->type != FLESH) 736 if ((head->type != CONTAINER && head->type != FLESH)
719 || QUERY_FLAG (ob, FLAG_WIZ)) 737 || ob->flag [FLAG_WIZ])
720 buf << head->query_inventory (ob, " "); 738 buf << head->query_inventory (ob, " ");
721 739
722 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 */
723 break; 741 break;
742 }
724 } 743 }
725 744
726 if (buf.empty ()) 745 if (buf.empty ())
727 pl->failmsg ("You see nothing there."); 746 buf << "You see nothing there.";
728 else 747
729 pl->infobox (MSG_CHANNEL ("lookat"), buf); 748 pl->infobox (MSG_CHANNEL ("lookat"), buf);
730} 749}
731 750
732/** Client wants to look at some object. Lets do so. */ 751/** Client wants to look at some object. Lets do so. */
733void 752void
734LookAt (char *buf, int len, player *pl) 753LookAt (char *buf, int len, player *pl)
… …
738 int dx = atoi (buf); 757 int dx = atoi (buf);
739 if (!(cp = strchr (buf, ' '))) 758 if (!(cp = strchr (buf, ' ')))
740 return; 759 return;
741 760
742 int dy = atoi (cp); 761 int dy = atoi (cp);
743
744 if (player *opl = pl->observe->contr)
745 if (client *ns = opl->ns)
746 {
747 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
748 return;
749
750 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
751 return;
752 }
753 762
754 look_at (pl, dx, dy); 763 look_at (pl, dx, dy);
755} 764}
756 765
757/** Move an object to a new location */ 766/** Move an object to a new location */
… …
771 return; 780 return;
772 781
773 /* 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
774 * in the container and not the container itself. 783 * in the container and not the container itself.
775 */ 784 */
776 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 785 if (op->inv && op->flag [FLAG_APPLIED])
777 { 786 {
778 int cnt = MAX_ITEM_PER_DROP; 787 int cnt = MAX_ITEM_PER_ACTION;
779 788
780 for (object *current = op->inv; current && cnt--; ) 789 for (object *current = op->inv; current && cnt--; )
781 { 790 {
782 object *next = current->below; 791 object *next = current->below;
783 drop_object (pl, current, 0); 792 drop_object (pl, current, 0);

Diff Legend

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