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.258 by root, Mon Sep 29 09:04:50 2008 UTC vs.
Revision 1.308 by root, Sun Nov 29 17:26:28 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>
… …
32#include <bitset> 33#include <bitset>
33 34
34UUID UUID::cur; 35UUID UUID::cur;
35static uint64_t seq_next_save; 36static uint64_t seq_next_save;
36static const uint64 UUID_GAP = 1<<19; 37static const uint64 UUID_GAP = 1<<19;
38uint32_t mapspace::smellcount = 10000;
37 39
38objectvec objects; 40objectvec objects;
39activevec actives; 41activevec actives;
42
43//+GPL
40 44
41short freearr_x[SIZEOFFREE] = { 45short freearr_x[SIZEOFFREE] = {
42 0, 46 0,
43 0, 1, 1, 1, 0, -1, -1, -1, 47 0, 1, 1, 1, 0, -1, -1, -1,
44 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,
… …
48 0, 52 0,
49 -1, -1, 0, 1, 1, 1, 0, -1, 53 -1, -1, 0, 1, 1, 1, 0, -1,
50 -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,
51 -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
52}; 56};
53int maxfree[SIZEOFFREE] = {
54 0,
55 9, 10, 13, 14, 17, 18, 21, 22,
56 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
57 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
58};
59int freedir[SIZEOFFREE] = { 57int freedir[SIZEOFFREE] = {
60 0, 58 0,
61 1, 2, 3, 4, 5, 6, 7, 8, 59 1, 2, 3, 4, 5, 6, 7, 8,
62 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,
63 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
64}; 62};
65 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
66static void 71static void
67write_uuid (uval64 skip, bool sync) 72write_uuid (uval64 skip, bool sync)
68{ 73{
69 CALL_BEGIN (2); 74 CALL_BEGIN (2);
70 CALL_ARG_SV (newSVval64 (skip)); 75 CALL_ARG_SV (newSVval64 (skip));
… …
72 CALL_CALL ("cf::write_uuid", G_DISCARD); 77 CALL_CALL ("cf::write_uuid", G_DISCARD);
73 CALL_END; 78 CALL_END;
74} 79}
75 80
76static void 81static void
77read_uuid (void) 82read_uuid ()
78{ 83{
79 char filename[MAX_BUF]; 84 char filename[MAX_BUF];
80 85
81 sprintf (filename, "%s/uuid", settings.localdir); 86 sprintf (filename, "%s/uuid", settings.localdir);
82 87
… …
96 101
97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 102 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98 _exit (1); 103 _exit (1);
99 } 104 }
100 105
101 UUID::BUF buf; 106 char buf [UUID::MAX_LEN];
102 buf[0] = 0; 107 buf[0] = 0;
103 fgets (buf, sizeof (buf), fp); 108 fgets (buf, sizeof (buf), fp);
104 109
105 if (!UUID::cur.parse (buf)) 110 if (!UUID::cur.parse (buf))
106 { 111 {
… …
133 138
134void 139void
135UUID::init () 140UUID::init ()
136{ 141{
137 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;
138} 208}
139 209
140/* 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. */
141static bool 211static bool
142compare_ob_value_lists_one (const object *wants, const object *has) 212compare_ob_value_lists_one (const object *wants, const object *has)
… …
181bool object::can_merge_slow (object *ob1, object *ob2) 251bool object::can_merge_slow (object *ob1, object *ob2)
182{ 252{
183 /* A couple quicksanity checks */ 253 /* A couple quicksanity checks */
184 if (ob1 == ob2 254 if (ob1 == ob2
185 || ob1->type != ob2->type 255 || ob1->type != ob2->type
186 || ob1->speed != ob2->speed 256 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
187 || ob1->value != ob2->value 257 || ob1->value != ob2->value
188 || ob1->name != ob2->name) 258 || ob1->name != ob2->name)
189 return 0; 259 return 0;
190 260
191 /* Do not merge objects if nrof would overflow, assume nrof 261 /* Do not merge objects if nrof would overflow, assume nrof
… …
216 || ob1->skill != ob2->skill 286 || ob1->skill != ob2->skill
217 || ob1->value != ob2->value 287 || ob1->value != ob2->value
218 || ob1->animation_id != ob2->animation_id 288 || ob1->animation_id != ob2->animation_id
219 || (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
220 || ob1->client_type != ob2->client_type 290 || ob1->client_type != ob2->client_type
221 || ob1->materialname != ob2->materialname 291 || ob1->material != ob2->material
222 || ob1->lore != ob2->lore 292 || ob1->lore != ob2->lore
223 || ob1->subtype != ob2->subtype 293 || ob1->subtype != ob2->subtype
224 || ob1->move_type != ob2->move_type 294 || ob1->move_type != ob2->move_type
225 || ob1->move_block != ob2->move_block 295 || ob1->move_block != ob2->move_block
226 || ob1->move_allow != ob2->move_allow 296 || ob1->move_allow != ob2->move_allow
227 || ob1->move_on != ob2->move_on 297 || ob1->move_on != ob2->move_on
228 || ob1->move_off != ob2->move_off 298 || ob1->move_off != ob2->move_off
229 || ob1->move_slow != ob2->move_slow 299 || ob1->move_slow != ob2->move_slow
230 || ob1->move_slow_penalty != ob2->move_slow_penalty 300 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
231 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) 301 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
232 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 302 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
233 return 0; 303 return 0;
234 304
235 if ((ob1->flag ^ ob2->flag) 305 if ((ob1->flag ^ ob2->flag)
… …
323 { 393 {
324 // see if we are in a container of sorts 394 // see if we are in a container of sorts
325 if (env) 395 if (env)
326 { 396 {
327 // the player inventory itself is always visible 397 // the player inventory itself is always visible
328 if (env->type == PLAYER) 398 if (env->is_player ())
329 return env; 399 return env;
330 400
331 // else a player could have our env open 401 // else a player could have our env open
332 object *envest = env->outer_env (); 402 object *envest = env->outer_env_or_self ();
333 403
334 // 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
335 // even if our inv is in a player. 405 // even if our inv is in a player.
336 if (envest->is_on_map ()) 406 if (envest->is_on_map ())
337 if (object *pl = envest->ms ().player ()) 407 if (object *pl = envest->ms ().player ())
338 if (pl->container == env) 408 if (pl->container_ () == env)
339 return pl; 409 return pl;
340 } 410 }
341 else 411 else
342 { 412 {
343 // maybe there is a player standing on the same mapspace 413 // maybe there is a player standing on the same mapspace
344 // this will catch the case where "this" is a player 414 // this will catch the case where "this" is a player
345 if (object *pl = ms ().player ()) 415 if (object *pl = ms ().player ())
346 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) 416 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
347 || this == pl->container) 417 || pl->container_ () == this)
348 return pl; 418 return pl;
349 } 419 }
350 } 420 }
351 421
352 return 0; 422 return 0;
… …
430 object_freezer freezer; 500 object_freezer freezer;
431 op->write (freezer); 501 op->write (freezer);
432 return freezer.as_string (); 502 return freezer.as_string ();
433} 503}
434 504
435/* 505char *
436 * get_nearest_part(multi-object, object 2) returns the part of the 506object::as_string ()
437 * multi-object 1 which is closest to the second object.
438 * If it's not a multi-object, it is returned.
439 */
440object *
441get_nearest_part (object *op, const object *pl)
442{ 507{
443 object *tmp, *closest; 508 return dump_object (this);
444 int last_dist, i;
445
446 if (!op->more)
447 return op;
448
449 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
450 tmp;
451 tmp = tmp->more)
452 if ((i = distance (tmp, pl)) < last_dist)
453 closest = tmp, last_dist = i;
454
455 return closest;
456} 509}
457 510
458/* 511/*
459 * 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.
460 * VERRRY slow. 513 * VERRRY slow.
… …
554 update_stats (); 607 update_stats ();
555 608
556 new_draw_info_format (NDI_UNIQUE, 0, this, 609 new_draw_info_format (NDI_UNIQUE, 0, this,
557 "You try to balance all your items at once, " 610 "You try to balance all your items at once, "
558 "but the %s is just too much for your body. " 611 "but the %s is just too much for your body. "
559 "[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);
560 return false; 614 return false;
561 } 615 }
562 616
563 //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);
564 } 618 }
… …
633 tail = new_link; 687 tail = new_link;
634 } 688 }
635 } 689 }
636 } 690 }
637 691
638 if (speed < 0)
639 dst->speed_left -= rndm ();
640
641 dst->activate (); 692 dst->activate ();
642} 693}
643 694
644void 695void
645object::instantiate () 696object::instantiate ()
646{ 697{
647 if (!uuid.seq) // HACK 698 if (!uuid.seq) // HACK
648 uuid = UUID::gen (); 699 uuid = UUID::gen ();
649 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
650 speed_left = -0.1f; 705 speed_left = -1.;
706
651 /* 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
652 * 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.
653 * 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
654 * values for the body_used info, so when items are created 710 * values for the body_used info, so when items are created
655 * for it, they can be properly equipped. 711 * for it, they can be properly equipped.
… …
663object * 719object *
664object::clone () 720object::clone ()
665{ 721{
666 object *neu = create (); 722 object *neu = create ();
667 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
668 neu->map = map; // not copied by copy_to 729 neu->map = map; // not copied by copy_to
669 return neu; 730 return neu;
670} 731}
671 732
672/* 733/*
… …
690 * 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.
691 */ 752 */
692void 753void
693object::set_speed (float speed) 754object::set_speed (float speed)
694{ 755{
695 if (flag [FLAG_FREED] && speed)
696 {
697 LOG (llevError, "Object %s is freed but has speed.\n", &name);
698 speed = 0;
699 }
700
701 this->speed = speed; 756 this->speed = speed;
702 757
703 if (has_active_speed ()) 758 if (has_active_speed ())
704 activate (); 759 activate ();
705 else 760 else
… …
755 810
756 if (!(m.flags_ & P_UPTODATE)) 811 if (!(m.flags_ & P_UPTODATE))
757 /* nop */; 812 /* nop */;
758 else if (action == UP_OBJ_INSERT) 813 else if (action == UP_OBJ_INSERT)
759 { 814 {
815#if 0
760 // this is likely overkill, TODO: revisit (schmorp) 816 // this is likely overkill, TODO: revisit (schmorp)
761 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 817 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
762 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 818 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
763 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 819 || (op->is_player () && !(m.flags_ & P_PLAYER))
764 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 820 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
765 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 821 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
766 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 822 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
767 || (m.move_on | op->move_on ) != m.move_on 823 || (m.move_on | op->move_on ) != m.move_on
768 || (m.move_off | op->move_off ) != m.move_off 824 || (m.move_off | op->move_off ) != m.move_off
769 || (m.move_slow | op->move_slow) != m.move_slow 825 || (m.move_slow | op->move_slow) != m.move_slow
770 /* 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
771 * have move_allow right now. 827 * have move_allow right now.
772 */ 828 */
773 || ((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
830 m.invalidate ();
831#else
774 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 832 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
775 m.flags_ = 0; 833 m.invalidate ();
834#endif
776 } 835 }
777 /* if the object is being removed, we can't make intelligent 836 /* if the object is being removed, we can't make intelligent
778 * decisions, because remove_ob can't really pass the object 837 * decisions, because remove_ob can't really pass the object
779 * that is being removed. 838 * that is being removed.
780 */ 839 */
781 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 840 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
782 m.flags_ = 0; 841 m.invalidate ();
783 else if (action == UP_OBJ_FACE) 842 else if (action == UP_OBJ_FACE)
784 /* Nothing to do for that case */ ; 843 /* Nothing to do for that case */ ;
785 else 844 else
786 LOG (llevError, "update_object called with invalid action: %d\n", action); 845 LOG (llevError, "update_object called with invalid action: %d\n", action);
787 846
… …
791 850
792object::object () 851object::object ()
793{ 852{
794 SET_FLAG (this, FLAG_REMOVED); 853 SET_FLAG (this, FLAG_REMOVED);
795 854
796 expmul = 1.0; 855 //expmul = 1.0; declared const for the time being
797 face = blank_face; 856 face = blank_face;
857 material = MATERIAL_NULL;
798} 858}
799 859
800object::~object () 860object::~object ()
801{ 861{
802 unlink (); 862 unlink ();
… …
830{ 890{
831 /* If already on active list, don't do anything */ 891 /* If already on active list, don't do anything */
832 if (active) 892 if (active)
833 return; 893 return;
834 894
835 if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
836 if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
837
838 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
839 actives.insert (this); 900 actives.insert (this);
901 }
840} 902}
841 903
842void 904void
843object::activate_recursive () 905object::activate_recursive ()
844{ 906{
… …
909 || map->in_memory != MAP_ACTIVE 971 || map->in_memory != MAP_ACTIVE
910 || map->no_drop 972 || map->no_drop
911 || ms ().move_block == MOVE_ALL) 973 || ms ().move_block == MOVE_ALL)
912 { 974 {
913 while (inv) 975 while (inv)
914 inv->destroy (true); 976 inv->destroy ();
915 } 977 }
916 else 978 else
917 { /* Put objects in inventory onto this space */ 979 { /* Put objects in inventory onto this space */
918 while (inv) 980 while (inv)
919 { 981 {
… …
923 || op->flag [FLAG_NO_DROP] 985 || op->flag [FLAG_NO_DROP]
924 || op->type == RUNE 986 || op->type == RUNE
925 || op->type == TRAP 987 || op->type == TRAP
926 || op->flag [FLAG_IS_A_TEMPLATE] 988 || op->flag [FLAG_IS_A_TEMPLATE]
927 || op->flag [FLAG_DESTROY_ON_DEATH]) 989 || op->flag [FLAG_DESTROY_ON_DEATH])
928 op->destroy (true); 990 op->destroy ();
929 else 991 else
930 map->insert (op, x, y); 992 map->insert (op, x, y);
931 } 993 }
932 } 994 }
933} 995}
… …
962 1024
963void 1025void
964object::do_destroy () 1026object::do_destroy ()
965{ 1027{
966 if (flag [FLAG_IS_LINKED]) 1028 if (flag [FLAG_IS_LINKED])
967 remove_button_link (this); 1029 remove_link ();
968 1030
969 if (flag [FLAG_FRIENDLY]) 1031 if (flag [FLAG_FRIENDLY])
970 remove_friendly_object (this); 1032 remove_friendly_object (this);
971 1033
972 remove (); 1034 remove ();
… …
983 x = 1; 1045 x = 1;
984 y = 1; 1046 y = 1;
985 1047
986 if (more) 1048 if (more)
987 { 1049 {
988 more->destroy (true); 1050 more->destroy ();
989 more = 0; 1051 more = 0;
990 } 1052 }
991 1053
992 head = 0; 1054 head = 0;
993 1055
… …
997 attacked_by = 0; 1059 attacked_by = 0;
998 current_weapon = 0; 1060 current_weapon = 0;
999} 1061}
1000 1062
1001void 1063void
1002object::destroy (bool destroy_inventory) 1064object::destroy ()
1003{ 1065{
1004 if (destroyed ()) 1066 if (destroyed ())
1005 return; 1067 return;
1006 1068
1007 if (!is_head () && !head->destroyed ()) 1069 if (!is_head () && !head->destroyed ())
1008 { 1070 {
1009 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1071 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1010 head->destroy (destroy_inventory); 1072 head->destroy ();
1011 return; 1073 return;
1012 } 1074 }
1013 1075
1014 destroy_inv (!destroy_inventory); 1076 destroy_inv (false);
1015 1077
1016 if (is_head ()) 1078 if (is_head ())
1017 if (sound_destroy) 1079 if (sound_destroy)
1018 play_sound (sound_destroy); 1080 play_sound (sound_destroy);
1019 else if (flag [FLAG_MONSTER]) 1081 else if (flag [FLAG_MONSTER])
… …
1030 * the previous environment. 1092 * the previous environment.
1031 */ 1093 */
1032void 1094void
1033object::do_remove () 1095object::do_remove ()
1034{ 1096{
1035 object *tmp, *last = 0;
1036 object *otmp;
1037
1038 if (flag [FLAG_REMOVED]) 1097 if (flag [FLAG_REMOVED])
1039 return; 1098 return;
1040 1099
1041 INVOKE_OBJECT (REMOVE, this); 1100 INVOKE_OBJECT (REMOVE, this);
1042 1101
… …
1055 if (object *pl = visible_to ()) 1114 if (object *pl = visible_to ())
1056 esrv_del_item (pl->contr, count); 1115 esrv_del_item (pl->contr, count);
1057 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1116 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1058 1117
1059 adjust_weight (env, -total_weight ()); 1118 adjust_weight (env, -total_weight ());
1119
1120 object *pl = in_player ();
1060 1121
1061 /* we set up values so that it could be inserted into 1122 /* we set up values so that it could be inserted into
1062 * the map, but we don't actually do that - it is up 1123 * the map, but we don't actually do that - it is up
1063 * to the caller to decide what we want to do. 1124 * to the caller to decide what we want to do.
1064 */ 1125 */
… …
1072 1133
1073 above = 0; 1134 above = 0;
1074 below = 0; 1135 below = 0;
1075 env = 0; 1136 env = 0;
1076 1137
1077 /* NO_FIX_PLAYER is set when a great many changes are being 1138 if (pl && pl->is_player ())
1078 * made to players inventory. If set, avoiding the call
1079 * to save cpu time.
1080 */ 1139 {
1081 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1140 pl->contr->queue_stats_update ();
1082 otmp->update_stats (); 1141
1142 if (glow_radius && pl->is_on_map ())
1143 update_all_los (pl->map, pl->x, pl->y);
1144 }
1083 } 1145 }
1084 else if (map) 1146 else if (map)
1085 { 1147 {
1086 map->dirty = true; 1148 map->dirty = true;
1087 mapspace &ms = this->ms (); 1149 mapspace &ms = this->ms ();
1088 1150
1089 if (object *pl = ms.player ()) 1151 if (object *pl = ms.player ())
1090 { 1152 {
1091 if (type == PLAYER) // this == pl(!) 1153 if (is_player ())
1092 { 1154 {
1155 if (!flag [FLAG_WIZPASS])
1156 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1157
1093 // leaving a spot always closes any open container on the ground 1158 // leaving a spot always closes any open container on the ground
1094 if (container && !container->env) 1159 if (container && !container->env)
1095 // this causes spurious floorbox updates, but it ensures 1160 // this causes spurious floorbox updates, but it ensures
1096 // that the CLOSE event is being sent. 1161 // that the CLOSE event is being sent.
1097 close_container (); 1162 close_container ();
1098 1163
1099 --map->players; 1164 --map->players;
1100 map->touch (); 1165 map->touch ();
1101 } 1166 }
1102 else if (pl->container == this) 1167 else if (pl->container_ () == this)
1103 { 1168 {
1104 // removing a container should close it 1169 // removing a container should close it
1105 close_container (); 1170 close_container ();
1106 } 1171 }
1107 1172
… …
1114 *(below ? &below->above : &ms.bot) = above; 1179 *(below ? &below->above : &ms.bot) = above;
1115 1180
1116 above = 0; 1181 above = 0;
1117 below = 0; 1182 below = 0;
1118 1183
1119 ms.flags_ = 0; 1184 ms.invalidate ();
1120 1185
1121 if (map->in_memory == MAP_SAVING) 1186 if (map->in_memory == MAP_SAVING)
1122 return; 1187 return;
1123 1188
1124 int check_walk_off = !flag [FLAG_NO_APPLY]; 1189 int check_walk_off = !flag [FLAG_NO_APPLY];
1125 1190
1126 if (object *pl = ms.player ()) 1191 if (object *pl = ms.player ())
1127 { 1192 {
1128 if (pl->container == this) 1193 if (pl->container_ () == this)
1129 /* If a container that the player is currently using somehow gets 1194 /* If a container that the player is currently using somehow gets
1130 * removed (most likely destroyed), update the player view 1195 * removed (most likely destroyed), update the player view
1131 * appropriately. 1196 * appropriately.
1132 */ 1197 */
1133 pl->close_container (); 1198 pl->close_container ();
… …
1137 //TODO: update floorbox to preserve ordering 1202 //TODO: update floorbox to preserve ordering
1138 if (pl->contr->ns) 1203 if (pl->contr->ns)
1139 pl->contr->ns->floorbox_update (); 1204 pl->contr->ns->floorbox_update ();
1140 } 1205 }
1141 1206
1207 if (check_walk_off)
1142 for (tmp = ms.bot; tmp; tmp = tmp->above) 1208 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1143 { 1209 {
1210 above = tmp->above;
1211
1144 /* 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
1145 * being removed. 1213 * being removed.
1146 */ 1214 */
1147 1215
1148 /* See if object moving off should effect something */ 1216 /* See if object moving off should effect something */
1149 if (check_walk_off
1150 && ((move_type & tmp->move_off) 1217 if ((move_type & tmp->move_off)
1151 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1218 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1152 {
1153 move_apply (tmp, this, 0); 1219 move_apply (tmp, this, 0);
1154
1155 if (destroyed ())
1156 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1157 } 1220 }
1158 1221
1159 last = tmp; 1222 if (affects_los ())
1160 }
1161
1162 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1163 update_all_los (map, x, y); 1223 update_all_los (map, x, y);
1164 } 1224 }
1165} 1225}
1166 1226
1167/* 1227/*
… …
1191 esrv_update_item (UPD_NROF, pl, top); 1251 esrv_update_item (UPD_NROF, pl, top);
1192 1252
1193 op->weight = 0; // cancel the addition above 1253 op->weight = 0; // cancel the addition above
1194 op->carrying = 0; // must be 0 already 1254 op->carrying = 0; // must be 0 already
1195 1255
1196 op->destroy (true); 1256 op->destroy ();
1197 1257
1198 return top; 1258 return top;
1199 } 1259 }
1200 1260
1201 return 0; 1261 return 0;
… …
1263 * just 'op' otherwise 1323 * just 'op' otherwise
1264 */ 1324 */
1265object * 1325object *
1266insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1326insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1267{ 1327{
1268 if (op->is_on_map ())
1269 {
1270 LOG (llevError, "insert_ob_in_map called for object already on map");
1271 abort ();
1272 }
1273
1274 if (op->env)
1275 {
1276 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1277 op->remove (); 1328 op->remove ();
1278 }
1279 1329
1280 if (m == &freed_map)//D TODO: remove soon 1330 if (m == &freed_map)//D TODO: remove soon
1281 {//D 1331 {//D
1282 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D 1332 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1283 }//D 1333 }//D
1284 1334
1285 /* Ideally, the caller figures this out. However, it complicates a lot 1335 /* Ideally, the caller figures this out. However, it complicates a lot
1286 * 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
1287 * need extra work 1337 * need extra work
1288 */ 1338 */
1339 maptile *newmap = m;
1289 if (!xy_normalise (m, op->x, op->y)) 1340 if (!xy_normalise (newmap, op->x, op->y))
1290 { 1341 {
1291 op->head_ ()->destroy (true);// remove head_ once all tail object destroyers found 1342 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1292 return 0; 1343 return 0;
1293 } 1344 }
1294 1345
1295 if (object *more = op->more) 1346 if (object *more = op->more)
1296 if (!insert_ob_in_map (more, m, originator, flag)) 1347 if (!insert_ob_in_map (more, m, originator, flag))
1297 return 0; 1348 return 0;
1298 1349
1299 CLEAR_FLAG (op, FLAG_REMOVED); 1350 op->flag [FLAG_REMOVED] = false;
1300 1351 op->env = 0;
1301 op->map = m; 1352 op->map = newmap;
1353
1302 mapspace &ms = op->ms (); 1354 mapspace &ms = op->ms ();
1303 1355
1304 /* this has to be done after we translate the coordinates. 1356 /* this has to be done after we translate the coordinates.
1305 */ 1357 */
1306 if (op->nrof && !(flag & INS_NO_MERGE)) 1358 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1309 { 1361 {
1310 // TODO: we actually want to update tmp, not op, 1362 // TODO: we actually want to update tmp, not op,
1311 // but some caller surely breaks when we return tmp 1363 // but some caller surely breaks when we return tmp
1312 // from here :/ 1364 // from here :/
1313 op->nrof += tmp->nrof; 1365 op->nrof += tmp->nrof;
1314 tmp->destroy (true); 1366 tmp->destroy ();
1315 } 1367 }
1316 1368
1317 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1369 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1318 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1370 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1319 1371
… …
1327 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");
1328 abort (); 1380 abort ();
1329 } 1381 }
1330 1382
1331 if (!originator->is_on_map ()) 1383 if (!originator->is_on_map ())
1384 {
1332 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",
1333 op->debug_desc (), originator->debug_desc ()); 1386 op->debug_desc (), originator->debug_desc ());
1387 abort ();
1388 }
1334 1389
1335 op->above = originator; 1390 op->above = originator;
1336 op->below = originator->below; 1391 op->below = originator->below;
1337 originator->below = op; 1392 originator->below = op;
1338 1393
… …
1424 op->below = top; 1479 op->below = top;
1425 *(op->above ? &op->above->below : &ms.top) = op; 1480 *(op->above ? &op->above->below : &ms.top) = op;
1426 } 1481 }
1427 } 1482 }
1428 1483
1429 if (op->type == PLAYER) 1484 if (op->is_player ())
1430 { 1485 {
1431 op->contr->do_los = 1; 1486 op->contr->do_los = 1;
1432 ++op->map->players; 1487 ++op->map->players;
1433 op->map->touch (); 1488 op->map->touch ();
1434 } 1489 }
… …
1449 * be far away from this change and not affected in any way - 1504 * be far away from this change and not affected in any way -
1450 * this should get redone to only look for players within range, 1505 * this should get redone to only look for players within range,
1451 * or just updating the P_UPTODATE for spaces within this area 1506 * or just updating the P_UPTODATE for spaces within this area
1452 * of effect may be sufficient. 1507 * of effect may be sufficient.
1453 */ 1508 */
1454 if (op->map->darkness && (op->glow_radius != 0)) 1509 if (op->affects_los ())
1510 {
1511 op->ms ().invalidate ();
1455 update_all_los (op->map, op->x, op->y); 1512 update_all_los (op->map, op->x, op->y);
1513 }
1456 1514
1457 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1515 /* updates flags (blocked, alive, no magic, etc) for this map space */
1458 update_object (op, UP_OBJ_INSERT); 1516 update_object (op, UP_OBJ_INSERT);
1459 1517
1460 INVOKE_OBJECT (INSERT, op); 1518 INVOKE_OBJECT (INSERT, op);
… …
1467 * blocked() and wall() work properly), and these flags are updated by 1525 * blocked() and wall() work properly), and these flags are updated by
1468 * update_object(). 1526 * update_object().
1469 */ 1527 */
1470 1528
1471 /* 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 */
1472 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1530 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1473 { 1531 {
1474 if (check_move_on (op, originator)) 1532 if (check_move_on (op, originator))
1475 return 0; 1533 return 0;
1476 1534
1477 /* 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
… …
1488/* this function inserts an object in the map, but if it 1546/* this function inserts an object in the map, but if it
1489 * 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.
1490 * 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.
1491 */ 1549 */
1492void 1550void
1493replace_insert_ob_in_map (const char *arch_string, object *op) 1551replace_insert_ob_in_map (shstr_tmp archname, object *op)
1494{ 1552{
1495 /* first search for itself and remove any old instances */ 1553 /* first search for itself and remove any old instances */
1496 1554
1497 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1555 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1498 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1556 if (tmp->arch->archname == archname) /* same archetype */
1499 tmp->destroy (true); 1557 tmp->destroy ();
1500 1558
1501 object *tmp = arch_to_object (archetype::find (arch_string)); 1559 object *tmp = archetype::find (archname)->instance ();
1502 1560
1503 tmp->x = op->x; 1561 tmp->x = op->x;
1504 tmp->y = op->y; 1562 tmp->y = op->y;
1505 1563
1506 insert_ob_in_map (tmp, op->map, op, 0); 1564 insert_ob_in_map (tmp, op->map, op, 0);
… …
1511{ 1569{
1512 if (where->env) 1570 if (where->env)
1513 return where->env->insert (this); 1571 return where->env->insert (this);
1514 else 1572 else
1515 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;
1516} 1596}
1517 1597
1518/* 1598/*
1519 * decrease(object, number) decreases a specified number from 1599 * decrease(object, number) decreases a specified number from
1520 * 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
… …
1627 if (object *pl = tmp->visible_to ()) 1707 if (object *pl = tmp->visible_to ())
1628 esrv_update_item (UPD_NROF, pl, tmp); 1708 esrv_update_item (UPD_NROF, pl, tmp);
1629 1709
1630 adjust_weight (this, op->total_weight ()); 1710 adjust_weight (this, op->total_weight ());
1631 1711
1632 op->destroy (true); 1712 op->destroy ();
1633 op = tmp; 1713 op = tmp;
1634 goto inserted; 1714 goto inserted;
1635 } 1715 }
1636 1716
1637 op->owner = 0; // it's his/hers now. period. 1717 op->owner = 0; // it's his/hers now. period.
… …
1655 1735
1656 adjust_weight (this, op->total_weight ()); 1736 adjust_weight (this, op->total_weight ());
1657 1737
1658inserted: 1738inserted:
1659 /* reset the light list and los of the players on the map */ 1739 /* reset the light list and los of the players on the map */
1660 if (op->glow_radius && map && map->darkness) 1740 if (op->glow_radius && is_on_map ())
1741 {
1742 update_stats ();
1661 update_all_los (map, x, y); 1743 update_all_los (map, x, y);
1662 1744 }
1745 else if (is_player ())
1663 // if this is a player's inventory, update stats 1746 // if this is a player's inventory, update stats
1664 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) 1747 contr->queue_stats_update ();
1665 update_stats ();
1666 1748
1667 INVOKE_OBJECT (INSERT, this); 1749 INVOKE_OBJECT (INSERT, this);
1668 1750
1669 return op; 1751 return op;
1670} 1752}
… …
1690 * on top. 1772 * on top.
1691 */ 1773 */
1692int 1774int
1693check_move_on (object *op, object *originator) 1775check_move_on (object *op, object *originator)
1694{ 1776{
1777 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1778 return 0;
1779
1695 object *tmp; 1780 object *tmp;
1696 maptile *m = op->map; 1781 maptile *m = op->map;
1697 int x = op->x, y = op->y; 1782 int x = op->x, y = op->y;
1698 1783
1699 MoveType move_on, move_slow, move_block; 1784 mapspace &ms = m->at (x, y);
1700 1785
1701 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1786 ms.update ();
1702 return 0;
1703 1787
1704 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1788 MoveType move_on = ms.move_on;
1705 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1789 MoveType move_slow = ms.move_slow;
1706 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1790 MoveType move_block = ms.move_block;
1707 1791
1708 /* 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,
1709 * 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
1710 * 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
1711 * as walking. 1795 * as walking.
… …
1722 return 0; 1806 return 0;
1723 1807
1724 /* The objects have to be checked from top to bottom. 1808 /* The objects have to be checked from top to bottom.
1725 * Hence, we first go to the top: 1809 * Hence, we first go to the top:
1726 */ 1810 */
1727 1811 for (object *next, *tmp = ms.top; tmp; tmp = next)
1728 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1729 {
1730 /* Trim the search when we find the first other spell effect
1731 * this helps performance so that if a space has 50 spell objects,
1732 * we don't need to check all of them.
1733 */
1734 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1735 break;
1736 } 1812 {
1813 next = tmp->below;
1737 1814
1738 for (; tmp; tmp = tmp->below)
1739 {
1740 if (tmp == op) 1815 if (tmp == op)
1741 continue; /* Can't apply yourself */ 1816 continue; /* Can't apply yourself */
1742 1817
1743 /* 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.
1744 * Second check makes sure that the movement types not being slowed 1819 * Second check makes sure that the movement types not being slowed
… …
1749 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1824 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1750 { 1825 {
1751 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1826 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1752 ((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))
1753 { 1828 {
1754
1755 float
1756 diff = tmp->move_slow_penalty * fabs (op->speed); 1829 float diff = tmp->move_slow_penalty * fabs (op->speed);
1757 1830
1758 if (op->type == PLAYER) 1831 if (op->is_player ())
1759 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)) ||
1760 (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)))
1761 diff /= 4.0; 1834 diff /= 4.0;
1762 1835
1763 op->speed_left -= diff; 1836 op->speed_left -= diff;
1764 } 1837 }
1765 } 1838 }
… …
1971 * head of the object should correspond for the entire object. 2044 * head of the object should correspond for the entire object.
1972 */ 2045 */
1973 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 2046 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1974 continue; 2047 continue;
1975 2048
1976 if (ob->blocked (m, pos.x, pos.y)) 2049 if (ob->blocked (pos.m, pos.x, pos.y))
1977 continue; 2050 continue;
1978 2051
1979 altern [index++] = i; 2052 altern [index++] = i;
1980 } 2053 }
1981 2054
… …
2049 * there is capable of. 2122 * there is capable of.
2050 */ 2123 */
2051int 2124int
2052find_dir (maptile *m, int x, int y, object *exclude) 2125find_dir (maptile *m, int x, int y, object *exclude)
2053{ 2126{
2054 int i, max = SIZEOFFREE, mflags; 2127 int max = SIZEOFFREE, mflags;
2055
2056 sint16 nx, ny;
2057 object *tmp;
2058 maptile *mp;
2059
2060 MoveType blocked, move_type; 2128 MoveType move_type;
2061 2129
2062 if (exclude && exclude->head_ () != exclude) 2130 if (exclude && exclude->head_ () != exclude)
2063 { 2131 {
2064 exclude = exclude->head; 2132 exclude = exclude->head;
2065 move_type = exclude->move_type; 2133 move_type = exclude->move_type;
… …
2068 { 2136 {
2069 /* 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. */
2070 move_type = MOVE_ALL; 2138 move_type = MOVE_ALL;
2071 } 2139 }
2072 2140
2073 for (i = 1; i < max; i++) 2141 for (int i = 1; i < max; i++)
2074 { 2142 {
2075 mp = m; 2143 mapxy pos (m, x, y);
2076 nx = x + freearr_x[i]; 2144 pos.move (i);
2077 ny = y + freearr_y[i];
2078 2145
2079 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2146 if (!pos.normalise ())
2080
2081 if (mflags & P_OUT_OF_MAP)
2082 max = maxfree[i]; 2147 max = maxfree[i];
2083 else 2148 else
2084 { 2149 {
2085 mapspace &ms = mp->at (nx, ny); 2150 mapspace &ms = *pos;
2086 2151
2087 blocked = ms.move_block;
2088
2089 if ((move_type & blocked) == move_type) 2152 if ((move_type & ms.move_block) == move_type)
2090 max = maxfree[i]; 2153 max = maxfree [i];
2091 else if (mflags & P_IS_ALIVE) 2154 else if (ms.flags () & P_IS_ALIVE)
2092 { 2155 {
2093 for (tmp = ms.bot; tmp; tmp = tmp->above) 2156 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2094 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2157 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2095 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2158 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2096 break;
2097
2098 if (tmp)
2099 return freedir[i]; 2159 return freedir [i];
2100 } 2160 }
2101 } 2161 }
2102 } 2162 }
2103 2163
2104 return 0; 2164 return 0;
… …
2179 * 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
2180 * 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.
2181 * 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
2182 * functions. 2242 * functions.
2183 */ 2243 */
2184int reduction_dir[SIZEOFFREE][3] = { 2244static const int reduction_dir[SIZEOFFREE][3] = {
2185 {0, 0, 0}, /* 0 */ 2245 {0, 0, 0}, /* 0 */
2186 {0, 0, 0}, /* 1 */ 2246 {0, 0, 0}, /* 1 */
2187 {0, 0, 0}, /* 2 */ 2247 {0, 0, 0}, /* 2 */
2188 {0, 0, 0}, /* 3 */ 2248 {0, 0, 0}, /* 3 */
2189 {0, 0, 0}, /* 4 */ 2249 {0, 0, 0}, /* 4 */
… …
2285int 2345int
2286can_pick (const object *who, const object *item) 2346can_pick (const object *who, const object *item)
2287{ 2347{
2288 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2348 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2289 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2349 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2290 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2350 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2291} 2351}
2292 2352
2293/* 2353/*
2294 * create clone from object to another 2354 * create clone from object to another
2295 */ 2355 */
… …
2327 return tmp; 2387 return tmp;
2328 2388
2329 return 0; 2389 return 0;
2330} 2390}
2331 2391
2332const shstr & 2392shstr_tmp
2333object::kv_get (const shstr &key) const 2393object::kv_get (shstr_tmp key) const
2334{ 2394{
2335 for (key_value *kv = key_values; kv; kv = kv->next) 2395 for (key_value *kv = key_values; kv; kv = kv->next)
2336 if (kv->key == key) 2396 if (kv->key == key)
2337 return kv->value; 2397 return kv->value;
2338 2398
2339 return shstr_null; 2399 return shstr ();
2340} 2400}
2341 2401
2342void 2402void
2343object::kv_set (const shstr &key, const shstr &value) 2403object::kv_set (shstr_tmp key, shstr_tmp value)
2344{ 2404{
2345 for (key_value *kv = key_values; kv; kv = kv->next) 2405 for (key_value *kv = key_values; kv; kv = kv->next)
2346 if (kv->key == key) 2406 if (kv->key == key)
2347 { 2407 {
2348 kv->value = value; 2408 kv->value = value;
… …
2357 2417
2358 key_values = kv; 2418 key_values = kv;
2359} 2419}
2360 2420
2361void 2421void
2362object::kv_del (const shstr &key) 2422object::kv_del (shstr_tmp key)
2363{ 2423{
2364 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2424 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2365 if ((*kvp)->key == key) 2425 if ((*kvp)->key == key)
2366 { 2426 {
2367 key_value *kv = *kvp; 2427 key_value *kv = *kvp;
… …
2460{ 2520{
2461 return map ? map->region (x, y) 2521 return map ? map->region (x, y)
2462 : region::default_region (); 2522 : region::default_region ();
2463} 2523}
2464 2524
2465const materialtype_t *
2466object::dominant_material () const
2467{
2468 if (materialtype_t *mt = name_to_material (materialname))
2469 return mt;
2470
2471 return name_to_material (shstr_unknown);
2472}
2473
2474void 2525void
2475object::open_container (object *new_container) 2526object::open_container (object *new_container)
2476{ 2527{
2477 if (container == new_container) 2528 if (container == new_container)
2478 return; 2529 return;
… …
2486 2537
2487#if 0 2538#if 0
2488 // remove the "Close old_container" object. 2539 // remove the "Close old_container" object.
2489 if (object *closer = old_container->inv) 2540 if (object *closer = old_container->inv)
2490 if (closer->type == CLOSE_CON) 2541 if (closer->type == CLOSE_CON)
2491 closer->destroy (true); 2542 closer->destroy ();
2492#endif 2543#endif
2493 2544
2494 // make sure the container is available 2545 // make sure the container is available
2495 esrv_send_item (this, old_container); 2546 esrv_send_item (this, old_container);
2496 2547
… …
2498 container = 0; 2549 container = 0;
2499 2550
2500 // 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
2501 esrv_update_item (UPD_FLAGS, this, old_container); 2552 esrv_update_item (UPD_FLAGS, this, old_container);
2502 2553
2503 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 ());
2504 play_sound (sound_find ("chest_close")); 2555 play_sound (sound_find ("chest_close"));
2505 } 2556 }
2506 2557
2507 if (new_container) 2558 if (new_container)
2508 { 2559 {
… …
2518 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2569 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2519 new_container->insert (closer); 2570 new_container->insert (closer);
2520 } 2571 }
2521#endif 2572#endif
2522 2573
2523 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 ());
2524 2575
2525 // 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
2526 esrv_send_item (this, new_container); 2577 esrv_send_item (this, new_container);
2527 2578
2528 new_container->flag [FLAG_APPLIED] = true; 2579 new_container->flag [FLAG_APPLIED] = true;
… …
2536// else if (!old_container->env && contr && contr->ns) 2587// else if (!old_container->env && contr && contr->ns)
2537// contr->ns->floorbox_reset (); 2588// contr->ns->floorbox_reset ();
2538} 2589}
2539 2590
2540object * 2591object *
2541object::force_find (const shstr name) 2592object::force_find (shstr_tmp name)
2542{ 2593{
2543 /* 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
2544 * place 2595 * place
2545 */ 2596 */
2546 for (object *tmp = inv; tmp; tmp = tmp->below) 2597 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2548 return splay (tmp); 2599 return splay (tmp);
2549 2600
2550 return 0; 2601 return 0;
2551} 2602}
2552 2603
2604//-GPL
2605
2553void 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
2615object *
2554object::force_add (const shstr name, int duration) 2616object::force_add (shstr_tmp name, int duration)
2555{ 2617{
2556 if (object *force = force_find (name)) 2618 if (object *force = force_find (name))
2557 force->destroy (true); 2619 force->destroy ();
2558 2620
2559 object *force = get_archetype (FORCE_NAME); 2621 object *force = get_archetype (FORCE_NAME);
2560 2622
2561 force->slaying = name; 2623 force->slaying = name;
2562 force->stats.food = 1; 2624 force->force_set_timer (duration);
2563 force->speed_left = -1.f;
2564
2565 force->set_speed (duration ? 1.f / duration : 0.f);
2566 force->flag [FLAG_IS_USED_UP] = true;
2567 force->flag [FLAG_APPLIED] = true; 2625 force->flag [FLAG_APPLIED] = true;
2568 2626
2569 insert (force); 2627 return insert (force);
2570} 2628}
2571 2629
2572void 2630void
2573object::play_sound (faceidx sound) 2631object::play_sound (faceidx sound) const
2574{ 2632{
2575 if (!sound) 2633 if (!sound)
2576 return; 2634 return;
2577 2635
2578 if (flag [FLAG_REMOVED]) 2636 if (is_on_map ())
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);
2649}
2650
2651void
2652object::make_noise ()
2653{
2654 // we do not model noise in the map, so instead put
2655 // a temporary light into the noise source
2656 // could use the map instead, but that's less reliable for our
2657 // goal, which is to make invisibility a bit harder to exploit
2658
2659 // currently only works sensibly for players
2660 if (!is_player ())
2579 return; 2661 return;
2580 2662
2581 if (env) 2663 // find old force, or create new one
2582 { 2664 object *force = force_find (shstr_noise_force);
2583 if (object *pl = in_player ()) 2665
2584 pl->contr->play_sound (sound); 2666 if (force)
2585 } 2667 force->speed_left = -1.f; // patch old speed up
2586 else 2668 else
2587 map->play_sound (sound, x, y); 2669 {
2588} 2670 force = archetype::get (shstr_noise_force);
2589 2671
2672 force->slaying = shstr_noise_force;
2673 force->stats.food = 1;
2674 force->speed_left = -1.f;
2675
2676 force->set_speed (1.f / 4.f);
2677 force->flag [FLAG_IS_USED_UP] = true;
2678 force->flag [FLAG_APPLIED] = true;
2679
2680 insert (force);
2681 }
2682}
2683

Diff Legend

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