ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.272 by root, Sat Dec 27 04:09:58 2008 UTC vs.
Revision 1.309 by root, Sun Nov 29 17:41:07 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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#include <global.h> 25#include <global.h>
… …
36static const uint64 UUID_GAP = 1<<19; 37static const uint64 UUID_GAP = 1<<19;
37uint32_t mapspace::smellcount = 10000; 38uint32_t mapspace::smellcount = 10000;
38 39
39objectvec objects; 40objectvec objects;
40activevec actives; 41activevec actives;
42
43//+GPL
41 44
42short freearr_x[SIZEOFFREE] = { 45short freearr_x[SIZEOFFREE] = {
43 0, 46 0,
44 0, 1, 1, 1, 0, -1, -1, -1, 47 0, 1, 1, 1, 0, -1, -1, -1,
45 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 48 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
… …
49 0, 52 0,
50 -1, -1, 0, 1, 1, 1, 0, -1, 53 -1, -1, 0, 1, 1, 1, 0, -1,
51 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 54 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
52 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 55 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
53}; 56};
54int maxfree[SIZEOFFREE] = {
55 0,
56 9, 10, 13, 14, 17, 18, 21, 22,
57 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
58 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
59};
60int freedir[SIZEOFFREE] = { 57int freedir[SIZEOFFREE] = {
61 0, 58 0,
62 1, 2, 3, 4, 5, 6, 7, 8, 59 1, 2, 3, 4, 5, 6, 7, 8,
63 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 60 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
64 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 61 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
65}; 62};
66 63
64static int maxfree[SIZEOFFREE] = {
65 0,
66 9, 10, 13, 14, 17, 18, 21, 22,
67 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
68 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
69};
70
67static void 71static void
68write_uuid (uval64 skip, bool sync) 72write_uuid (uval64 skip, bool sync)
69{ 73{
70 CALL_BEGIN (2); 74 CALL_BEGIN (2);
71 CALL_ARG_SV (newSVval64 (skip)); 75 CALL_ARG_SV (newSVval64 (skip));
… …
73 CALL_CALL ("cf::write_uuid", G_DISCARD); 77 CALL_CALL ("cf::write_uuid", G_DISCARD);
74 CALL_END; 78 CALL_END;
75} 79}
76 80
77static void 81static void
78read_uuid (void) 82read_uuid ()
79{ 83{
80 char filename[MAX_BUF]; 84 char filename[MAX_BUF];
81 85
82 sprintf (filename, "%s/uuid", settings.localdir); 86 sprintf (filename, "%s/uuid", settings.localdir);
83 87
… …
97 101
98 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 102 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
99 _exit (1); 103 _exit (1);
100 } 104 }
101 105
102 UUID::BUF buf; 106 char buf [UUID::MAX_LEN];
103 buf[0] = 0; 107 buf[0] = 0;
104 fgets (buf, sizeof (buf), fp); 108 fgets (buf, sizeof (buf), fp);
105 109
106 if (!UUID::cur.parse (buf)) 110 if (!UUID::cur.parse (buf))
107 { 111 {
… …
134 138
135void 139void
136UUID::init () 140UUID::init ()
137{ 141{
138 read_uuid (); 142 read_uuid ();
143}
144
145bool
146UUID::parse (const char *s)
147{
148 if (*s++ != '<' || *s++ != '1' || *s++ != '.')
149 return false;
150
151 seq = 0;
152
153 while (*s != '>')
154 {
155 if (*s < '0')
156 return false;
157
158 // this gives nice branchless code with gcc
159 assert ('0' < 'a' && '0' == 48 && 'a' == 97);
160 int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
161
162 seq = (seq << 4) | digit;
163
164 ++s;
165 }
166
167 return true;
168}
169
170char *
171UUID::append (char *buf) const
172{
173 *buf++ = '<';
174 *buf++ = '1';
175 *buf++ = '.';
176
177 uint64_t seq = this->seq;
178 const int bits = 64;
179 char nz = 0;
180 static const char tohex [] = "0123456789abcdef";
181
182 // assert (len >= 3 + bits / 4 + 1 + 1);
183 for (int i = bits / 4; --i; )
184 {
185 uint8_t digit = seq >> (bits - 4);
186
187 *buf = tohex [digit];
188 nz |= digit;
189 buf += nz ? 1 : 0;
190 seq <<= 4;
191 }
192
193 // last digit is special - always emit
194 uint8_t digit = seq >> (bits - 4);
195 *buf++ = tohex [digit];
196
197 *buf++ = '>';
198
199 return buf;
200}
201
202char *
203UUID::c_str () const
204{
205 static char buf [MAX_LEN];
206 *append (buf) = 0;
207 return buf;
139} 208}
140 209
141/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 210/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
142static bool 211static bool
143compare_ob_value_lists_one (const object *wants, const object *has) 212compare_ob_value_lists_one (const object *wants, const object *has)
… …
182bool object::can_merge_slow (object *ob1, object *ob2) 251bool object::can_merge_slow (object *ob1, object *ob2)
183{ 252{
184 /* A couple quicksanity checks */ 253 /* A couple quicksanity checks */
185 if (ob1 == ob2 254 if (ob1 == ob2
186 || ob1->type != ob2->type 255 || ob1->type != ob2->type
187 || ob1->speed != ob2->speed 256 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
188 || ob1->value != ob2->value 257 || ob1->value != ob2->value
189 || ob1->name != ob2->name) 258 || ob1->name != ob2->name)
190 return 0; 259 return 0;
191 260
192 /* Do not merge objects if nrof would overflow, assume nrof 261 /* Do not merge objects if nrof would overflow, assume nrof
… …
217 || ob1->skill != ob2->skill 286 || ob1->skill != ob2->skill
218 || ob1->value != ob2->value 287 || ob1->value != ob2->value
219 || ob1->animation_id != ob2->animation_id 288 || ob1->animation_id != ob2->animation_id
220 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other 289 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
221 || ob1->client_type != ob2->client_type 290 || ob1->client_type != ob2->client_type
222 || ob1->materialname != ob2->materialname 291 || ob1->material != ob2->material
223 || ob1->lore != ob2->lore 292 || ob1->lore != ob2->lore
224 || ob1->subtype != ob2->subtype 293 || ob1->subtype != ob2->subtype
225 || ob1->move_type != ob2->move_type 294 || ob1->move_type != ob2->move_type
226 || ob1->move_block != ob2->move_block 295 || ob1->move_block != ob2->move_block
227 || ob1->move_allow != ob2->move_allow 296 || ob1->move_allow != ob2->move_allow
228 || ob1->move_on != ob2->move_on 297 || ob1->move_on != ob2->move_on
229 || ob1->move_off != ob2->move_off 298 || ob1->move_off != ob2->move_off
230 || ob1->move_slow != ob2->move_slow 299 || ob1->move_slow != ob2->move_slow
231 || ob1->move_slow_penalty != ob2->move_slow_penalty 300 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
232 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) 301 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
233 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 302 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
234 return 0; 303 return 0;
235 304
236 if ((ob1->flag ^ ob2->flag) 305 if ((ob1->flag ^ ob2->flag)
… …
328 // the player inventory itself is always visible 397 // the player inventory itself is always visible
329 if (env->is_player ()) 398 if (env->is_player ())
330 return env; 399 return env;
331 400
332 // else a player could have our env open 401 // else a player could have our env open
333 object *envest = env->outer_env (); 402 object *envest = env->outer_env_or_self ();
334 403
335 // the player itself is always on a map, so we will find him here 404 // the player itself is always on a map, so we will find him here
336 // even if our inv is in a player. 405 // even if our inv is in a player.
337 if (envest->is_on_map ()) 406 if (envest->is_on_map ())
338 if (object *pl = envest->ms ().player ()) 407 if (object *pl = envest->ms ().player ())
339 if (pl->container == env) 408 if (pl->container_ () == env)
340 return pl; 409 return pl;
341 } 410 }
342 else 411 else
343 { 412 {
344 // maybe there is a player standing on the same mapspace 413 // maybe there is a player standing on the same mapspace
345 // this will catch the case where "this" is a player 414 // this will catch the case where "this" is a player
346 if (object *pl = ms ().player ()) 415 if (object *pl = ms ().player ())
347 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) 416 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
348 || this == pl->container) 417 || pl->container_ () == this)
349 return pl; 418 return pl;
350 } 419 }
351 } 420 }
352 421
353 return 0; 422 return 0;
… …
431 object_freezer freezer; 500 object_freezer freezer;
432 op->write (freezer); 501 op->write (freezer);
433 return freezer.as_string (); 502 return freezer.as_string ();
434} 503}
435 504
436/* 505char *
437 * get_nearest_part(multi-object, object 2) returns the part of the 506object::as_string ()
438 * multi-object 1 which is closest to the second object.
439 * If it's not a multi-object, it is returned.
440 */
441object *
442get_nearest_part (object *op, const object *pl)
443{ 507{
444 object *tmp, *closest; 508 return dump_object (this);
445 int last_dist, i;
446
447 if (!op->more)
448 return op;
449
450 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
451 tmp;
452 tmp = tmp->more)
453 if ((i = distance (tmp, pl)) < last_dist)
454 closest = tmp, last_dist = i;
455
456 return closest;
457} 509}
458 510
459/* 511/*
460 * Returns the object which has the count-variable equal to the argument. 512 * Returns the object which has the count-variable equal to the argument.
461 * VERRRY slow. 513 * VERRRY slow.
… …
555 update_stats (); 607 update_stats ();
556 608
557 new_draw_info_format (NDI_UNIQUE, 0, this, 609 new_draw_info_format (NDI_UNIQUE, 0, this,
558 "You try to balance all your items at once, " 610 "You try to balance all your items at once, "
559 "but the %s is just too much for your body. " 611 "but the %s is just too much for your body. "
560 "[You need to unapply some items first.]", &ob->name); 612 "[You need to unapply some items first - use the 'body' command to see "
613 "how many items you cna wera on a specific body part.]", &ob->name);
561 return false; 614 return false;
562 } 615 }
563 616
564 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 617 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
565 } 618 }
… …
634 tail = new_link; 687 tail = new_link;
635 } 688 }
636 } 689 }
637 } 690 }
638 691
639 if (speed < 0)
640 dst->speed_left -= rndm ();
641
642 dst->activate (); 692 dst->activate ();
643} 693}
644 694
645void 695void
646object::instantiate () 696object::instantiate ()
647{ 697{
648 if (!uuid.seq) // HACK 698 if (!uuid.seq) // HACK
649 uuid = UUID::gen (); 699 uuid = UUID::gen ();
650 700
701 // TODO: unclean state changes, should nt be done in copy_to AND instantiate
702 if (flag [FLAG_RANDOM_SPEED] && speed)
703 speed_left = - speed - rndm (); // TODO animation
704 else
651 speed_left = -0.1f; 705 speed_left = -1.;
706
652 /* copy the body_info to the body_used - this is only really 707 /* copy the body_info to the body_used - this is only really
653 * need for monsters, but doesn't hurt to do it for everything. 708 * need for monsters, but doesn't hurt to do it for everything.
654 * by doing so, when a monster is created, it has good starting 709 * by doing so, when a monster is created, it has good starting
655 * values for the body_used info, so when items are created 710 * values for the body_used info, so when items are created
656 * for it, they can be properly equipped. 711 * for it, they can be properly equipped.
… …
664object * 719object *
665object::clone () 720object::clone ()
666{ 721{
667 object *neu = create (); 722 object *neu = create ();
668 copy_to (neu); 723 copy_to (neu);
724
725 // TODO: unclean state changes, should not be done in clone AND instantiate
726 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
727 neu->speed_left = - neu->speed - rndm (); // TODO animation
728
669 neu->map = map; // not copied by copy_to 729 neu->map = map; // not copied by copy_to
670 return neu; 730 return neu;
671} 731}
672 732
673/* 733/*
… …
691 * This function needs to be called whenever the speed of an object changes. 751 * This function needs to be called whenever the speed of an object changes.
692 */ 752 */
693void 753void
694object::set_speed (float speed) 754object::set_speed (float speed)
695{ 755{
696 if (flag [FLAG_FREED] && speed)
697 {
698 LOG (llevError, "Object %s is freed but has speed.\n", &name);
699 speed = 0;
700 }
701
702 this->speed = speed; 756 this->speed = speed;
703 757
704 if (has_active_speed ()) 758 if (has_active_speed ())
705 activate (); 759 activate ();
706 else 760 else
… …
756 810
757 if (!(m.flags_ & P_UPTODATE)) 811 if (!(m.flags_ & P_UPTODATE))
758 /* nop */; 812 /* nop */;
759 else if (action == UP_OBJ_INSERT) 813 else if (action == UP_OBJ_INSERT)
760 { 814 {
815#if 0
761 // this is likely overkill, TODO: revisit (schmorp) 816 // this is likely overkill, TODO: revisit (schmorp)
762 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 817 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
763 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 818 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
764 || (op->is_player () && !(m.flags_ & P_PLAYER)) 819 || (op->is_player () && !(m.flags_ & P_PLAYER))
765 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 820 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
… …
770 || (m.move_slow | op->move_slow) != m.move_slow 825 || (m.move_slow | op->move_slow) != m.move_slow
771 /* This isn't perfect, but I don't expect a lot of objects to 826 /* This isn't perfect, but I don't expect a lot of objects to
772 * have move_allow right now. 827 * have move_allow right now.
773 */ 828 */
774 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 829 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
775 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
776 m.invalidate (); 830 m.invalidate ();
831#else
832 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
833 m.invalidate ();
834#endif
777 } 835 }
778 /* if the object is being removed, we can't make intelligent 836 /* if the object is being removed, we can't make intelligent
779 * decisions, because remove_ob can't really pass the object 837 * decisions, because remove_ob can't really pass the object
780 * that is being removed. 838 * that is being removed.
781 */ 839 */
… …
792 850
793object::object () 851object::object ()
794{ 852{
795 SET_FLAG (this, FLAG_REMOVED); 853 SET_FLAG (this, FLAG_REMOVED);
796 854
797 expmul = 1.0; 855 //expmul = 1.0; declared const for the time being
798 face = blank_face; 856 face = blank_face;
857 material = MATERIAL_NULL;
799} 858}
800 859
801object::~object () 860object::~object ()
802{ 861{
803 unlink (); 862 unlink ();
… …
831{ 890{
832 /* If already on active list, don't do anything */ 891 /* If already on active list, don't do anything */
833 if (active) 892 if (active)
834 return; 893 return;
835 894
836 if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
837 if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
838
839 if (has_active_speed ()) 895 if (has_active_speed ())
896 {
897 if (flag [FLAG_FREED])
898 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
899
840 actives.insert (this); 900 actives.insert (this);
901 }
841} 902}
842 903
843void 904void
844object::activate_recursive () 905object::activate_recursive ()
845{ 906{
… …
963 1024
964void 1025void
965object::do_destroy () 1026object::do_destroy ()
966{ 1027{
967 if (flag [FLAG_IS_LINKED]) 1028 if (flag [FLAG_IS_LINKED])
968 remove_button_link (this); 1029 remove_link ();
969 1030
970 if (flag [FLAG_FRIENDLY]) 1031 if (flag [FLAG_FRIENDLY])
971 remove_friendly_object (this); 1032 remove_friendly_object (this);
972 1033
973 remove (); 1034 remove ();
… …
1031 * the previous environment. 1092 * the previous environment.
1032 */ 1093 */
1033void 1094void
1034object::do_remove () 1095object::do_remove ()
1035{ 1096{
1036 object *tmp, *last = 0;
1037 object *otmp;
1038
1039 if (flag [FLAG_REMOVED]) 1097 if (flag [FLAG_REMOVED])
1040 return; 1098 return;
1041 1099
1042 INVOKE_OBJECT (REMOVE, this); 1100 INVOKE_OBJECT (REMOVE, this);
1043 1101
… …
1075 1133
1076 above = 0; 1134 above = 0;
1077 below = 0; 1135 below = 0;
1078 env = 0; 1136 env = 0;
1079 1137
1080 /* NO_FIX_PLAYER is set when a great many changes are being 1138 if (pl && pl->is_player ())
1081 * made to players inventory. If set, avoiding the call
1082 * to save cpu time.
1083 */
1084 if (pl)
1085 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1086 { 1139 {
1087 pl->update_stats (); 1140 pl->contr->queue_stats_update ();
1088 1141
1089 if (glow_radius && pl->is_on_map ()) 1142 if (glow_radius && pl->is_on_map ())
1090 update_all_los (pl->map, pl->x, pl->y); 1143 update_all_los (pl->map, pl->x, pl->y);
1091 } 1144 }
1092 } 1145 }
1093 else if (map) 1146 else if (map)
1094 { 1147 {
1095 map->dirty = true; 1148 map->dirty = true;
1096 mapspace &ms = this->ms (); 1149 mapspace &ms = this->ms ();
1097 1150
1098 if (object *pl = ms.player ()) 1151 if (object *pl = ms.player ())
1099 { 1152 {
1100 if (is_player ()) 1153 if (is_player ())
1101 { 1154 {
1155 if (!flag [FLAG_WIZPASS])
1102 ms.smell = ++mapspace::smellcount; // remember the smell of the player 1156 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1103 1157
1104 // leaving a spot always closes any open container on the ground 1158 // leaving a spot always closes any open container on the ground
1105 if (container && !container->env) 1159 if (container && !container->env)
1106 // this causes spurious floorbox updates, but it ensures 1160 // this causes spurious floorbox updates, but it ensures
1107 // that the CLOSE event is being sent. 1161 // that the CLOSE event is being sent.
1108 close_container (); 1162 close_container ();
1109 1163
1110 --map->players; 1164 --map->players;
1111 map->touch (); 1165 map->touch ();
1112 } 1166 }
1113 else if (pl->container == this) 1167 else if (pl->container_ () == this)
1114 { 1168 {
1115 // removing a container should close it 1169 // removing a container should close it
1116 close_container (); 1170 close_container ();
1117 } 1171 }
1118 1172
… …
1134 1188
1135 int check_walk_off = !flag [FLAG_NO_APPLY]; 1189 int check_walk_off = !flag [FLAG_NO_APPLY];
1136 1190
1137 if (object *pl = ms.player ()) 1191 if (object *pl = ms.player ())
1138 { 1192 {
1139 if (pl->container == this) 1193 if (pl->container_ () == this)
1140 /* If a container that the player is currently using somehow gets 1194 /* If a container that the player is currently using somehow gets
1141 * removed (most likely destroyed), update the player view 1195 * removed (most likely destroyed), update the player view
1142 * appropriately. 1196 * appropriately.
1143 */ 1197 */
1144 pl->close_container (); 1198 pl->close_container ();
… …
1148 //TODO: update floorbox to preserve ordering 1202 //TODO: update floorbox to preserve ordering
1149 if (pl->contr->ns) 1203 if (pl->contr->ns)
1150 pl->contr->ns->floorbox_update (); 1204 pl->contr->ns->floorbox_update ();
1151 } 1205 }
1152 1206
1207 if (check_walk_off)
1153 for (tmp = ms.bot; tmp; tmp = tmp->above) 1208 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1154 { 1209 {
1210 above = tmp->above;
1211
1155 /* No point updating the players look faces if he is the object 1212 /* No point updating the players look faces if he is the object
1156 * being removed. 1213 * being removed.
1157 */ 1214 */
1158 1215
1159 /* See if object moving off should effect something */ 1216 /* See if object moving off should effect something */
1160 if (check_walk_off
1161 && ((move_type & tmp->move_off) 1217 if ((move_type & tmp->move_off)
1162 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1218 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1163 {
1164 move_apply (tmp, this, 0); 1219 move_apply (tmp, this, 0);
1165
1166 if (destroyed ())
1167 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1168 } 1220 }
1169
1170 last = tmp;
1171 }
1172 1221
1173 if (affects_los ()) 1222 if (affects_los ())
1174 update_all_los (map, x, y); 1223 update_all_los (map, x, y);
1175 } 1224 }
1176} 1225}
… …
1220 1269
1221 object *prev = this; 1270 object *prev = this;
1222 1271
1223 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) 1272 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1224 { 1273 {
1225 object *op = arch_to_object (at); 1274 object *op = at->instance ();
1226 1275
1227 op->name = name; 1276 op->name = name;
1228 op->name_pl = name_pl; 1277 op->name_pl = name_pl;
1229 op->title = title; 1278 op->title = title;
1230 1279
… …
1285 1334
1286 /* Ideally, the caller figures this out. However, it complicates a lot 1335 /* Ideally, the caller figures this out. However, it complicates a lot
1287 * of areas of callers (eg, anything that uses find_free_spot would now 1336 * of areas of callers (eg, anything that uses find_free_spot would now
1288 * need extra work 1337 * need extra work
1289 */ 1338 */
1339 maptile *newmap = m;
1290 if (!xy_normalise (m, op->x, op->y)) 1340 if (!xy_normalise (newmap, op->x, op->y))
1291 { 1341 {
1292 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found 1342 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1293 return 0; 1343 return 0;
1294 } 1344 }
1295 1345
1296 if (object *more = op->more) 1346 if (object *more = op->more)
1297 if (!insert_ob_in_map (more, m, originator, flag)) 1347 if (!insert_ob_in_map (more, m, originator, flag))
1298 return 0; 1348 return 0;
1299 1349
1300 CLEAR_FLAG (op, FLAG_REMOVED); 1350 op->flag [FLAG_REMOVED] = false;
1301 1351 op->env = 0;
1302 op->map = m; 1352 op->map = newmap;
1353
1303 mapspace &ms = op->ms (); 1354 mapspace &ms = op->ms ();
1304 1355
1305 /* this has to be done after we translate the coordinates. 1356 /* this has to be done after we translate the coordinates.
1306 */ 1357 */
1307 if (op->nrof && !(flag & INS_NO_MERGE)) 1358 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1328 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1379 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1329 abort (); 1380 abort ();
1330 } 1381 }
1331 1382
1332 if (!originator->is_on_map ()) 1383 if (!originator->is_on_map ())
1384 {
1333 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", 1385 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1334 op->debug_desc (), originator->debug_desc ()); 1386 op->debug_desc (), originator->debug_desc ());
1387 abort ();
1388 }
1335 1389
1336 op->above = originator; 1390 op->above = originator;
1337 op->below = originator->below; 1391 op->below = originator->below;
1338 originator->below = op; 1392 originator->below = op;
1339 1393
… …
1471 * blocked() and wall() work properly), and these flags are updated by 1525 * blocked() and wall() work properly), and these flags are updated by
1472 * update_object(). 1526 * update_object().
1473 */ 1527 */
1474 1528
1475 /* if this is not the head or flag has been passed, don't check walk on status */ 1529 /* if this is not the head or flag has been passed, don't check walk on status */
1476 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1530 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1477 { 1531 {
1478 if (check_move_on (op, originator)) 1532 if (check_move_on (op, originator))
1479 return 0; 1533 return 0;
1480 1534
1481 /* If we are a multi part object, lets work our way through the check 1535 /* If we are a multi part object, lets work our way through the check
… …
1492/* this function inserts an object in the map, but if it 1546/* this function inserts an object in the map, but if it
1493 * finds an object of its own type, it'll remove that one first. 1547 * finds an object of its own type, it'll remove that one first.
1494 * op is the object to insert it under: supplies x and the map. 1548 * op is the object to insert it under: supplies x and the map.
1495 */ 1549 */
1496void 1550void
1497replace_insert_ob_in_map (const char *arch_string, object *op) 1551replace_insert_ob_in_map (shstr_tmp archname, object *op)
1498{ 1552{
1499 /* first search for itself and remove any old instances */ 1553 /* first search for itself and remove any old instances */
1500 1554
1501 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1555 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1502 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1556 if (tmp->arch->archname == archname) /* same archetype */
1503 tmp->destroy (); 1557 tmp->destroy ();
1504 1558
1505 object *tmp = arch_to_object (archetype::find (arch_string)); 1559 object *tmp = archetype::find (archname)->instance ();
1506 1560
1507 tmp->x = op->x; 1561 tmp->x = op->x;
1508 tmp->y = op->y; 1562 tmp->y = op->y;
1509 1563
1510 insert_ob_in_map (tmp, op->map, op, 0); 1564 insert_ob_in_map (tmp, op->map, op, 0);
… …
1515{ 1569{
1516 if (where->env) 1570 if (where->env)
1517 return where->env->insert (this); 1571 return where->env->insert (this);
1518 else 1572 else
1519 return where->map->insert (this, where->x, where->y, originator, flags); 1573 return where->map->insert (this, where->x, where->y, originator, flags);
1574}
1575
1576// check whether we can put this into the map, respect max_volume, max_items
1577bool
1578object::can_drop_at (maptile *m, int x, int y, object *originator)
1579{
1580 mapspace &ms = m->at (x, y);
1581
1582 int items = ms.items ();
1583
1584 if (!items // testing !items ensures we can drop at least one item
1585 || (items < m->max_items
1586 && ms.volume () < m->max_volume))
1587 return true;
1588
1589 if (originator && originator->is_player ())
1590 originator->contr->failmsg (format (
1591 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1592 query_name ()
1593 ));
1594
1595 return false;
1520} 1596}
1521 1597
1522/* 1598/*
1523 * decrease(object, number) decreases a specified number from 1599 * decrease(object, number) decreases a specified number from
1524 * the amount of an object. If the amount reaches 0, the object 1600 * the amount of an object. If the amount reaches 0, the object
… …
1664 if (op->glow_radius && is_on_map ()) 1740 if (op->glow_radius && is_on_map ())
1665 { 1741 {
1666 update_stats (); 1742 update_stats ();
1667 update_all_los (map, x, y); 1743 update_all_los (map, x, y);
1668 } 1744 }
1669 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) 1745 else if (is_player ())
1670 // if this is a player's inventory, update stats 1746 // if this is a player's inventory, update stats
1671 update_stats (); 1747 contr->queue_stats_update ();
1672 1748
1673 INVOKE_OBJECT (INSERT, this); 1749 INVOKE_OBJECT (INSERT, this);
1674 1750
1675 return op; 1751 return op;
1676} 1752}
… …
1696 * on top. 1772 * on top.
1697 */ 1773 */
1698int 1774int
1699check_move_on (object *op, object *originator) 1775check_move_on (object *op, object *originator)
1700{ 1776{
1777 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1778 return 0;
1779
1701 object *tmp; 1780 object *tmp;
1702 maptile *m = op->map; 1781 maptile *m = op->map;
1703 int x = op->x, y = op->y; 1782 int x = op->x, y = op->y;
1704 1783
1705 MoveType move_on, move_slow, move_block; 1784 mapspace &ms = m->at (x, y);
1706 1785
1707 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1786 ms.update ();
1708 return 0;
1709 1787
1710 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1788 MoveType move_on = ms.move_on;
1711 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1789 MoveType move_slow = ms.move_slow;
1712 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1790 MoveType move_block = ms.move_block;
1713 1791
1714 /* if nothing on this space will slow op down or be applied, 1792 /* if nothing on this space will slow op down or be applied,
1715 * no need to do checking below. have to make sure move_type 1793 * no need to do checking below. have to make sure move_type
1716 * is set, as lots of objects don't have it set - we treat that 1794 * is set, as lots of objects don't have it set - we treat that
1717 * as walking. 1795 * as walking.
… …
1728 return 0; 1806 return 0;
1729 1807
1730 /* The objects have to be checked from top to bottom. 1808 /* The objects have to be checked from top to bottom.
1731 * Hence, we first go to the top: 1809 * Hence, we first go to the top:
1732 */ 1810 */
1733 1811 for (object *next, *tmp = ms.top; tmp; tmp = next)
1734 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1735 {
1736 /* Trim the search when we find the first other spell effect
1737 * this helps performance so that if a space has 50 spell objects,
1738 * we don't need to check all of them.
1739 */
1740 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1741 break;
1742 } 1812 {
1813 next = tmp->below;
1743 1814
1744 for (; tmp; tmp = tmp->below)
1745 {
1746 if (tmp == op) 1815 if (tmp == op)
1747 continue; /* Can't apply yourself */ 1816 continue; /* Can't apply yourself */
1748 1817
1749 /* Check to see if one of the movement types should be slowed down. 1818 /* Check to see if one of the movement types should be slowed down.
1750 * Second check makes sure that the movement types not being slowed 1819 * Second check makes sure that the movement types not being slowed
… …
1755 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1824 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1756 { 1825 {
1757 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1826 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1758 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1827 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1759 { 1828 {
1760
1761 float
1762 diff = tmp->move_slow_penalty * fabs (op->speed); 1829 float diff = tmp->move_slow_penalty * fabs (op->speed);
1763 1830
1764 if (op->is_player ()) 1831 if (op->is_player ())
1765 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1832 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1766 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1833 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1767 diff /= 4.0; 1834 diff /= 4.0;
1768 1835
1769 op->speed_left -= diff; 1836 op->speed_left -= diff;
1770 } 1837 }
1771 } 1838 }
… …
2055 * there is capable of. 2122 * there is capable of.
2056 */ 2123 */
2057int 2124int
2058find_dir (maptile *m, int x, int y, object *exclude) 2125find_dir (maptile *m, int x, int y, object *exclude)
2059{ 2126{
2060 int i, max = SIZEOFFREE, mflags; 2127 int max = SIZEOFFREE, mflags;
2061
2062 sint16 nx, ny;
2063 object *tmp;
2064 maptile *mp;
2065
2066 MoveType blocked, move_type; 2128 MoveType move_type;
2067 2129
2068 if (exclude && exclude->head_ () != exclude) 2130 if (exclude && exclude->head_ () != exclude)
2069 { 2131 {
2070 exclude = exclude->head; 2132 exclude = exclude->head;
2071 move_type = exclude->move_type; 2133 move_type = exclude->move_type;
… …
2074 { 2136 {
2075 /* If we don't have anything, presume it can use all movement types. */ 2137 /* If we don't have anything, presume it can use all movement types. */
2076 move_type = MOVE_ALL; 2138 move_type = MOVE_ALL;
2077 } 2139 }
2078 2140
2079 for (i = 1; i < max; i++) 2141 for (int i = 1; i < max; i++)
2080 { 2142 {
2081 mp = m; 2143 mapxy pos (m, x, y);
2082 nx = x + freearr_x[i]; 2144 pos.move (i);
2083 ny = y + freearr_y[i];
2084 2145
2085 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2146 if (!pos.normalise ())
2086
2087 if (mflags & P_OUT_OF_MAP)
2088 max = maxfree[i]; 2147 max = maxfree[i];
2089 else 2148 else
2090 { 2149 {
2091 mapspace &ms = mp->at (nx, ny); 2150 mapspace &ms = *pos;
2092 2151
2093 blocked = ms.move_block;
2094
2095 if ((move_type & blocked) == move_type) 2152 if ((move_type & ms.move_block) == move_type)
2096 max = maxfree[i]; 2153 max = maxfree [i];
2097 else if (mflags & P_IS_ALIVE) 2154 else if (ms.flags () & P_IS_ALIVE)
2098 { 2155 {
2099 for (tmp = ms.bot; tmp; tmp = tmp->above) 2156 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2100 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) 2157 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2101 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2158 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2102 break;
2103
2104 if (tmp)
2105 return freedir[i]; 2159 return freedir [i];
2106 } 2160 }
2107 } 2161 }
2108 } 2162 }
2109 2163
2110 return 0; 2164 return 0;
… …
2185 * This basically means that if direction is 15, then it could either go 2239 * This basically means that if direction is 15, then it could either go
2186 * direction 4, 14, or 16 to get back to where we are. 2240 * direction 4, 14, or 16 to get back to where we are.
2187 * Moved from spell_util.c to object.c with the other related direction 2241 * Moved from spell_util.c to object.c with the other related direction
2188 * functions. 2242 * functions.
2189 */ 2243 */
2190int reduction_dir[SIZEOFFREE][3] = { 2244static const int reduction_dir[SIZEOFFREE][3] = {
2191 {0, 0, 0}, /* 0 */ 2245 {0, 0, 0}, /* 0 */
2192 {0, 0, 0}, /* 1 */ 2246 {0, 0, 0}, /* 1 */
2193 {0, 0, 0}, /* 2 */ 2247 {0, 0, 0}, /* 2 */
2194 {0, 0, 0}, /* 3 */ 2248 {0, 0, 0}, /* 3 */
2195 {0, 0, 0}, /* 4 */ 2249 {0, 0, 0}, /* 4 */
… …
2333 return tmp; 2387 return tmp;
2334 2388
2335 return 0; 2389 return 0;
2336} 2390}
2337 2391
2338const shstr & 2392shstr_tmp
2339object::kv_get (const shstr &key) const 2393object::kv_get (shstr_tmp key) const
2340{ 2394{
2341 for (key_value *kv = key_values; kv; kv = kv->next) 2395 for (key_value *kv = key_values; kv; kv = kv->next)
2342 if (kv->key == key) 2396 if (kv->key == key)
2343 return kv->value; 2397 return kv->value;
2344 2398
2345 return shstr_null; 2399 return shstr ();
2346} 2400}
2347 2401
2348void 2402void
2349object::kv_set (const shstr &key, const shstr &value) 2403object::kv_set (shstr_tmp key, shstr_tmp value)
2350{ 2404{
2351 for (key_value *kv = key_values; kv; kv = kv->next) 2405 for (key_value *kv = key_values; kv; kv = kv->next)
2352 if (kv->key == key) 2406 if (kv->key == key)
2353 { 2407 {
2354 kv->value = value; 2408 kv->value = value;
… …
2363 2417
2364 key_values = kv; 2418 key_values = kv;
2365} 2419}
2366 2420
2367void 2421void
2368object::kv_del (const shstr &key) 2422object::kv_del (shstr_tmp key)
2369{ 2423{
2370 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2424 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2371 if ((*kvp)->key == key) 2425 if ((*kvp)->key == key)
2372 { 2426 {
2373 key_value *kv = *kvp; 2427 key_value *kv = *kvp;
… …
2466{ 2520{
2467 return map ? map->region (x, y) 2521 return map ? map->region (x, y)
2468 : region::default_region (); 2522 : region::default_region ();
2469} 2523}
2470 2524
2471const materialtype_t *
2472object::dominant_material () const
2473{
2474 if (materialtype_t *mt = name_to_material (materialname))
2475 return mt;
2476
2477 return name_to_material (shstr_unknown);
2478}
2479
2480void 2525void
2481object::open_container (object *new_container) 2526object::open_container (object *new_container)
2482{ 2527{
2483 if (container == new_container) 2528 if (container == new_container)
2484 return; 2529 return;
… …
2504 container = 0; 2549 container = 0;
2505 2550
2506 // client needs item update to make it work, client bug requires this to be separate 2551 // client needs item update to make it work, client bug requires this to be separate
2507 esrv_update_item (UPD_FLAGS, this, old_container); 2552 esrv_update_item (UPD_FLAGS, this, old_container);
2508 2553
2509 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2554 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2510 play_sound (sound_find ("chest_close")); 2555 play_sound (sound_find ("chest_close"));
2511 } 2556 }
2512 2557
2513 if (new_container) 2558 if (new_container)
2514 { 2559 {
… …
2518 // TODO: this does not seem to serve any purpose anymore? 2563 // TODO: this does not seem to serve any purpose anymore?
2519#if 0 2564#if 0
2520 // insert the "Close Container" object. 2565 // insert the "Close Container" object.
2521 if (archetype *closer = new_container->other_arch) 2566 if (archetype *closer = new_container->other_arch)
2522 { 2567 {
2523 object *closer = arch_to_object (new_container->other_arch); 2568 object *closer = new_container->other_arch->instance ();
2524 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2569 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2525 new_container->insert (closer); 2570 new_container->insert (closer);
2526 } 2571 }
2527#endif 2572#endif
2528 2573
2529 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2574 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2530 2575
2531 // make sure the container is available, client bug requires this to be separate 2576 // make sure the container is available, client bug requires this to be separate
2532 esrv_send_item (this, new_container); 2577 esrv_send_item (this, new_container);
2533 2578
2534 new_container->flag [FLAG_APPLIED] = true; 2579 new_container->flag [FLAG_APPLIED] = true;
… …
2542// else if (!old_container->env && contr && contr->ns) 2587// else if (!old_container->env && contr && contr->ns)
2543// contr->ns->floorbox_reset (); 2588// contr->ns->floorbox_reset ();
2544} 2589}
2545 2590
2546object * 2591object *
2547object::force_find (const shstr name) 2592object::force_find (shstr_tmp name)
2548{ 2593{
2549 /* cycle through his inventory to look for the MARK we want to 2594 /* cycle through his inventory to look for the MARK we want to
2550 * place 2595 * place
2551 */ 2596 */
2552 for (object *tmp = inv; tmp; tmp = tmp->below) 2597 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2554 return splay (tmp); 2599 return splay (tmp);
2555 2600
2556 return 0; 2601 return 0;
2557} 2602}
2558 2603
2604//-GPL
2605
2606void
2607object::force_set_timer (int duration)
2608{
2609 this->duration = 1;
2610 this->speed_left = -1.f;
2611
2612 this->set_speed (duration ? 1.f / duration : 0.f);
2613}
2614
2559object * 2615object *
2560object::force_add (const shstr name, int duration) 2616object::force_add (shstr_tmp name, int duration)
2561{ 2617{
2562 if (object *force = force_find (name)) 2618 if (object *force = force_find (name))
2563 force->destroy (); 2619 force->destroy ();
2564 2620
2565 object *force = get_archetype (FORCE_NAME); 2621 object *force = get_archetype (FORCE_NAME);
2566 2622
2567 force->slaying = name; 2623 force->slaying = name;
2568 force->stats.food = 1; 2624 force->force_set_timer (duration);
2569 force->speed_left = -1.f;
2570
2571 force->set_speed (duration ? 1.f / duration : 0.f);
2572 force->flag [FLAG_IS_USED_UP] = true;
2573 force->flag [FLAG_APPLIED] = true; 2625 force->flag [FLAG_APPLIED] = true;
2574 2626
2575 return insert (force); 2627 return insert (force);
2576} 2628}
2577 2629
2578void 2630void
2579object::play_sound (faceidx sound) 2631object::play_sound (faceidx sound) const
2580{ 2632{
2581 if (!sound) 2633 if (!sound)
2582 return; 2634 return;
2583 2635
2584 if (flag [FLAG_REMOVED]) 2636 if (is_on_map ())
2585 return;
2586
2587 if (env)
2588 {
2589 if (object *pl = in_player ())
2590 pl->contr->play_sound (sound);
2591 }
2592 else
2593 map->play_sound (sound, x, y); 2637 map->play_sound (sound, x, y);
2638 else if (object *pl = in_player ())
2639 pl->contr->play_sound (sound);
2640}
2641
2642void
2643object::say_msg (const char *msg) const
2644{
2645 if (is_on_map ())
2646 map->say_msg (msg, x, y);
2647 else if (object *pl = in_player ())
2648 pl->contr->play_sound (sound);
2594} 2649}
2595 2650
2596void 2651void
2597object::make_noise () 2652object::make_noise ()
2598{ 2653{

Diff Legend

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