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.74 by root, Mon Dec 8 15:55:00 2008 UTC vs.
Revision 1.105 by root, Wed Nov 14 23:24:27 2018 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 (©) 2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify 9 * 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 10 * 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 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the GNU General Public License 19 * 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/>. 20 * and the GNU General Public License along with this program. If not, see
21 * <http://www.gnu.org/licenses/>.
20 * 22 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 24 */
23 25
24/** 26/**
25 * \file 27 * \file
… …
45 * 47 *
46 ******************************************************************************/ 48 ******************************************************************************/
47 49
48/** 50/**
49 * This is a similar to query_name, but returns flags 51 * This is a similar to query_name, but returns flags
50 * to be sent to client. 52 * to be sent to client.
51 */ 53 */
52unsigned int 54static unsigned int
53query_flags (object *op) 55query_flags (object *op)
54{ 56{
55 unsigned int flags = 0; 57 unsigned int flags = 0;
56 58
57 if (QUERY_FLAG (op, FLAG_APPLIED)) 59 if (op->flag [FLAG_APPLIED])
58 switch (op->type) 60 switch (op->type)
59 { 61 {
60 case BOW: 62 case BOW:
61 case WAND: 63 case WAND:
62 case ROD: 64 case ROD:
… …
85 default: 87 default:
86 flags = a_applied; 88 flags = a_applied;
87 break; 89 break;
88 } 90 }
89 91
90 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 92 if (op->is_open_container ())
91 flags |= F_OPEN; 93 flags |= F_OPEN;
92 94
93 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 95 if (op->flag [FLAG_KNOWN_CURSED])
94 { 96 {
95 if (QUERY_FLAG (op, FLAG_DAMNED)) 97 if (op->flag [FLAG_DAMNED])
96 flags |= F_DAMNED; 98 flags |= F_DAMNED;
97 else if (QUERY_FLAG (op, FLAG_CURSED)) 99 else if (op->flag [FLAG_CURSED])
98 flags |= F_CURSED; 100 flags |= F_CURSED;
99 } 101 }
100 102
101 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 103 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
102 flags |= F_MAGIC; 104 flags |= F_MAGIC;
103 if (QUERY_FLAG (op, FLAG_UNPAID)) 105 if (op->flag [FLAG_UNPAID])
104 flags |= F_UNPAID; 106 flags |= F_UNPAID;
105 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 107 if (op->flag [FLAG_INV_LOCKED])
106 flags |= F_LOCKED; 108 flags |= F_LOCKED;
107 109
108 return flags; 110 return flags;
109} 111}
110 112
… …
113 * animation of face to the client. 115 * animation of face to the client.
114 */ 116 */
115static void 117static void
116add_object_to_socklist (client &ns, packet &sl, object *head) 118add_object_to_socklist (client &ns, packet &sl, object *head)
117{ 119{
118 char item_n[MAX_BUF];
119 const char *item_p;
120
121 int flags = query_flags (head); 120 int flags = query_flags (head);
122 if (QUERY_FLAG (head, FLAG_NO_PICK)) 121
122 if (head->flag [FLAG_NO_PICK])
123 flags |= F_NOPICK; 123 flags |= F_NOPICK;
124 124
125 ns.send_face (head->face, -50); 125 ns.send_face (head->face, -50);
126 ns.flush_fx ();
127 126
128 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 127 if (head->flag [FLAG_ANIMATE] && !ns.anims_sent[head->animation_id])
129 ns.send_animation (head->animation_id); 128 ns.send_animation (head->animation_id);
130 129
131 sl << uint32 (head->count) 130 sl << uint32 (head->count)
132 << uint32 (flags) 131 << uint32 (flags)
133 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) 132 << uint32 (head->flag [FLAG_NO_PICK] ? -1 : head->client_weight ())
134 << uint32 (head->face); 133 << uint32 (head->face);
135 134
136 int len;
137
138 if (!head->custom_name) 135 if (!head->custom_name)
139 { 136 {
140 strncpy (item_n, query_base_name (head, 0), 127); 137 const char *name;
141 item_n[127] = 0; 138 uint8 *len = sl.cur++; // patch up length later
142 len = strlen (item_n); 139
143 item_p = query_base_name (head, 1); 140 name = query_base_name (head, 0); sl << data_n (name, min (127, strlen (name)));
141 sl << uint8 (0);
142 name = query_base_name (head, 1); sl << data_n (name, min (127, strlen (name)));
143
144 *len = sl.cur - len - 1;
144 } 145 }
145 else 146 else
146 { 147 {
147 strncpy (item_n, head->custom_name, 127); 148 int len = min (127, head->custom_name.length ());
148 item_n[127] = 0;
149 len = strlen (item_n);
150 item_p = head->custom_name;
151 }
152 149
153 strncpy (item_n + len + 1, item_p, 127); 150 sl << uint8 (len * 2 + 1)
154 item_n[254] = 0; 151 << data_n (head->custom_name, len)
155 len += strlen (item_n + 1 + len) + 1; 152 << uint8 (0)
153 << data_n (head->custom_name, len);
154 }
156 155
157 sl << data8 (item_n, len)
158 << uint16 (head->animation_id); 156 sl << uint16 (head->animation_id);
159 157
160 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0 158 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
161 : head->anim_speed ? clamp (head->anim_speed, 1, 255) 159 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
162 : 1. / clamp (fabs (head->speed), 1./255., 1./1.); 160 : 1. / clamp (head->speed, 1./255., 1./1.);
163 161
164 sl << uint8 (anim_speed) 162 sl << uint8 (anim_speed)
165 << uint32 (head->nrof); 163 << uint32 (head->nrof);
166 164
167 if (ns.itemcmd == 2) 165 if (ns.itemcmd == 2)
… …
181 179
182#define FINGER_UP "finger_up.x11" 180#define FINGER_UP "finger_up.x11"
183#define FINGER_DOWN "finger_down.x11" 181#define FINGER_DOWN "finger_down.x11"
184 182
185/** 183/**
186 * Send the look window. Don't need to do animations here 184 * Send the look window. Don't need to do animations here
187 * This sends all the faces to the client, not just updates. This is 185 * This sends all the faces to the client, not just updates. This is
188 * because object ordering would otherwise be inconsistent. 186 * because object ordering would otherwise be inconsistent.
189 */ 187 */
190void 188void
191esrv_draw_look (player *pl) 189esrv_draw_look (player *pl)
… …
196 { 194 {
197 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); 195 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
198 return; 196 return;
199 } 197 }
200 198
199 if (pl->ns->need_delinv0)
200 {
201 pl->ns->need_delinv0 = 0;
202 pl->ns->send_packet ("delinv 0");
203 }
204
205 if (pl->run_on)
206 return;
207
201 pl->ns->update_look = 0; 208 pl->ns->update_look = 0;
209 pl->ns->need_delinv0 = 1;
202 210
203 if (QUERY_FLAG (ob, FLAG_REMOVED) 211 if (ob->flag [FLAG_REMOVED]
204 || !ob->map 212 || !ob->map
205 || ob->map->in_memory != MAP_ACTIVE 213 || ob->map->state != MAP_ACTIVE
206 || out_of_map (ob->map, ob->x, ob->y)) 214 || out_of_map (ob->map, ob->x, ob->y))
207 return; 215 return;
208
209 pl->ns->send_packet ("delinv 0");
210 216
211 packet sl; 217 packet sl;
212 sl.printf ("item%d ", pl->ns->itemcmd); 218 sl.printf ("item%d ", pl->ns->itemcmd);
213 219
214 sl << uint32 (0); 220 sl << uint32 (0);
… …
281 dirty = true; 287 dirty = true;
282 288
283 // if packet got too large, send it and begin a new one 289 // if packet got too large, send it and begin a new one
284 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 290 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
285 { 291 {
292 pl->ns->flush_fx ();
286 pl->ns->send_packet (sl); 293 pl->ns->send_packet (sl);
287 294
288 sl.reset (); 295 sl.reset ();
289 sl.printf ("item%d ", pl->ns->itemcmd); 296 sl.printf ("item%d ", pl->ns->itemcmd);
290 sl << uint32 (0); 297 sl << uint32 (0);
… …
309 316
310 dirty = true; 317 dirty = true;
311 } 318 }
312 319
313 if (dirty) 320 if (dirty)
321 {
322 pl->ns->flush_fx ();
314 pl->ns->send_packet (sl); 323 pl->ns->send_packet (sl);
324 }
315} 325}
316 326
317/** 327/**
318 * Sends whole inventory. 328 * Sends whole inventory.
319 */ 329 */
… …
351 * items (especially with some of the bags out there) to 361 * items (especially with some of the bags out there) to
352 * overflow the buffer. IF so, send multiple item commands. 362 * overflow the buffer. IF so, send multiple item commands.
353 */ 363 */
354 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 364 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
355 { 365 {
366 pl->contr->ns->flush_fx ();
356 pl->contr->ns->send_packet (sl); 367 pl->contr->ns->send_packet (sl);
357 368
358 sl.reset (); 369 sl.reset ();
359 sl.printf ("item%d ", pl->contr->ns->itemcmd); 370 sl.printf ("item%d ", pl->contr->ns->itemcmd);
360 sl << uint32 (op->count); 371 sl << uint32 (op->count);
… …
362 } 373 }
363 } 374 }
364 } 375 }
365 376
366 if (got_one) 377 if (got_one)
378 {
379 pl->contr->ns->flush_fx ();
367 pl->contr->ns->send_packet (sl); 380 pl->contr->ns->send_packet (sl);
381 }
368} 382}
369 383
370/** 384/**
371 * Updates object *op for player *pl. 385 * Updates object *op for player *pl.
372 * 386 *
… …
418 432
419 if (flags & UPD_NAME) 433 if (flags & UPD_NAME)
420 { 434 {
421 int len; 435 int len;
422 const char *item_p; 436 const char *item_p;
423 char item_n[MAX_BUF]; 437 char item_n[127 * 2];
424 438
425 if (!op->custom_name) 439 if (!op->custom_name)
426 { 440 {
427 strncpy (item_n, query_base_name (op, 0), 127); 441 len = assign (item_n, query_base_name (op, 0), 127);
428 item_n[127] = 0;
429 len = strlen (item_n);
430 item_p = query_base_name (op, 1); 442 item_p = query_base_name (op, 1);
431 } 443 }
432 else 444 else
433 { 445 {
434 strncpy (item_n, op->custom_name, 127); 446 len = assign (item_n, &op->custom_name, 127);
435 item_n[127] = 0;
436 len = strlen (item_n);
437 item_p = op->custom_name; 447 item_p = &op->custom_name;
438 } 448 }
439 449
440 strncpy (item_n + len + 1, item_p, 127); 450 len += assign (item_n + len, item_p, 127);
441 item_n[254] = 0;
442 len += strlen (item_n + 1 + len) + 1;
443 451
444 sl << data8 (item_n, len); 452 sl << data8 (item_n, len);
445 } 453 }
446 454
447 if (flags & UPD_ANIM) 455 if (flags & UPD_ANIM)
… …
449 457
450 if (flags & UPD_ANIMSPEED) 458 if (flags & UPD_ANIMSPEED)
451 { 459 {
452 int anim_speed = 0; 460 int anim_speed = 0;
453 461
454 if (QUERY_FLAG (op, FLAG_ANIMATE)) 462 if (op->flag [FLAG_ANIMATE])
455 { 463 {
456 if (op->anim_speed) 464 if (op->anim_speed)
457 anim_speed = op->anim_speed; 465 anim_speed = op->anim_speed;
458 else 466 else
459 { 467 {
460 if (fabs (op->speed) < 0.001) 468 if (op->speed < 0.001)
461 anim_speed = 255; 469 anim_speed = 255;
462 else if (fabs (op->speed) >= 1.0) 470 else if (op->speed >= 1.0)
463 anim_speed = 1; 471 anim_speed = 1;
464 else 472 else
465 anim_speed = (int) (1.0 / fabs (op->speed)); 473 anim_speed = 1. / op->speed;
466 } 474 }
467 475
468 if (anim_speed > 255) 476 if (anim_speed > 255)
469 anim_speed = 255; 477 anim_speed = 255;
470 } 478 }
… …
499 507
500 sl << uint32 (op->env ? op->env->count : 0); 508 sl << uint32 (op->env ? op->env->count : 0);
501 509
502 add_object_to_socklist (*pl->contr->ns, sl, op); 510 add_object_to_socklist (*pl->contr->ns, sl, op);
503 511
512 pl->contr->ns->flush_fx ();
504 pl->contr->ns->send_packet (sl); 513 pl->contr->ns->send_packet (sl);
505} 514}
506 515
507/** 516/**
508 * Tells the client to delete an item. 517 * Tells the client to delete an item.
… …
529 538
530/** 539/**
531 * Takes a player and object count (tag) and returns the actual object 540 * Takes a player and object count (tag) and returns the actual object
532 * pointer, or null if it can't be found. 541 * pointer, or null if it can't be found.
533 */ 542 */
534object * 543static object *
535esrv_get_ob_from_count (object *pl, tag_t count) 544esrv_get_ob_from_count (object *pl, tag_t count)
536{ 545{
537 if (pl->count == count) 546 if (pl->count == count)
538 return pl; 547 return pl;
539 548
540 for (object *op = pl->inv; op; op = op->below) 549 for (object *op = pl->inv; op; op = op->below)
541 if (op->count == count) 550 if (op->count == count)
542 return op; 551 return op;
543 else if (op->type == CONTAINER && pl->container == op) 552 else if (op->type == CONTAINER && pl->container_ () == op)
544 for (object *tmp = op->inv; tmp; tmp = tmp->below) 553 for (object *tmp = op->inv; tmp; tmp = tmp->below)
545 if (tmp->count == count) 554 if (tmp->count == count)
546 return tmp; 555 return tmp;
547 556
548 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 557 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
549 if (op->head && op->head->count == count) 558 if (op->head && op->head->count == count)
550 return op; 559 return op;
551 else if (op->count == count) 560 else if (op->count == count)
552 return op; 561 return op;
553 else if (op->type == CONTAINER && pl->container == op) 562 else if (op->type == CONTAINER && pl->container_ () == op)
554 for (object *tmp = op->inv; tmp; tmp = tmp->below) 563 for (object *tmp = op->inv; tmp; tmp = tmp->below)
555 if (tmp->count == count) 564 if (tmp->count == count)
556 return tmp; 565 return tmp;
557 566
558#if 0 567#if 0
… …
599 { 608 {
600 std::string s = op->describe (pl->ob); 609 std::string s = op->describe (pl->ob);
601 610
602 packet sl ("ex"); 611 packet sl ("ex");
603 sl << ber32 (tag) 612 sl << ber32 (tag)
604 << data (*pl->expand_cfpod (s.c_str ())); 613 << data_n (*pl->expand_cfpod (s.c_str ()));
605 614
606 pl->ns->send_packet (sl); 615 pl->ns->send_packet (sl);
607 } 616 }
608} 617}
609 618
… …
619 pl->ns->look_position = tag & 0x7fffffff; 628 pl->ns->look_position = tag & 0x7fffffff;
620 pl->ns->floorbox_update (); 629 pl->ns->floorbox_update ();
621 return; 630 return;
622 } 631 }
623 632
633 // the object might be legally gone already
624 object *op = esrv_get_ob_from_count (pl->ob, tag); 634 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
625 635 pl->ob->apply (op, AP_TOGGLE);
626 if (!op)
627 {
628 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
629 return;
630 }
631
632 player_apply (pl->ob, op, 0, 0);
633} 636}
634 637
635/** Client wants to lock some object. Lets do so. */ 638/** Client wants to lock some object. Lets do so. */
636void 639void
637LockItem (char *data, int len, player *pl) 640LockItem (char *data, int len, player *pl)
… …
640 tag_t tag = net_uint32 ((uint8 *)data + 1); 643 tag_t tag = net_uint32 ((uint8 *)data + 1);
641 object *op = esrv_get_ob_from_count (pl->ob, tag); 644 object *op = esrv_get_ob_from_count (pl->ob, tag);
642 645
643 if (!op) 646 if (!op)
644 { 647 {
645 pl->failmsg ("Could not find object to lock/unlock"); 648 pl->failmsgf ("Could not find object %d to lock/unlock", tag);
646 return; 649 return;
647 } 650 }
648 651
649 if (!flag) 652 if (!flag)
650 CLEAR_FLAG (op, FLAG_INV_LOCKED); 653 op->clr_flag (FLAG_INV_LOCKED);
651 else 654 else
652 SET_FLAG (op, FLAG_INV_LOCKED); 655 op->set_flag (FLAG_INV_LOCKED);
653 656
654 esrv_update_item (UPD_FLAGS, pl->ob, op); 657 esrv_update_item (UPD_FLAGS, pl->ob, op);
655} 658}
656 659
657/** Client wants to mark some object. Lets do so. */ 660/** Client wants to mark some object. Lets do so. */
… …
661 tag_t tag = net_uint32 ((uint8 *)data); 664 tag_t tag = net_uint32 ((uint8 *)data);
662 object *op = esrv_get_ob_from_count (pl->ob, tag); 665 object *op = esrv_get_ob_from_count (pl->ob, tag);
663 666
664 if (!op) 667 if (!op)
665 { 668 {
666 pl->failmsg ("Could not find object to mark"); 669 pl->failmsgf ("Could not find object %d to mark", tag);
667 return; 670 return;
668 } 671 }
669 672
670 pl->mark = op; 673 pl->mark = op;
671 pl->ob->statusmsg (format ("Marked item %s", query_name (op))); 674 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
… …
678 * Tero.Haatanen@lut.fi ] 681 * Tero.Haatanen@lut.fi ]
679 */ 682 */
680static void 683static void
681look_at (player *pl, int dx, int dy) 684look_at (player *pl, int dx, int dy)
682{ 685{
683 dynbuf_text buf; 686 dynbuf_text &buf = msg_dynbuf; buf.clear ();
684 object *ob = pl->ob; 687 object *ob = pl->ob;
685 688
686 if (!pl->observe->map) 689 if (!pl->observe->map)
687 return; 690 return;
691
692 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
688 693
689 mapxy pos (pl->observe); 694 mapxy pos (pl->observe);
690 pos.move (dx, dy); 695 pos.move (dx, dy);
691 696
697 if (wiz)
698 {
692 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 ())
693 for (object *tmp = pos->top; tmp; tmp = tmp->below) 724 for (object *tmp = pos->top; tmp; tmp = tmp->below)
694 { 725 {
695 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 726 if (tmp->invisible && !ob->flag [FLAG_WIZ])
696 continue; 727 continue;
697 728
698 if (QUERY_FLAG (ob, FLAG_WIZ)) 729 if (wiz)
699 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 ());
700 else 731 else
701 buf.printf (" - %s.\n", query_name (tmp)); 732 buf.printf (" - %s.\n", query_name (tmp));
702 733
703 object *head = tmp->head_ (); 734 object *head = tmp->head_ ();
704 735
705 if (head->inv) 736 if (head->inv)
706 if ((head->type != CONTAINER && head->type != FLESH) 737 if ((head->type != CONTAINER && head->type != FLESH)
707 || QUERY_FLAG (ob, FLAG_WIZ)) 738 || ob->flag [FLAG_WIZ])
708 buf << head->query_inventory (ob, " "); 739 buf << head->query_inventory (ob, " ");
709 740
710 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 */
711 break; 742 break;
743 }
712 } 744 }
713 745
714 if (buf.empty ()) 746 if (buf.empty ())
715 pl->failmsg ("You see nothing there."); 747 buf << "You see nothing there.";
716 else 748
717 pl->infobox (MSG_CHANNEL ("lookat"), buf); 749 pl->infobox (MSG_CHANNEL ("lookat"), buf);
718} 750}
719 751
720/** Client wants to look at some object. Lets do so. */ 752/** Client wants to look at some object. Lets do so. */
721void 753void
722LookAt (char *buf, int len, player *pl) 754LookAt (char *buf, int len, player *pl)
… …
726 int dx = atoi (buf); 758 int dx = atoi (buf);
727 if (!(cp = strchr (buf, ' '))) 759 if (!(cp = strchr (buf, ' ')))
728 return; 760 return;
729 761
730 int dy = atoi (cp); 762 int dy = atoi (cp);
731
732 if (player *opl = pl->observe->contr)
733 if (client *ns = opl->ns)
734 {
735 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
736 return;
737
738 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2] >= LOS_MAX)
739 return;
740 }
741 763
742 look_at (pl, dx, dy); 764 look_at (pl, dx, dy);
743} 765}
744 766
745/** Move an object to a new location */ 767/** Move an object to a new location */
… …
759 return; 781 return;
760 782
761 /* 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
762 * in the container and not the container itself. 784 * in the container and not the container itself.
763 */ 785 */
764 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 786 if (op->inv && op->flag [FLAG_APPLIED])
765 { 787 {
766 int cnt = MAX_ITEM_PER_DROP; 788 int cnt = MAX_ITEM_PER_ACTION;
767 789
768 for (object *current = op->inv; current && cnt--; ) 790 for (object *current = op->inv; current && cnt--; )
769 { 791 {
770 object *next = current->below; 792 object *next = current->below;
771 drop_object (pl, current, 0); 793 drop_object (pl, current, 0);

Diff Legend

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