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.254 by root, Sun Aug 31 01:17:11 2008 UTC vs.
Revision 1.304 by root, Tue Nov 10 16:29:20 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
62};
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
64}; 69};
65 70
66static void 71static void
67write_uuid (uval64 skip, bool sync) 72write_uuid (uval64 skip, bool sync)
68{ 73{
… …
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)
236 .reset (FLAG_INV_LOCKED) 306 .reset (FLAG_INV_LOCKED)
237 .reset (FLAG_CLIENT_SENT)
238 .reset (FLAG_REMOVED) 307 .reset (FLAG_REMOVED)
239 .any ()) 308 .any ())
240 return 0; 309 return 0;
241 310
242 /* This is really a spellbook check - we should in general 311 /* This is really a spellbook check - we should in general
… …
324 { 393 {
325 // see if we are in a container of sorts 394 // see if we are in a container of sorts
326 if (env) 395 if (env)
327 { 396 {
328 // the player inventory itself is always visible 397 // the player inventory itself is always visible
329 if (env->type == 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 }
… …
637 } 690 }
638 691
639 if (speed < 0) 692 if (speed < 0)
640 dst->speed_left -= rndm (); 693 dst->speed_left -= rndm ();
641 694
642 dst->set_speed (dst->speed); 695 dst->activate ();
643} 696}
644 697
645void 698void
646object::instantiate () 699object::instantiate ()
647{ 700{
… …
691 * This function needs to be called whenever the speed of an object changes. 744 * This function needs to be called whenever the speed of an object changes.
692 */ 745 */
693void 746void
694object::set_speed (float speed) 747object::set_speed (float speed)
695{ 748{
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; 749 this->speed = speed;
703 750
704 if (has_active_speed ()) 751 if (has_active_speed ())
705 activate (); 752 activate ();
706 else 753 else
… …
756 803
757 if (!(m.flags_ & P_UPTODATE)) 804 if (!(m.flags_ & P_UPTODATE))
758 /* nop */; 805 /* nop */;
759 else if (action == UP_OBJ_INSERT) 806 else if (action == UP_OBJ_INSERT)
760 { 807 {
808#if 0
761 // this is likely overkill, TODO: revisit (schmorp) 809 // this is likely overkill, TODO: revisit (schmorp)
762 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 810 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
763 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 811 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
764 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 812 || (op->is_player () && !(m.flags_ & P_PLAYER))
765 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 813 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
766 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 814 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
767 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 815 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
768 || (m.move_on | op->move_on ) != m.move_on 816 || (m.move_on | op->move_on ) != m.move_on
769 || (m.move_off | op->move_off ) != m.move_off 817 || (m.move_off | op->move_off ) != m.move_off
770 || (m.move_slow | op->move_slow) != m.move_slow 818 || (m.move_slow | op->move_slow) != m.move_slow
771 /* This isn't perfect, but I don't expect a lot of objects to 819 /* This isn't perfect, but I don't expect a lot of objects to
772 * have move_allow right now. 820 * have move_allow right now.
773 */ 821 */
774 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 822 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
823 m.invalidate ();
824#else
775 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 825 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
776 m.flags_ = 0; 826 m.invalidate ();
827#endif
777 } 828 }
778 /* if the object is being removed, we can't make intelligent 829 /* if the object is being removed, we can't make intelligent
779 * decisions, because remove_ob can't really pass the object 830 * decisions, because remove_ob can't really pass the object
780 * that is being removed. 831 * that is being removed.
781 */ 832 */
782 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 833 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
783 m.flags_ = 0; 834 m.invalidate ();
784 else if (action == UP_OBJ_FACE) 835 else if (action == UP_OBJ_FACE)
785 /* Nothing to do for that case */ ; 836 /* Nothing to do for that case */ ;
786 else 837 else
787 LOG (llevError, "update_object called with invalid action: %d\n", action); 838 LOG (llevError, "update_object called with invalid action: %d\n", action);
788 839
… …
792 843
793object::object () 844object::object ()
794{ 845{
795 SET_FLAG (this, FLAG_REMOVED); 846 SET_FLAG (this, FLAG_REMOVED);
796 847
797 expmul = 1.0; 848 //expmul = 1.0; declared const for the time being
798 face = blank_face; 849 face = blank_face;
850 material = MATERIAL_NULL;
799} 851}
800 852
801object::~object () 853object::~object ()
802{ 854{
803 unlink (); 855 unlink ();
… …
832 /* If already on active list, don't do anything */ 884 /* If already on active list, don't do anything */
833 if (active) 885 if (active)
834 return; 886 return;
835 887
836 if (has_active_speed ()) 888 if (has_active_speed ())
889 {
890 if (flag [FLAG_FREED])
891 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
892
837 actives.insert (this); 893 actives.insert (this);
894 }
838} 895}
839 896
840void 897void
841object::activate_recursive () 898object::activate_recursive ()
842{ 899{
… …
907 || map->in_memory != MAP_ACTIVE 964 || map->in_memory != MAP_ACTIVE
908 || map->no_drop 965 || map->no_drop
909 || ms ().move_block == MOVE_ALL) 966 || ms ().move_block == MOVE_ALL)
910 { 967 {
911 while (inv) 968 while (inv)
912 inv->destroy (true); 969 inv->destroy ();
913 } 970 }
914 else 971 else
915 { /* Put objects in inventory onto this space */ 972 { /* Put objects in inventory onto this space */
916 while (inv) 973 while (inv)
917 { 974 {
… …
921 || op->flag [FLAG_NO_DROP] 978 || op->flag [FLAG_NO_DROP]
922 || op->type == RUNE 979 || op->type == RUNE
923 || op->type == TRAP 980 || op->type == TRAP
924 || op->flag [FLAG_IS_A_TEMPLATE] 981 || op->flag [FLAG_IS_A_TEMPLATE]
925 || op->flag [FLAG_DESTROY_ON_DEATH]) 982 || op->flag [FLAG_DESTROY_ON_DEATH])
926 op->destroy (true); 983 op->destroy ();
927 else 984 else
928 map->insert (op, x, y); 985 map->insert (op, x, y);
929 } 986 }
930 } 987 }
931} 988}
… …
960 1017
961void 1018void
962object::do_destroy () 1019object::do_destroy ()
963{ 1020{
964 if (flag [FLAG_IS_LINKED]) 1021 if (flag [FLAG_IS_LINKED])
965 remove_button_link (this); 1022 remove_link ();
966 1023
967 if (flag [FLAG_FRIENDLY]) 1024 if (flag [FLAG_FRIENDLY])
968 remove_friendly_object (this); 1025 remove_friendly_object (this);
969 1026
970 remove (); 1027 remove ();
… …
995 attacked_by = 0; 1052 attacked_by = 0;
996 current_weapon = 0; 1053 current_weapon = 0;
997} 1054}
998 1055
999void 1056void
1000object::destroy (bool destroy_inventory) 1057object::destroy ()
1001{ 1058{
1002 if (destroyed ()) 1059 if (destroyed ())
1003 return; 1060 return;
1004 1061
1005 if (!is_head () && !head->destroyed ()) 1062 if (!is_head () && !head->destroyed ())
1006 { 1063 {
1007 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1064 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1008 head->destroy (destroy_inventory); 1065 head->destroy ();
1009 return; 1066 return;
1010 } 1067 }
1011 1068
1012 destroy_inv (!destroy_inventory); 1069 destroy_inv (false);
1013 1070
1014 if (is_head ()) 1071 if (is_head ())
1015 if (sound_destroy) 1072 if (sound_destroy)
1016 play_sound (sound_destroy); 1073 play_sound (sound_destroy);
1017 else if (flag [FLAG_MONSTER]) 1074 else if (flag [FLAG_MONSTER])
… …
1028 * the previous environment. 1085 * the previous environment.
1029 */ 1086 */
1030void 1087void
1031object::do_remove () 1088object::do_remove ()
1032{ 1089{
1033 object *tmp, *last = 0;
1034 object *otmp;
1035
1036 if (flag [FLAG_REMOVED]) 1090 if (flag [FLAG_REMOVED])
1037 return; 1091 return;
1038 1092
1039 INVOKE_OBJECT (REMOVE, this); 1093 INVOKE_OBJECT (REMOVE, this);
1040 1094
… …
1053 if (object *pl = visible_to ()) 1107 if (object *pl = visible_to ())
1054 esrv_del_item (pl->contr, count); 1108 esrv_del_item (pl->contr, count);
1055 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1109 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1056 1110
1057 adjust_weight (env, -total_weight ()); 1111 adjust_weight (env, -total_weight ());
1112
1113 object *pl = in_player ();
1058 1114
1059 /* we set up values so that it could be inserted into 1115 /* we set up values so that it could be inserted into
1060 * the map, but we don't actually do that - it is up 1116 * the map, but we don't actually do that - it is up
1061 * to the caller to decide what we want to do. 1117 * to the caller to decide what we want to do.
1062 */ 1118 */
… …
1074 1130
1075 /* NO_FIX_PLAYER is set when a great many changes are being 1131 /* NO_FIX_PLAYER is set when a great many changes are being
1076 * made to players inventory. If set, avoiding the call 1132 * made to players inventory. If set, avoiding the call
1077 * to save cpu time. 1133 * to save cpu time.
1078 */ 1134 */
1079 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1135 if (pl)
1136 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1137 {
1080 otmp->update_stats (); 1138 pl->update_stats ();
1139
1140 if (glow_radius && pl->is_on_map ())
1141 update_all_los (pl->map, pl->x, pl->y);
1142 }
1081 } 1143 }
1082 else if (map) 1144 else if (map)
1083 { 1145 {
1084 map->dirty = true; 1146 map->dirty = true;
1085 mapspace &ms = this->ms (); 1147 mapspace &ms = this->ms ();
1086 1148
1087 if (object *pl = ms.player ()) 1149 if (object *pl = ms.player ())
1088 { 1150 {
1089 if (type == PLAYER) // this == pl(!) 1151 if (is_player ())
1090 { 1152 {
1153 if (!flag [FLAG_WIZPASS])
1154 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1155
1091 // leaving a spot always closes any open container on the ground 1156 // leaving a spot always closes any open container on the ground
1092 if (container && !container->env) 1157 if (container && !container->env)
1093 // this causes spurious floorbox updates, but it ensures 1158 // this causes spurious floorbox updates, but it ensures
1094 // that the CLOSE event is being sent. 1159 // that the CLOSE event is being sent.
1095 close_container (); 1160 close_container ();
1096 1161
1097 --map->players; 1162 --map->players;
1098 map->touch (); 1163 map->touch ();
1099 } 1164 }
1100 else if (pl->container == this) 1165 else if (pl->container_ () == this)
1101 { 1166 {
1102 // removing a container should close it 1167 // removing a container should close it
1103 close_container (); 1168 close_container ();
1104 } 1169 }
1105 1170
… …
1112 *(below ? &below->above : &ms.bot) = above; 1177 *(below ? &below->above : &ms.bot) = above;
1113 1178
1114 above = 0; 1179 above = 0;
1115 below = 0; 1180 below = 0;
1116 1181
1117 ms.flags_ = 0; 1182 ms.invalidate ();
1118 1183
1119 if (map->in_memory == MAP_SAVING) 1184 if (map->in_memory == MAP_SAVING)
1120 return; 1185 return;
1121 1186
1122 int check_walk_off = !flag [FLAG_NO_APPLY]; 1187 int check_walk_off = !flag [FLAG_NO_APPLY];
1123 1188
1124 if (object *pl = ms.player ()) 1189 if (object *pl = ms.player ())
1125 { 1190 {
1126 if (pl->container == this) 1191 if (pl->container_ () == this)
1127 /* If a container that the player is currently using somehow gets 1192 /* If a container that the player is currently using somehow gets
1128 * removed (most likely destroyed), update the player view 1193 * removed (most likely destroyed), update the player view
1129 * appropriately. 1194 * appropriately.
1130 */ 1195 */
1131 pl->close_container (); 1196 pl->close_container ();
… …
1135 //TODO: update floorbox to preserve ordering 1200 //TODO: update floorbox to preserve ordering
1136 if (pl->contr->ns) 1201 if (pl->contr->ns)
1137 pl->contr->ns->floorbox_update (); 1202 pl->contr->ns->floorbox_update ();
1138 } 1203 }
1139 1204
1205 if (check_walk_off)
1140 for (tmp = ms.bot; tmp; tmp = tmp->above) 1206 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1141 { 1207 {
1208 above = tmp->above;
1209
1142 /* No point updating the players look faces if he is the object 1210 /* No point updating the players look faces if he is the object
1143 * being removed. 1211 * being removed.
1144 */ 1212 */
1145 1213
1146 /* See if object moving off should effect something */ 1214 /* See if object moving off should effect something */
1147 if (check_walk_off
1148 && ((move_type & tmp->move_off) 1215 if ((move_type & tmp->move_off)
1149 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1216 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1150 {
1151 move_apply (tmp, this, 0); 1217 move_apply (tmp, this, 0);
1152
1153 if (destroyed ())
1154 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1155 } 1218 }
1156 1219
1157 last = tmp; 1220 if (affects_los ())
1158 }
1159
1160 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1161 update_all_los (map, x, y); 1221 update_all_los (map, x, y);
1162 } 1222 }
1163} 1223}
1164 1224
1165/* 1225/*
… …
1189 esrv_update_item (UPD_NROF, pl, top); 1249 esrv_update_item (UPD_NROF, pl, top);
1190 1250
1191 op->weight = 0; // cancel the addition above 1251 op->weight = 0; // cancel the addition above
1192 op->carrying = 0; // must be 0 already 1252 op->carrying = 0; // must be 0 already
1193 1253
1194 op->destroy (1); 1254 op->destroy ();
1195 1255
1196 return top; 1256 return top;
1197 } 1257 }
1198 1258
1199 return 0; 1259 return 0;
… …
1261 * just 'op' otherwise 1321 * just 'op' otherwise
1262 */ 1322 */
1263object * 1323object *
1264insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1324insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1265{ 1325{
1266 if (op->is_on_map ())
1267 {
1268 LOG (llevError, "insert_ob_in_map called for object already on map");
1269 abort ();
1270 }
1271
1272 if (op->env)
1273 {
1274 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1275 op->remove (); 1326 op->remove ();
1276 }
1277 1327
1278 if (op->face && !face_info (op->face))//D TODO: remove soon 1328 if (m == &freed_map)//D TODO: remove soon
1279 {//D 1329 {//D
1280 LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D 1330 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1281 op->face = 1;//D
1282 }//D 1331 }//D
1283 1332
1284 /* Ideally, the caller figures this out. However, it complicates a lot 1333 /* Ideally, the caller figures this out. However, it complicates a lot
1285 * of areas of callers (eg, anything that uses find_free_spot would now 1334 * of areas of callers (eg, anything that uses find_free_spot would now
1286 * need extra work 1335 * need extra work
1287 */ 1336 */
1337 maptile *newmap = m;
1288 if (!xy_normalise (m, op->x, op->y)) 1338 if (!xy_normalise (newmap, op->x, op->y))
1289 { 1339 {
1290 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found 1340 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1291 return 0; 1341 return 0;
1292 } 1342 }
1293 1343
1294 if (object *more = op->more) 1344 if (object *more = op->more)
1295 if (!insert_ob_in_map (more, m, originator, flag)) 1345 if (!insert_ob_in_map (more, m, originator, flag))
1296 return 0; 1346 return 0;
1297 1347
1298 CLEAR_FLAG (op, FLAG_REMOVED); 1348 op->flag [FLAG_REMOVED] = false;
1299 1349 op->env = 0;
1300 op->map = m; 1350 op->map = newmap;
1351
1301 mapspace &ms = op->ms (); 1352 mapspace &ms = op->ms ();
1302 1353
1303 /* this has to be done after we translate the coordinates. 1354 /* this has to be done after we translate the coordinates.
1304 */ 1355 */
1305 if (op->nrof && !(flag & INS_NO_MERGE)) 1356 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1308 { 1359 {
1309 // TODO: we actually want to update tmp, not op, 1360 // TODO: we actually want to update tmp, not op,
1310 // but some caller surely breaks when we return tmp 1361 // but some caller surely breaks when we return tmp
1311 // from here :/ 1362 // from here :/
1312 op->nrof += tmp->nrof; 1363 op->nrof += tmp->nrof;
1313 tmp->destroy (1); 1364 tmp->destroy ();
1314 } 1365 }
1315 1366
1316 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1367 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1317 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1368 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1318 1369
… …
1326 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1377 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1327 abort (); 1378 abort ();
1328 } 1379 }
1329 1380
1330 if (!originator->is_on_map ()) 1381 if (!originator->is_on_map ())
1382 {
1331 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", 1383 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1332 op->debug_desc (), originator->debug_desc ()); 1384 op->debug_desc (), originator->debug_desc ());
1385 abort ();
1386 }
1333 1387
1334 op->above = originator; 1388 op->above = originator;
1335 op->below = originator->below; 1389 op->below = originator->below;
1336 originator->below = op; 1390 originator->below = op;
1337 1391
… …
1423 op->below = top; 1477 op->below = top;
1424 *(op->above ? &op->above->below : &ms.top) = op; 1478 *(op->above ? &op->above->below : &ms.top) = op;
1425 } 1479 }
1426 } 1480 }
1427 1481
1428 if (op->type == PLAYER) 1482 if (op->is_player ())
1429 { 1483 {
1430 op->contr->do_los = 1; 1484 op->contr->do_los = 1;
1431 ++op->map->players; 1485 ++op->map->players;
1432 op->map->touch (); 1486 op->map->touch ();
1433 } 1487 }
… …
1448 * be far away from this change and not affected in any way - 1502 * be far away from this change and not affected in any way -
1449 * this should get redone to only look for players within range, 1503 * this should get redone to only look for players within range,
1450 * or just updating the P_UPTODATE for spaces within this area 1504 * or just updating the P_UPTODATE for spaces within this area
1451 * of effect may be sufficient. 1505 * of effect may be sufficient.
1452 */ 1506 */
1453 if (op->map->darkness && (op->glow_radius != 0)) 1507 if (op->affects_los ())
1508 {
1509 op->ms ().invalidate ();
1454 update_all_los (op->map, op->x, op->y); 1510 update_all_los (op->map, op->x, op->y);
1511 }
1455 1512
1456 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1513 /* updates flags (blocked, alive, no magic, etc) for this map space */
1457 update_object (op, UP_OBJ_INSERT); 1514 update_object (op, UP_OBJ_INSERT);
1458 1515
1459 INVOKE_OBJECT (INSERT, op); 1516 INVOKE_OBJECT (INSERT, op);
… …
1466 * blocked() and wall() work properly), and these flags are updated by 1523 * blocked() and wall() work properly), and these flags are updated by
1467 * update_object(). 1524 * update_object().
1468 */ 1525 */
1469 1526
1470 /* if this is not the head or flag has been passed, don't check walk on status */ 1527 /* if this is not the head or flag has been passed, don't check walk on status */
1471 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1528 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1472 { 1529 {
1473 if (check_move_on (op, originator)) 1530 if (check_move_on (op, originator))
1474 return 0; 1531 return 0;
1475 1532
1476 /* If we are a multi part object, lets work our way through the check 1533 /* If we are a multi part object, lets work our way through the check
… …
1487/* this function inserts an object in the map, but if it 1544/* this function inserts an object in the map, but if it
1488 * finds an object of its own type, it'll remove that one first. 1545 * finds an object of its own type, it'll remove that one first.
1489 * op is the object to insert it under: supplies x and the map. 1546 * op is the object to insert it under: supplies x and the map.
1490 */ 1547 */
1491void 1548void
1492replace_insert_ob_in_map (const char *arch_string, object *op) 1549replace_insert_ob_in_map (shstr_tmp archname, object *op)
1493{ 1550{
1494 /* first search for itself and remove any old instances */ 1551 /* first search for itself and remove any old instances */
1495 1552
1496 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1553 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1497 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1554 if (tmp->arch->archname == archname) /* same archetype */
1498 tmp->destroy (1); 1555 tmp->destroy ();
1499 1556
1500 object *tmp = arch_to_object (archetype::find (arch_string)); 1557 object *tmp = arch_to_object (archetype::find (archname));
1501 1558
1502 tmp->x = op->x; 1559 tmp->x = op->x;
1503 tmp->y = op->y; 1560 tmp->y = op->y;
1504 1561
1505 insert_ob_in_map (tmp, op->map, op, 0); 1562 insert_ob_in_map (tmp, op->map, op, 0);
… …
1510{ 1567{
1511 if (where->env) 1568 if (where->env)
1512 return where->env->insert (this); 1569 return where->env->insert (this);
1513 else 1570 else
1514 return where->map->insert (this, where->x, where->y, originator, flags); 1571 return where->map->insert (this, where->x, where->y, originator, flags);
1572}
1573
1574// check whether we can put this into the map, respect max_volume, max_items
1575bool
1576object::can_drop_at (maptile *m, int x, int y, object *originator)
1577{
1578 mapspace &ms = m->at (x, y);
1579
1580 int items = ms.items ();
1581
1582 if (!items // testing !items ensures we can drop at least one item
1583 || (items < m->max_items
1584 && ms.volume () < m->max_volume))
1585 return true;
1586
1587 if (originator && originator->is_player ())
1588 originator->contr->failmsg (format (
1589 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1590 query_name ()
1591 ));
1592
1593 return false;
1515} 1594}
1516 1595
1517/* 1596/*
1518 * decrease(object, number) decreases a specified number from 1597 * decrease(object, number) decreases a specified number from
1519 * the amount of an object. If the amount reaches 0, the object 1598 * the amount of an object. If the amount reaches 0, the object
… …
1626 if (object *pl = tmp->visible_to ()) 1705 if (object *pl = tmp->visible_to ())
1627 esrv_update_item (UPD_NROF, pl, tmp); 1706 esrv_update_item (UPD_NROF, pl, tmp);
1628 1707
1629 adjust_weight (this, op->total_weight ()); 1708 adjust_weight (this, op->total_weight ());
1630 1709
1631 op->destroy (1); 1710 op->destroy ();
1632 op = tmp; 1711 op = tmp;
1633 goto inserted; 1712 goto inserted;
1634 } 1713 }
1635 1714
1636 op->owner = 0; // it's his/hers now. period. 1715 op->owner = 0; // it's his/hers now. period.
… …
1654 1733
1655 adjust_weight (this, op->total_weight ()); 1734 adjust_weight (this, op->total_weight ());
1656 1735
1657inserted: 1736inserted:
1658 /* reset the light list and los of the players on the map */ 1737 /* reset the light list and los of the players on the map */
1659 if (op->glow_radius && map && map->darkness) 1738 if (op->glow_radius && is_on_map ())
1739 {
1740 update_stats ();
1660 update_all_los (map, x, y); 1741 update_all_los (map, x, y);
1661 1742 }
1743 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1662 // if this is a player's inventory, update stats 1744 // if this is a player's inventory, update stats
1663 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1664 update_stats (); 1745 update_stats ();
1665 1746
1666 INVOKE_OBJECT (INSERT, this); 1747 INVOKE_OBJECT (INSERT, this);
1667 1748
1668 return op; 1749 return op;
… …
1689 * on top. 1770 * on top.
1690 */ 1771 */
1691int 1772int
1692check_move_on (object *op, object *originator) 1773check_move_on (object *op, object *originator)
1693{ 1774{
1775 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1776 return 0;
1777
1694 object *tmp; 1778 object *tmp;
1695 maptile *m = op->map; 1779 maptile *m = op->map;
1696 int x = op->x, y = op->y; 1780 int x = op->x, y = op->y;
1697 1781
1698 MoveType move_on, move_slow, move_block; 1782 mapspace &ms = m->at (x, y);
1699 1783
1700 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1784 ms.update ();
1701 return 0;
1702 1785
1703 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1786 MoveType move_on = ms.move_on;
1704 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1787 MoveType move_slow = ms.move_slow;
1705 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1788 MoveType move_block = ms.move_block;
1706 1789
1707 /* if nothing on this space will slow op down or be applied, 1790 /* if nothing on this space will slow op down or be applied,
1708 * no need to do checking below. have to make sure move_type 1791 * no need to do checking below. have to make sure move_type
1709 * is set, as lots of objects don't have it set - we treat that 1792 * is set, as lots of objects don't have it set - we treat that
1710 * as walking. 1793 * as walking.
… …
1721 return 0; 1804 return 0;
1722 1805
1723 /* The objects have to be checked from top to bottom. 1806 /* The objects have to be checked from top to bottom.
1724 * Hence, we first go to the top: 1807 * Hence, we first go to the top:
1725 */ 1808 */
1726 1809 for (object *next, *tmp = ms.top; tmp; tmp = next)
1727 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1728 {
1729 /* Trim the search when we find the first other spell effect
1730 * this helps performance so that if a space has 50 spell objects,
1731 * we don't need to check all of them.
1732 */
1733 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1734 break;
1735 } 1810 {
1811 next = tmp->below;
1736 1812
1737 for (; tmp; tmp = tmp->below)
1738 {
1739 if (tmp == op) 1813 if (tmp == op)
1740 continue; /* Can't apply yourself */ 1814 continue; /* Can't apply yourself */
1741 1815
1742 /* Check to see if one of the movement types should be slowed down. 1816 /* Check to see if one of the movement types should be slowed down.
1743 * Second check makes sure that the movement types not being slowed 1817 * Second check makes sure that the movement types not being slowed
… …
1748 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1822 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1749 { 1823 {
1750 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1824 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1751 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1825 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1752 { 1826 {
1753
1754 float
1755 diff = tmp->move_slow_penalty * fabs (op->speed); 1827 float diff = tmp->move_slow_penalty * fabs (op->speed);
1756 1828
1757 if (op->type == PLAYER) 1829 if (op->is_player ())
1758 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1830 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1759 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1831 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1760 diff /= 4.0; 1832 diff /= 4.0;
1761 1833
1762 op->speed_left -= diff; 1834 op->speed_left -= diff;
1763 } 1835 }
1764 } 1836 }
… …
1970 * head of the object should correspond for the entire object. 2042 * head of the object should correspond for the entire object.
1971 */ 2043 */
1972 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 2044 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1973 continue; 2045 continue;
1974 2046
1975 if (ob->blocked (m, pos.x, pos.y)) 2047 if (ob->blocked (pos.m, pos.x, pos.y))
1976 continue; 2048 continue;
1977 2049
1978 altern [index++] = i; 2050 altern [index++] = i;
1979 } 2051 }
1980 2052
… …
2048 * there is capable of. 2120 * there is capable of.
2049 */ 2121 */
2050int 2122int
2051find_dir (maptile *m, int x, int y, object *exclude) 2123find_dir (maptile *m, int x, int y, object *exclude)
2052{ 2124{
2053 int i, max = SIZEOFFREE, mflags; 2125 int max = SIZEOFFREE, mflags;
2054
2055 sint16 nx, ny;
2056 object *tmp;
2057 maptile *mp;
2058
2059 MoveType blocked, move_type; 2126 MoveType move_type;
2060 2127
2061 if (exclude && exclude->head_ () != exclude) 2128 if (exclude && exclude->head_ () != exclude)
2062 { 2129 {
2063 exclude = exclude->head; 2130 exclude = exclude->head;
2064 move_type = exclude->move_type; 2131 move_type = exclude->move_type;
… …
2067 { 2134 {
2068 /* If we don't have anything, presume it can use all movement types. */ 2135 /* If we don't have anything, presume it can use all movement types. */
2069 move_type = MOVE_ALL; 2136 move_type = MOVE_ALL;
2070 } 2137 }
2071 2138
2072 for (i = 1; i < max; i++) 2139 for (int i = 1; i < max; i++)
2073 { 2140 {
2074 mp = m; 2141 mapxy pos (m, x, y);
2075 nx = x + freearr_x[i]; 2142 pos.move (i);
2076 ny = y + freearr_y[i];
2077 2143
2078 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2144 if (!pos.normalise ())
2079
2080 if (mflags & P_OUT_OF_MAP)
2081 max = maxfree[i]; 2145 max = maxfree[i];
2082 else 2146 else
2083 { 2147 {
2084 mapspace &ms = mp->at (nx, ny); 2148 mapspace &ms = *pos;
2085 2149
2086 blocked = ms.move_block;
2087
2088 if ((move_type & blocked) == move_type) 2150 if ((move_type & ms.move_block) == move_type)
2089 max = maxfree[i]; 2151 max = maxfree [i];
2090 else if (mflags & P_IS_ALIVE) 2152 else if (ms.flags () & P_IS_ALIVE)
2091 { 2153 {
2092 for (tmp = ms.bot; tmp; tmp = tmp->above) 2154 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2093 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2155 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2094 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2156 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2095 break;
2096
2097 if (tmp)
2098 return freedir[i]; 2157 return freedir [i];
2099 } 2158 }
2100 } 2159 }
2101 } 2160 }
2102 2161
2103 return 0; 2162 return 0;
… …
2178 * This basically means that if direction is 15, then it could either go 2237 * This basically means that if direction is 15, then it could either go
2179 * direction 4, 14, or 16 to get back to where we are. 2238 * direction 4, 14, or 16 to get back to where we are.
2180 * Moved from spell_util.c to object.c with the other related direction 2239 * Moved from spell_util.c to object.c with the other related direction
2181 * functions. 2240 * functions.
2182 */ 2241 */
2183int reduction_dir[SIZEOFFREE][3] = { 2242static const int reduction_dir[SIZEOFFREE][3] = {
2184 {0, 0, 0}, /* 0 */ 2243 {0, 0, 0}, /* 0 */
2185 {0, 0, 0}, /* 1 */ 2244 {0, 0, 0}, /* 1 */
2186 {0, 0, 0}, /* 2 */ 2245 {0, 0, 0}, /* 2 */
2187 {0, 0, 0}, /* 3 */ 2246 {0, 0, 0}, /* 3 */
2188 {0, 0, 0}, /* 4 */ 2247 {0, 0, 0}, /* 4 */
… …
2284int 2343int
2285can_pick (const object *who, const object *item) 2344can_pick (const object *who, const object *item)
2286{ 2345{
2287 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2346 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2288 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2347 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2289 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2348 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2290} 2349}
2291 2350
2292/* 2351/*
2293 * create clone from object to another 2352 * create clone from object to another
2294 */ 2353 */
… …
2326 return tmp; 2385 return tmp;
2327 2386
2328 return 0; 2387 return 0;
2329} 2388}
2330 2389
2331const shstr & 2390shstr_tmp
2332object::kv_get (const shstr &key) const 2391object::kv_get (shstr_tmp key) const
2333{ 2392{
2334 for (key_value *kv = key_values; kv; kv = kv->next) 2393 for (key_value *kv = key_values; kv; kv = kv->next)
2335 if (kv->key == key) 2394 if (kv->key == key)
2336 return kv->value; 2395 return kv->value;
2337 2396
2338 return shstr_null; 2397 return shstr ();
2339} 2398}
2340 2399
2341void 2400void
2342object::kv_set (const shstr &key, const shstr &value) 2401object::kv_set (shstr_tmp key, shstr_tmp value)
2343{ 2402{
2344 for (key_value *kv = key_values; kv; kv = kv->next) 2403 for (key_value *kv = key_values; kv; kv = kv->next)
2345 if (kv->key == key) 2404 if (kv->key == key)
2346 { 2405 {
2347 kv->value = value; 2406 kv->value = value;
… …
2356 2415
2357 key_values = kv; 2416 key_values = kv;
2358} 2417}
2359 2418
2360void 2419void
2361object::kv_del (const shstr &key) 2420object::kv_del (shstr_tmp key)
2362{ 2421{
2363 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2422 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2364 if ((*kvp)->key == key) 2423 if ((*kvp)->key == key)
2365 { 2424 {
2366 key_value *kv = *kvp; 2425 key_value *kv = *kvp;
… …
2459{ 2518{
2460 return map ? map->region (x, y) 2519 return map ? map->region (x, y)
2461 : region::default_region (); 2520 : region::default_region ();
2462} 2521}
2463 2522
2464const materialtype_t *
2465object::dominant_material () const
2466{
2467 if (materialtype_t *mt = name_to_material (materialname))
2468 return mt;
2469
2470 return name_to_material (shstr_unknown);
2471}
2472
2473void 2523void
2474object::open_container (object *new_container) 2524object::open_container (object *new_container)
2475{ 2525{
2476 if (container == new_container) 2526 if (container == new_container)
2477 return; 2527 return;
… …
2497 container = 0; 2547 container = 0;
2498 2548
2499 // client needs item update to make it work, client bug requires this to be separate 2549 // client needs item update to make it work, client bug requires this to be separate
2500 esrv_update_item (UPD_FLAGS, this, old_container); 2550 esrv_update_item (UPD_FLAGS, this, old_container);
2501 2551
2502 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2552 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2503 play_sound (sound_find ("chest_close")); 2553 play_sound (sound_find ("chest_close"));
2504 } 2554 }
2505 2555
2506 if (new_container) 2556 if (new_container)
2507 { 2557 {
… …
2517 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2567 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2518 new_container->insert (closer); 2568 new_container->insert (closer);
2519 } 2569 }
2520#endif 2570#endif
2521 2571
2522 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2572 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2523 2573
2524 // make sure the container is available, client bug requires this to be separate 2574 // make sure the container is available, client bug requires this to be separate
2525 esrv_send_item (this, new_container); 2575 esrv_send_item (this, new_container);
2526 2576
2527 new_container->flag [FLAG_APPLIED] = true; 2577 new_container->flag [FLAG_APPLIED] = true;
… …
2535// else if (!old_container->env && contr && contr->ns) 2585// else if (!old_container->env && contr && contr->ns)
2536// contr->ns->floorbox_reset (); 2586// contr->ns->floorbox_reset ();
2537} 2587}
2538 2588
2539object * 2589object *
2540object::force_find (const shstr name) 2590object::force_find (shstr_tmp name)
2541{ 2591{
2542 /* cycle through his inventory to look for the MARK we want to 2592 /* cycle through his inventory to look for the MARK we want to
2543 * place 2593 * place
2544 */ 2594 */
2545 for (object *tmp = inv; tmp; tmp = tmp->below) 2595 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2547 return splay (tmp); 2597 return splay (tmp);
2548 2598
2549 return 0; 2599 return 0;
2550} 2600}
2551 2601
2602//-GPL
2603
2552void 2604void
2605object::force_set_timer (int duration)
2606{
2607 this->duration = 1;
2608 this->speed_left = -1.f;
2609
2610 this->set_speed (duration ? 1.f / duration : 0.f);
2611}
2612
2613object *
2553object::force_add (const shstr name, int duration) 2614object::force_add (shstr_tmp name, int duration)
2554{ 2615{
2555 if (object *force = force_find (name)) 2616 if (object *force = force_find (name))
2556 force->destroy (); 2617 force->destroy ();
2557 2618
2558 object *force = get_archetype (FORCE_NAME); 2619 object *force = get_archetype (FORCE_NAME);
2559 2620
2560 force->slaying = name; 2621 force->slaying = name;
2561 force->stats.food = 1; 2622 force->force_set_timer (duration);
2562 force->speed_left = -1.f;
2563
2564 force->set_speed (duration ? 1.f / duration : 0.f);
2565 force->flag [FLAG_IS_USED_UP] = true;
2566 force->flag [FLAG_APPLIED] = true; 2623 force->flag [FLAG_APPLIED] = true;
2567 2624
2568 insert (force); 2625 return insert (force);
2569} 2626}
2570 2627
2571void 2628void
2572object::play_sound (faceidx sound) 2629object::play_sound (faceidx sound) const
2573{ 2630{
2574 if (!sound) 2631 if (!sound)
2575 return; 2632 return;
2576 2633
2577 if (flag [FLAG_REMOVED]) 2634 if (is_on_map ())
2635 map->play_sound (sound, x, y);
2636 else if (object *pl = in_player ())
2637 pl->contr->play_sound (sound);
2638}
2639
2640void
2641object::say_msg (const char *msg) const
2642{
2643 if (is_on_map ())
2644 map->say_msg (msg, x, y);
2645 else if (object *pl = in_player ())
2646 pl->contr->play_sound (sound);
2647}
2648
2649void
2650object::make_noise ()
2651{
2652 // we do not model noise in the map, so instead put
2653 // a temporary light into the noise source
2654 // could use the map instead, but that's less reliable for our
2655 // goal, which is to make invisibility a bit harder to exploit
2656
2657 // currently only works sensibly for players
2658 if (!is_player ())
2578 return; 2659 return;
2579 2660
2580 if (env) 2661 // find old force, or create new one
2581 { 2662 object *force = force_find (shstr_noise_force);
2582 if (object *pl = in_player ()) 2663
2583 pl->contr->play_sound (sound); 2664 if (force)
2584 } 2665 force->speed_left = -1.f; // patch old speed up
2585 else 2666 else
2586 map->play_sound (sound, x, y); 2667 {
2587} 2668 force = archetype::get (shstr_noise_force);
2588 2669
2670 force->slaying = shstr_noise_force;
2671 force->stats.food = 1;
2672 force->speed_left = -1.f;
2673
2674 force->set_speed (1.f / 4.f);
2675 force->flag [FLAG_IS_USED_UP] = true;
2676 force->flag [FLAG_APPLIED] = true;
2677
2678 insert (force);
2679 }
2680}
2681

Diff Legend

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