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.244 by root, Sun May 18 17:52:53 2008 UTC vs.
Revision 1.302 by root, Tue Nov 10 00:01:31 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 // some objects are unmergable
192 if (!ob1->nrof || !ob2->nrof)
193 return 0;
194
195 /* Do not merge objects if nrof would overflow. First part checks 261 /* Do not merge objects if nrof would overflow, assume nrof
196 * for unsigned overflow (2c), second part checks whether the result 262 * is always 0 .. 2**31-1 */
197 * would fit into a 32 bit signed int, which is often used to hold 263 if (ob1->nrof > 0x7fffffff - ob2->nrof)
198 * nrof values.
199 */
200 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
201 return 0; 264 return 0;
202 265
203 /* If the objects have been identified, set the BEEN_APPLIED flag. 266 /* If the objects have been identified, set the BEEN_APPLIED flag.
204 * This is to the comparison of the flags below will be OK. We 267 * This is to the comparison of the flags below will be OK. We
205 * just can't ignore the been applied or identified flags, as they 268 * just can't ignore the been applied or identified flags, as they
… …
232 || ob1->move_block != ob2->move_block 295 || ob1->move_block != ob2->move_block
233 || ob1->move_allow != ob2->move_allow 296 || ob1->move_allow != ob2->move_allow
234 || ob1->move_on != ob2->move_on 297 || ob1->move_on != ob2->move_on
235 || ob1->move_off != ob2->move_off 298 || ob1->move_off != ob2->move_off
236 || ob1->move_slow != ob2->move_slow 299 || ob1->move_slow != ob2->move_slow
237 || ob1->move_slow_penalty != ob2->move_slow_penalty 300 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
238 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) 301 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
239 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 302 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
240 return 0; 303 return 0;
241 304
242 if ((ob1->flag ^ ob2->flag) 305 if ((ob1->flag ^ ob2->flag)
243 .reset (FLAG_INV_LOCKED) 306 .reset (FLAG_INV_LOCKED)
244 .reset (FLAG_CLIENT_SENT)
245 .reset (FLAG_REMOVED) 307 .reset (FLAG_REMOVED)
246 .any ()) 308 .any ())
247 return 0; 309 return 0;
248 310
249 /* This is really a spellbook check - we should in general 311 /* This is really a spellbook check - we should in general
… …
331 { 393 {
332 // see if we are in a container of sorts 394 // see if we are in a container of sorts
333 if (env) 395 if (env)
334 { 396 {
335 // the player inventory itself is always visible 397 // the player inventory itself is always visible
336 if (env->type == PLAYER) 398 if (env->is_player ())
337 return env; 399 return env;
338 400
339 // else a player could have our env open 401 // else a player could have our env open
340 object *envest = env->outer_env (); 402 object *envest = env->outer_env_or_self ();
341 403
342 // 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
343 // even if our inv is in a player. 405 // even if our inv is in a player.
344 if (envest->is_on_map ()) 406 if (envest->is_on_map ())
345 if (object *pl = envest->ms ().player ()) 407 if (object *pl = envest->ms ().player ())
346 if (pl->container == env) 408 if (pl->container_ () == env)
347 return pl; 409 return pl;
348 } 410 }
349 else 411 else
350 { 412 {
351 // maybe there is a player standing on the same mapspace 413 // maybe there is a player standing on the same mapspace
352 // this will catch the case where "this" is a player 414 // this will catch the case where "this" is a player
353 if (object *pl = ms ().player ()) 415 if (object *pl = ms ().player ())
354 if (!pl->container || this == pl->container) 416 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
417 || pl->container_ () == this)
355 return pl; 418 return pl;
356 } 419 }
357 } 420 }
358 421
359 return 0; 422 return 0;
… …
437 object_freezer freezer; 500 object_freezer freezer;
438 op->write (freezer); 501 op->write (freezer);
439 return freezer.as_string (); 502 return freezer.as_string ();
440} 503}
441 504
442/* 505char *
443 * get_nearest_part(multi-object, object 2) returns the part of the 506object::as_string ()
444 * multi-object 1 which is closest to the second object.
445 * If it's not a multi-object, it is returned.
446 */
447object *
448get_nearest_part (object *op, const object *pl)
449{ 507{
450 object *tmp, *closest; 508 return dump_object (this);
451 int last_dist, i;
452
453 if (!op->more)
454 return op;
455
456 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
457 tmp;
458 tmp = tmp->more)
459 if ((i = distance (tmp, pl)) < last_dist)
460 closest = tmp, last_dist = i;
461
462 return closest;
463} 509}
464 510
465/* 511/*
466 * 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.
467 * VERRRY slow. 513 * VERRRY slow.
… …
561 update_stats (); 607 update_stats ();
562 608
563 new_draw_info_format (NDI_UNIQUE, 0, this, 609 new_draw_info_format (NDI_UNIQUE, 0, this,
564 "You try to balance all your items at once, " 610 "You try to balance all your items at once, "
565 "but the %s is just too much for your body. " 611 "but the %s is just too much for your body. "
566 "[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);
567 return false; 614 return false;
568 } 615 }
569 616
570 //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);
571 } 618 }
… …
643 } 690 }
644 691
645 if (speed < 0) 692 if (speed < 0)
646 dst->speed_left -= rndm (); 693 dst->speed_left -= rndm ();
647 694
648 dst->set_speed (dst->speed); 695 dst->activate ();
649} 696}
650 697
651void 698void
652object::instantiate () 699object::instantiate ()
653{ 700{
… …
697 * 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.
698 */ 745 */
699void 746void
700object::set_speed (float speed) 747object::set_speed (float speed)
701{ 748{
702 if (flag [FLAG_FREED] && speed)
703 {
704 LOG (llevError, "Object %s is freed but has speed.\n", &name);
705 speed = 0;
706 }
707
708 this->speed = speed; 749 this->speed = speed;
709 750
710 if (has_active_speed ()) 751 if (has_active_speed ())
711 activate (); 752 activate ();
712 else 753 else
… …
762 803
763 if (!(m.flags_ & P_UPTODATE)) 804 if (!(m.flags_ & P_UPTODATE))
764 /* nop */; 805 /* nop */;
765 else if (action == UP_OBJ_INSERT) 806 else if (action == UP_OBJ_INSERT)
766 { 807 {
808#if 0
767 // this is likely overkill, TODO: revisit (schmorp) 809 // this is likely overkill, TODO: revisit (schmorp)
768 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 810 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
769 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 811 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
770 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 812 || (op->is_player () && !(m.flags_ & P_PLAYER))
771 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 813 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
772 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 814 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
773 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 815 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
774 || (m.move_on | op->move_on ) != m.move_on 816 || (m.move_on | op->move_on ) != m.move_on
775 || (m.move_off | op->move_off ) != m.move_off 817 || (m.move_off | op->move_off ) != m.move_off
776 || (m.move_slow | op->move_slow) != m.move_slow 818 || (m.move_slow | op->move_slow) != m.move_slow
777 /* 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
778 * to have move_allow right now. 820 * have move_allow right now.
779 */ 821 */
780 || ((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
781 || 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)
782 m.flags_ = 0; 826 m.invalidate ();
827#endif
783 } 828 }
784 /* if the object is being removed, we can't make intelligent 829 /* if the object is being removed, we can't make intelligent
785 * decisions, because remove_ob can't really pass the object 830 * decisions, because remove_ob can't really pass the object
786 * that is being removed. 831 * that is being removed.
787 */ 832 */
788 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 833 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
789 m.flags_ = 0; 834 m.invalidate ();
790 else if (action == UP_OBJ_FACE) 835 else if (action == UP_OBJ_FACE)
791 /* Nothing to do for that case */ ; 836 /* Nothing to do for that case */ ;
792 else 837 else
793 LOG (llevError, "update_object called with invalid action: %d\n", action); 838 LOG (llevError, "update_object called with invalid action: %d\n", action);
794 839
… …
798 843
799object::object () 844object::object ()
800{ 845{
801 SET_FLAG (this, FLAG_REMOVED); 846 SET_FLAG (this, FLAG_REMOVED);
802 847
803 expmul = 1.0; 848 //expmul = 1.0; declared const for the time being
804 face = blank_face; 849 face = blank_face;
805} 850}
806 851
807object::~object () 852object::~object ()
808{ 853{
… …
838 /* If already on active list, don't do anything */ 883 /* If already on active list, don't do anything */
839 if (active) 884 if (active)
840 return; 885 return;
841 886
842 if (has_active_speed ()) 887 if (has_active_speed ())
888 {
889 if (flag [FLAG_FREED])
890 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
891
843 actives.insert (this); 892 actives.insert (this);
893 }
844} 894}
845 895
846void 896void
847object::activate_recursive () 897object::activate_recursive ()
848{ 898{
… …
913 || map->in_memory != MAP_ACTIVE 963 || map->in_memory != MAP_ACTIVE
914 || map->no_drop 964 || map->no_drop
915 || ms ().move_block == MOVE_ALL) 965 || ms ().move_block == MOVE_ALL)
916 { 966 {
917 while (inv) 967 while (inv)
918 {
919 inv->destroy_inv (false);
920 inv->destroy (); 968 inv->destroy ();
921 }
922 } 969 }
923 else 970 else
924 { /* Put objects in inventory onto this space */ 971 { /* Put objects in inventory onto this space */
925 while (inv) 972 while (inv)
926 { 973 {
… …
930 || op->flag [FLAG_NO_DROP] 977 || op->flag [FLAG_NO_DROP]
931 || op->type == RUNE 978 || op->type == RUNE
932 || op->type == TRAP 979 || op->type == TRAP
933 || op->flag [FLAG_IS_A_TEMPLATE] 980 || op->flag [FLAG_IS_A_TEMPLATE]
934 || op->flag [FLAG_DESTROY_ON_DEATH]) 981 || op->flag [FLAG_DESTROY_ON_DEATH])
935 op->destroy (true); 982 op->destroy ();
936 else 983 else
937 map->insert (op, x, y); 984 map->insert (op, x, y);
938 } 985 }
939 } 986 }
940} 987}
… …
969 1016
970void 1017void
971object::do_destroy () 1018object::do_destroy ()
972{ 1019{
973 if (flag [FLAG_IS_LINKED]) 1020 if (flag [FLAG_IS_LINKED])
974 remove_button_link (this); 1021 remove_link ();
975 1022
976 if (flag [FLAG_FRIENDLY]) 1023 if (flag [FLAG_FRIENDLY])
977 remove_friendly_object (this); 1024 remove_friendly_object (this);
978 1025
979 remove (); 1026 remove ();
… …
1004 attacked_by = 0; 1051 attacked_by = 0;
1005 current_weapon = 0; 1052 current_weapon = 0;
1006} 1053}
1007 1054
1008void 1055void
1009object::destroy (bool destroy_inventory) 1056object::destroy ()
1010{ 1057{
1011 if (destroyed ()) 1058 if (destroyed ())
1012 return; 1059 return;
1013 1060
1014 if (!is_head () && !head->destroyed ()) 1061 if (!is_head () && !head->destroyed ())
1015 { 1062 {
1016 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1063 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1017 head->destroy (destroy_inventory); 1064 head->destroy ();
1018 return; 1065 return;
1019 } 1066 }
1020 1067
1021 destroy_inv (!destroy_inventory); 1068 destroy_inv (false);
1022 1069
1023 if (is_head ()) 1070 if (is_head ())
1024 if (sound_destroy) 1071 if (sound_destroy)
1025 play_sound (sound_destroy); 1072 play_sound (sound_destroy);
1026 else if (flag [FLAG_MONSTER]) 1073 else if (flag [FLAG_MONSTER])
… …
1037 * the previous environment. 1084 * the previous environment.
1038 */ 1085 */
1039void 1086void
1040object::do_remove () 1087object::do_remove ()
1041{ 1088{
1042 object *tmp, *last = 0;
1043 object *otmp;
1044
1045 if (flag [FLAG_REMOVED]) 1089 if (flag [FLAG_REMOVED])
1046 return; 1090 return;
1047 1091
1048 INVOKE_OBJECT (REMOVE, this); 1092 INVOKE_OBJECT (REMOVE, this);
1049 1093
… …
1062 if (object *pl = visible_to ()) 1106 if (object *pl = visible_to ())
1063 esrv_del_item (pl->contr, count); 1107 esrv_del_item (pl->contr, count);
1064 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1108 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1065 1109
1066 adjust_weight (env, -total_weight ()); 1110 adjust_weight (env, -total_weight ());
1111
1112 object *pl = in_player ();
1067 1113
1068 /* we set up values so that it could be inserted into 1114 /* we set up values so that it could be inserted into
1069 * the map, but we don't actually do that - it is up 1115 * the map, but we don't actually do that - it is up
1070 * to the caller to decide what we want to do. 1116 * to the caller to decide what we want to do.
1071 */ 1117 */
… …
1083 1129
1084 /* NO_FIX_PLAYER is set when a great many changes are being 1130 /* NO_FIX_PLAYER is set when a great many changes are being
1085 * made to players inventory. If set, avoiding the call 1131 * made to players inventory. If set, avoiding the call
1086 * to save cpu time. 1132 * to save cpu time.
1087 */ 1133 */
1088 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1134 if (pl)
1135 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1136 {
1089 otmp->update_stats (); 1137 pl->update_stats ();
1138
1139 if (glow_radius && pl->is_on_map ())
1140 update_all_los (pl->map, pl->x, pl->y);
1141 }
1090 } 1142 }
1091 else if (map) 1143 else if (map)
1092 { 1144 {
1093 map->dirty = true; 1145 map->dirty = true;
1094 mapspace &ms = this->ms (); 1146 mapspace &ms = this->ms ();
1095 1147
1096 if (object *pl = ms.player ()) 1148 if (object *pl = ms.player ())
1097 { 1149 {
1098 if (type == PLAYER) // this == pl(!) 1150 if (is_player ())
1099 { 1151 {
1152 if (!flag [FLAG_WIZPASS])
1153 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1154
1100 // leaving a spot always closes any open container on the ground 1155 // leaving a spot always closes any open container on the ground
1101 if (container && !container->env) 1156 if (container && !container->env)
1102 // this causes spurious floorbox updates, but it ensures 1157 // this causes spurious floorbox updates, but it ensures
1103 // that the CLOSE event is being sent. 1158 // that the CLOSE event is being sent.
1104 close_container (); 1159 close_container ();
1105 1160
1106 --map->players; 1161 --map->players;
1107 map->touch (); 1162 map->touch ();
1108 } 1163 }
1109 else if (pl->container == this) 1164 else if (pl->container_ () == this)
1110 { 1165 {
1111 // removing a container should close it 1166 // removing a container should close it
1112 close_container (); 1167 close_container ();
1113 } 1168 }
1114 1169
… …
1121 *(below ? &below->above : &ms.bot) = above; 1176 *(below ? &below->above : &ms.bot) = above;
1122 1177
1123 above = 0; 1178 above = 0;
1124 below = 0; 1179 below = 0;
1125 1180
1181 ms.invalidate ();
1182
1126 if (map->in_memory == MAP_SAVING) 1183 if (map->in_memory == MAP_SAVING)
1127 return; 1184 return;
1128 1185
1129 int check_walk_off = !flag [FLAG_NO_APPLY]; 1186 int check_walk_off = !flag [FLAG_NO_APPLY];
1130 1187
1131 if (object *pl = ms.player ()) 1188 if (object *pl = ms.player ())
1132 { 1189 {
1133 if (pl->container == this) 1190 if (pl->container_ () == this)
1134 /* If a container that the player is currently using somehow gets 1191 /* If a container that the player is currently using somehow gets
1135 * removed (most likely destroyed), update the player view 1192 * removed (most likely destroyed), update the player view
1136 * appropriately. 1193 * appropriately.
1137 */ 1194 */
1138 pl->close_container (); 1195 pl->close_container ();
… …
1142 //TODO: update floorbox to preserve ordering 1199 //TODO: update floorbox to preserve ordering
1143 if (pl->contr->ns) 1200 if (pl->contr->ns)
1144 pl->contr->ns->floorbox_update (); 1201 pl->contr->ns->floorbox_update ();
1145 } 1202 }
1146 1203
1204 if (check_walk_off)
1147 for (tmp = ms.bot; tmp; tmp = tmp->above) 1205 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1148 { 1206 {
1207 above = tmp->above;
1208
1149 /* No point updating the players look faces if he is the object 1209 /* No point updating the players look faces if he is the object
1150 * being removed. 1210 * being removed.
1151 */ 1211 */
1152 1212
1153 /* See if object moving off should effect something */ 1213 /* See if object moving off should effect something */
1154 if (check_walk_off
1155 && ((move_type & tmp->move_off) 1214 if ((move_type & tmp->move_off)
1156 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1215 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1157 {
1158 move_apply (tmp, this, 0); 1216 move_apply (tmp, this, 0);
1159
1160 if (destroyed ())
1161 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1162 } 1217 }
1163 1218
1164 last = tmp; 1219 if (affects_los ())
1165 }
1166
1167 /* last == NULL if there are no objects on this space */
1168 //TODO: this makes little sense, why only update the topmost object?
1169 if (!last)
1170 map->at (x, y).flags_ = 0;
1171 else
1172 update_object (last, UP_OBJ_REMOVE);
1173
1174 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1175 update_all_los (map, x, y); 1220 update_all_los (map, x, y);
1176 } 1221 }
1177} 1222}
1178 1223
1179/* 1224/*
… …
1203 esrv_update_item (UPD_NROF, pl, top); 1248 esrv_update_item (UPD_NROF, pl, top);
1204 1249
1205 op->weight = 0; // cancel the addition above 1250 op->weight = 0; // cancel the addition above
1206 op->carrying = 0; // must be 0 already 1251 op->carrying = 0; // must be 0 already
1207 1252
1208 op->destroy (1); 1253 op->destroy ();
1209 1254
1210 return top; 1255 return top;
1211 } 1256 }
1212 1257
1213 return 0; 1258 return 0;
… …
1275 * just 'op' otherwise 1320 * just 'op' otherwise
1276 */ 1321 */
1277object * 1322object *
1278insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1323insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1279{ 1324{
1280 if (op->is_on_map ())
1281 {
1282 LOG (llevError, "insert_ob_in_map called for object already on map");
1283 abort ();
1284 }
1285
1286 if (op->env)
1287 {
1288 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1289 op->remove (); 1325 op->remove ();
1326
1327 if (m == &freed_map)//D TODO: remove soon
1328 {//D
1329 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1290 } 1330 }//D
1291 1331
1292 /* Ideally, the caller figures this out. However, it complicates a lot 1332 /* Ideally, the caller figures this out. However, it complicates a lot
1293 * of areas of callers (eg, anything that uses find_free_spot would now 1333 * of areas of callers (eg, anything that uses find_free_spot would now
1294 * need extra work 1334 * need extra work
1295 */ 1335 */
1336 maptile *newmap = m;
1296 if (!xy_normalise (m, op->x, op->y)) 1337 if (!xy_normalise (newmap, op->x, op->y))
1297 { 1338 {
1298 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found 1339 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1299 return 0; 1340 return 0;
1300 } 1341 }
1301 1342
1302 if (object *more = op->more) 1343 if (object *more = op->more)
1303 if (!insert_ob_in_map (more, m, originator, flag)) 1344 if (!insert_ob_in_map (more, m, originator, flag))
1304 return 0; 1345 return 0;
1305 1346
1306 CLEAR_FLAG (op, FLAG_REMOVED); 1347 op->flag [FLAG_REMOVED] = false;
1307 1348 op->env = 0;
1308 op->map = m; 1349 op->map = newmap;
1350
1309 mapspace &ms = op->ms (); 1351 mapspace &ms = op->ms ();
1310 1352
1311 /* this has to be done after we translate the coordinates. 1353 /* this has to be done after we translate the coordinates.
1312 */ 1354 */
1313 if (op->nrof && !(flag & INS_NO_MERGE)) 1355 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1316 { 1358 {
1317 // TODO: we actually want to update tmp, not op, 1359 // TODO: we actually want to update tmp, not op,
1318 // but some caller surely breaks when we return tmp 1360 // but some caller surely breaks when we return tmp
1319 // from here :/ 1361 // from here :/
1320 op->nrof += tmp->nrof; 1362 op->nrof += tmp->nrof;
1321 tmp->destroy (1); 1363 tmp->destroy ();
1322 } 1364 }
1323 1365
1324 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1366 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1325 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1367 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1326 1368
… …
1334 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1376 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1335 abort (); 1377 abort ();
1336 } 1378 }
1337 1379
1338 if (!originator->is_on_map ()) 1380 if (!originator->is_on_map ())
1381 {
1339 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", 1382 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1340 op->debug_desc (), originator->debug_desc ()); 1383 op->debug_desc (), originator->debug_desc ());
1384 abort ();
1385 }
1341 1386
1342 op->above = originator; 1387 op->above = originator;
1343 op->below = originator->below; 1388 op->below = originator->below;
1344 originator->below = op; 1389 originator->below = op;
1345 1390
… …
1431 op->below = top; 1476 op->below = top;
1432 *(op->above ? &op->above->below : &ms.top) = op; 1477 *(op->above ? &op->above->below : &ms.top) = op;
1433 } 1478 }
1434 } 1479 }
1435 1480
1436 if (op->type == PLAYER) 1481 if (op->is_player ())
1437 { 1482 {
1438 op->contr->do_los = 1; 1483 op->contr->do_los = 1;
1439 ++op->map->players; 1484 ++op->map->players;
1440 op->map->touch (); 1485 op->map->touch ();
1441 } 1486 }
… …
1456 * be far away from this change and not affected in any way - 1501 * be far away from this change and not affected in any way -
1457 * this should get redone to only look for players within range, 1502 * this should get redone to only look for players within range,
1458 * or just updating the P_UPTODATE for spaces within this area 1503 * or just updating the P_UPTODATE for spaces within this area
1459 * of effect may be sufficient. 1504 * of effect may be sufficient.
1460 */ 1505 */
1461 if (op->map->darkness && (op->glow_radius != 0)) 1506 if (op->affects_los ())
1507 {
1508 op->ms ().invalidate ();
1462 update_all_los (op->map, op->x, op->y); 1509 update_all_los (op->map, op->x, op->y);
1510 }
1463 1511
1464 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1512 /* updates flags (blocked, alive, no magic, etc) for this map space */
1465 update_object (op, UP_OBJ_INSERT); 1513 update_object (op, UP_OBJ_INSERT);
1466 1514
1467 INVOKE_OBJECT (INSERT, op); 1515 INVOKE_OBJECT (INSERT, op);
… …
1474 * blocked() and wall() work properly), and these flags are updated by 1522 * blocked() and wall() work properly), and these flags are updated by
1475 * update_object(). 1523 * update_object().
1476 */ 1524 */
1477 1525
1478 /* if this is not the head or flag has been passed, don't check walk on status */ 1526 /* if this is not the head or flag has been passed, don't check walk on status */
1479 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1527 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1480 { 1528 {
1481 if (check_move_on (op, originator)) 1529 if (check_move_on (op, originator))
1482 return 0; 1530 return 0;
1483 1531
1484 /* If we are a multi part object, lets work our way through the check 1532 /* If we are a multi part object, lets work our way through the check
… …
1495/* this function inserts an object in the map, but if it 1543/* this function inserts an object in the map, but if it
1496 * finds an object of its own type, it'll remove that one first. 1544 * finds an object of its own type, it'll remove that one first.
1497 * op is the object to insert it under: supplies x and the map. 1545 * op is the object to insert it under: supplies x and the map.
1498 */ 1546 */
1499void 1547void
1500replace_insert_ob_in_map (const char *arch_string, object *op) 1548replace_insert_ob_in_map (shstr_tmp archname, object *op)
1501{ 1549{
1502 /* first search for itself and remove any old instances */ 1550 /* first search for itself and remove any old instances */
1503 1551
1504 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1552 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1505 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1553 if (tmp->arch->archname == archname) /* same archetype */
1506 tmp->destroy (1); 1554 tmp->destroy ();
1507 1555
1508 object *tmp = arch_to_object (archetype::find (arch_string)); 1556 object *tmp = arch_to_object (archetype::find (archname));
1509 1557
1510 tmp->x = op->x; 1558 tmp->x = op->x;
1511 tmp->y = op->y; 1559 tmp->y = op->y;
1512 1560
1513 insert_ob_in_map (tmp, op->map, op, 0); 1561 insert_ob_in_map (tmp, op->map, op, 0);
… …
1518{ 1566{
1519 if (where->env) 1567 if (where->env)
1520 return where->env->insert (this); 1568 return where->env->insert (this);
1521 else 1569 else
1522 return where->map->insert (this, where->x, where->y, originator, flags); 1570 return where->map->insert (this, where->x, where->y, originator, flags);
1571}
1572
1573// check whether we can put this into the map, respect max_volume, max_items
1574bool
1575object::can_drop_at (maptile *m, int x, int y, object *originator)
1576{
1577 mapspace &ms = m->at (x, y);
1578
1579 int items = ms.items ();
1580
1581 if (!items // testing !items ensures we can drop at least one item
1582 || (items < m->max_items
1583 && ms.volume () < m->max_volume))
1584 return true;
1585
1586 if (originator && originator->is_player ())
1587 originator->contr->failmsg (format (
1588 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1589 query_name ()
1590 ));
1591
1592 return false;
1523} 1593}
1524 1594
1525/* 1595/*
1526 * decrease(object, number) decreases a specified number from 1596 * decrease(object, number) decreases a specified number from
1527 * the amount of an object. If the amount reaches 0, the object 1597 * the amount of an object. If the amount reaches 0, the object
… …
1535 if (!nr) 1605 if (!nr)
1536 return true; 1606 return true;
1537 1607
1538 nr = min (nr, nrof); 1608 nr = min (nr, nrof);
1539 1609
1610 if (nrof > nr)
1611 {
1540 nrof -= nr; 1612 nrof -= nr;
1541
1542 if (nrof)
1543 {
1544 adjust_weight (env, -weight * nr); // carrying == 0 1613 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1545 1614
1546 if (object *pl = visible_to ()) 1615 if (object *pl = visible_to ())
1547 esrv_update_item (UPD_NROF, pl, this); 1616 esrv_update_item (UPD_NROF, pl, this);
1548 1617
1549 return true; 1618 return true;
1550 } 1619 }
1551 else 1620 else
1552 { 1621 {
1553 destroy (1); 1622 destroy ();
1554 return false; 1623 return false;
1555 } 1624 }
1556} 1625}
1557 1626
1558/* 1627/*
… …
1635 if (object *pl = tmp->visible_to ()) 1704 if (object *pl = tmp->visible_to ())
1636 esrv_update_item (UPD_NROF, pl, tmp); 1705 esrv_update_item (UPD_NROF, pl, tmp);
1637 1706
1638 adjust_weight (this, op->total_weight ()); 1707 adjust_weight (this, op->total_weight ());
1639 1708
1640 op->destroy (1); 1709 op->destroy ();
1641 op = tmp; 1710 op = tmp;
1642 goto inserted; 1711 goto inserted;
1643 } 1712 }
1644 1713
1645 op->owner = 0; // it's his/hers now. period. 1714 op->owner = 0; // it's his/hers now. period.
… …
1663 1732
1664 adjust_weight (this, op->total_weight ()); 1733 adjust_weight (this, op->total_weight ());
1665 1734
1666inserted: 1735inserted:
1667 /* reset the light list and los of the players on the map */ 1736 /* reset the light list and los of the players on the map */
1668 if (op->glow_radius && map && map->darkness) 1737 if (op->glow_radius && is_on_map ())
1738 {
1739 update_stats ();
1669 update_all_los (map, x, y); 1740 update_all_los (map, x, y);
1670 1741 }
1742 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1671 // if this is a player's inventory, update stats 1743 // if this is a player's inventory, update stats
1672 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1673 update_stats (); 1744 update_stats ();
1674 1745
1675 INVOKE_OBJECT (INSERT, this); 1746 INVOKE_OBJECT (INSERT, this);
1676 1747
1677 return op; 1748 return op;
… …
1698 * on top. 1769 * on top.
1699 */ 1770 */
1700int 1771int
1701check_move_on (object *op, object *originator) 1772check_move_on (object *op, object *originator)
1702{ 1773{
1774 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1775 return 0;
1776
1703 object *tmp; 1777 object *tmp;
1704 maptile *m = op->map; 1778 maptile *m = op->map;
1705 int x = op->x, y = op->y; 1779 int x = op->x, y = op->y;
1706 1780
1707 MoveType move_on, move_slow, move_block; 1781 mapspace &ms = m->at (x, y);
1708 1782
1709 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1783 ms.update ();
1710 return 0;
1711 1784
1712 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1785 MoveType move_on = ms.move_on;
1713 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1786 MoveType move_slow = ms.move_slow;
1714 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1787 MoveType move_block = ms.move_block;
1715 1788
1716 /* if nothing on this space will slow op down or be applied, 1789 /* if nothing on this space will slow op down or be applied,
1717 * no need to do checking below. have to make sure move_type 1790 * no need to do checking below. have to make sure move_type
1718 * is set, as lots of objects don't have it set - we treat that 1791 * is set, as lots of objects don't have it set - we treat that
1719 * as walking. 1792 * as walking.
… …
1730 return 0; 1803 return 0;
1731 1804
1732 /* The objects have to be checked from top to bottom. 1805 /* The objects have to be checked from top to bottom.
1733 * Hence, we first go to the top: 1806 * Hence, we first go to the top:
1734 */ 1807 */
1735 1808 for (object *next, *tmp = ms.top; tmp; tmp = next)
1736 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1737 {
1738 /* Trim the search when we find the first other spell effect
1739 * this helps performance so that if a space has 50 spell objects,
1740 * we don't need to check all of them.
1741 */
1742 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1743 break;
1744 } 1809 {
1810 next = tmp->below;
1745 1811
1746 for (; tmp; tmp = tmp->below)
1747 {
1748 if (tmp == op) 1812 if (tmp == op)
1749 continue; /* Can't apply yourself */ 1813 continue; /* Can't apply yourself */
1750 1814
1751 /* Check to see if one of the movement types should be slowed down. 1815 /* Check to see if one of the movement types should be slowed down.
1752 * Second check makes sure that the movement types not being slowed 1816 * Second check makes sure that the movement types not being slowed
… …
1757 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1821 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1758 { 1822 {
1759 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1823 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1760 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1824 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1761 { 1825 {
1762
1763 float
1764 diff = tmp->move_slow_penalty * fabs (op->speed); 1826 float diff = tmp->move_slow_penalty * fabs (op->speed);
1765 1827
1766 if (op->type == PLAYER) 1828 if (op->is_player ())
1767 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1829 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1768 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1830 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1769 diff /= 4.0; 1831 diff /= 4.0;
1770 1832
1771 op->speed_left -= diff; 1833 op->speed_left -= diff;
1772 } 1834 }
1773 } 1835 }
… …
1979 * head of the object should correspond for the entire object. 2041 * head of the object should correspond for the entire object.
1980 */ 2042 */
1981 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 2043 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1982 continue; 2044 continue;
1983 2045
1984 if (ob->blocked (m, pos.x, pos.y)) 2046 if (ob->blocked (pos.m, pos.x, pos.y))
1985 continue; 2047 continue;
1986 2048
1987 altern [index++] = i; 2049 altern [index++] = i;
1988 } 2050 }
1989 2051
… …
2057 * there is capable of. 2119 * there is capable of.
2058 */ 2120 */
2059int 2121int
2060find_dir (maptile *m, int x, int y, object *exclude) 2122find_dir (maptile *m, int x, int y, object *exclude)
2061{ 2123{
2062 int i, max = SIZEOFFREE, mflags; 2124 int max = SIZEOFFREE, mflags;
2063
2064 sint16 nx, ny;
2065 object *tmp;
2066 maptile *mp;
2067
2068 MoveType blocked, move_type; 2125 MoveType move_type;
2069 2126
2070 if (exclude && exclude->head_ () != exclude) 2127 if (exclude && exclude->head_ () != exclude)
2071 { 2128 {
2072 exclude = exclude->head; 2129 exclude = exclude->head;
2073 move_type = exclude->move_type; 2130 move_type = exclude->move_type;
… …
2076 { 2133 {
2077 /* If we don't have anything, presume it can use all movement types. */ 2134 /* If we don't have anything, presume it can use all movement types. */
2078 move_type = MOVE_ALL; 2135 move_type = MOVE_ALL;
2079 } 2136 }
2080 2137
2081 for (i = 1; i < max; i++) 2138 for (int i = 1; i < max; i++)
2082 { 2139 {
2083 mp = m; 2140 mapxy pos (m, x, y);
2084 nx = x + freearr_x[i]; 2141 pos.move (i);
2085 ny = y + freearr_y[i];
2086 2142
2087 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2143 if (!pos.normalise ())
2088
2089 if (mflags & P_OUT_OF_MAP)
2090 max = maxfree[i]; 2144 max = maxfree[i];
2091 else 2145 else
2092 { 2146 {
2093 mapspace &ms = mp->at (nx, ny); 2147 mapspace &ms = *pos;
2094 2148
2095 blocked = ms.move_block;
2096
2097 if ((move_type & blocked) == move_type) 2149 if ((move_type & ms.move_block) == move_type)
2098 max = maxfree[i]; 2150 max = maxfree [i];
2099 else if (mflags & P_IS_ALIVE) 2151 else if (ms.flags () & P_IS_ALIVE)
2100 { 2152 {
2101 for (tmp = ms.bot; tmp; tmp = tmp->above) 2153 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2102 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2154 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2103 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2155 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2104 break;
2105
2106 if (tmp)
2107 return freedir[i]; 2156 return freedir [i];
2108 } 2157 }
2109 } 2158 }
2110 } 2159 }
2111 2160
2112 return 0; 2161 return 0;
… …
2187 * This basically means that if direction is 15, then it could either go 2236 * This basically means that if direction is 15, then it could either go
2188 * direction 4, 14, or 16 to get back to where we are. 2237 * direction 4, 14, or 16 to get back to where we are.
2189 * Moved from spell_util.c to object.c with the other related direction 2238 * Moved from spell_util.c to object.c with the other related direction
2190 * functions. 2239 * functions.
2191 */ 2240 */
2192int reduction_dir[SIZEOFFREE][3] = { 2241static const int reduction_dir[SIZEOFFREE][3] = {
2193 {0, 0, 0}, /* 0 */ 2242 {0, 0, 0}, /* 0 */
2194 {0, 0, 0}, /* 1 */ 2243 {0, 0, 0}, /* 1 */
2195 {0, 0, 0}, /* 2 */ 2244 {0, 0, 0}, /* 2 */
2196 {0, 0, 0}, /* 3 */ 2245 {0, 0, 0}, /* 3 */
2197 {0, 0, 0}, /* 4 */ 2246 {0, 0, 0}, /* 4 */
… …
2293int 2342int
2294can_pick (const object *who, const object *item) 2343can_pick (const object *who, const object *item)
2295{ 2344{
2296 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2345 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2297 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2346 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2298 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2347 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2299} 2348}
2300 2349
2301/* 2350/*
2302 * create clone from object to another 2351 * create clone from object to another
2303 */ 2352 */
… …
2335 return tmp; 2384 return tmp;
2336 2385
2337 return 0; 2386 return 0;
2338} 2387}
2339 2388
2340const shstr & 2389shstr_tmp
2341object::kv_get (const shstr &key) const 2390object::kv_get (shstr_tmp key) const
2342{ 2391{
2343 for (key_value *kv = key_values; kv; kv = kv->next) 2392 for (key_value *kv = key_values; kv; kv = kv->next)
2344 if (kv->key == key) 2393 if (kv->key == key)
2345 return kv->value; 2394 return kv->value;
2346 2395
2347 return shstr_null; 2396 return shstr ();
2348} 2397}
2349 2398
2350void 2399void
2351object::kv_set (const shstr &key, const shstr &value) 2400object::kv_set (shstr_tmp key, shstr_tmp value)
2352{ 2401{
2353 for (key_value *kv = key_values; kv; kv = kv->next) 2402 for (key_value *kv = key_values; kv; kv = kv->next)
2354 if (kv->key == key) 2403 if (kv->key == key)
2355 { 2404 {
2356 kv->value = value; 2405 kv->value = value;
… …
2365 2414
2366 key_values = kv; 2415 key_values = kv;
2367} 2416}
2368 2417
2369void 2418void
2370object::kv_del (const shstr &key) 2419object::kv_del (shstr_tmp key)
2371{ 2420{
2372 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2421 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2373 if ((*kvp)->key == key) 2422 if ((*kvp)->key == key)
2374 { 2423 {
2375 key_value *kv = *kvp; 2424 key_value *kv = *kvp;
… …
2468{ 2517{
2469 return map ? map->region (x, y) 2518 return map ? map->region (x, y)
2470 : region::default_region (); 2519 : region::default_region ();
2471} 2520}
2472 2521
2473const materialtype_t *
2474object::dominant_material () const
2475{
2476 if (materialtype_t *mt = name_to_material (materialname))
2477 return mt;
2478
2479 return name_to_material (shstr_unknown);
2480}
2481
2482void 2522void
2483object::open_container (object *new_container) 2523object::open_container (object *new_container)
2484{ 2524{
2485 if (container == new_container) 2525 if (container == new_container)
2486 return; 2526 return;
… …
2506 container = 0; 2546 container = 0;
2507 2547
2508 // client needs item update to make it work, client bug requires this to be separate 2548 // client needs item update to make it work, client bug requires this to be separate
2509 esrv_update_item (UPD_FLAGS, this, old_container); 2549 esrv_update_item (UPD_FLAGS, this, old_container);
2510 2550
2511 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2551 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2512 play_sound (sound_find ("chest_close")); 2552 play_sound (sound_find ("chest_close"));
2513 } 2553 }
2514 2554
2515 if (new_container) 2555 if (new_container)
2516 { 2556 {
… …
2526 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2566 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2527 new_container->insert (closer); 2567 new_container->insert (closer);
2528 } 2568 }
2529#endif 2569#endif
2530 2570
2531 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2571 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2532 2572
2533 // make sure the container is available, client bug requires this to be separate 2573 // make sure the container is available, client bug requires this to be separate
2534 esrv_send_item (this, new_container); 2574 esrv_send_item (this, new_container);
2535 2575
2536 new_container->flag [FLAG_APPLIED] = true; 2576 new_container->flag [FLAG_APPLIED] = true;
… …
2544// else if (!old_container->env && contr && contr->ns) 2584// else if (!old_container->env && contr && contr->ns)
2545// contr->ns->floorbox_reset (); 2585// contr->ns->floorbox_reset ();
2546} 2586}
2547 2587
2548object * 2588object *
2549object::force_find (const shstr name) 2589object::force_find (shstr_tmp name)
2550{ 2590{
2551 /* cycle through his inventory to look for the MARK we want to 2591 /* cycle through his inventory to look for the MARK we want to
2552 * place 2592 * place
2553 */ 2593 */
2554 for (object *tmp = inv; tmp; tmp = tmp->below) 2594 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2556 return splay (tmp); 2596 return splay (tmp);
2557 2597
2558 return 0; 2598 return 0;
2559} 2599}
2560 2600
2601//-GPL
2602
2561void 2603void
2604object::force_set_timer (int duration)
2605{
2606 this->duration = 1;
2607 this->speed_left = -1.f;
2608
2609 this->set_speed (duration ? 1.f / duration : 0.f);
2610}
2611
2612object *
2562object::force_add (const shstr name, int duration) 2613object::force_add (shstr_tmp name, int duration)
2563{ 2614{
2564 if (object *force = force_find (name)) 2615 if (object *force = force_find (name))
2565 force->destroy (); 2616 force->destroy ();
2566 2617
2567 object *force = get_archetype (FORCE_NAME); 2618 object *force = get_archetype (FORCE_NAME);
2568 2619
2569 force->slaying = name; 2620 force->slaying = name;
2570 force->stats.food = 1; 2621 force->force_set_timer (duration);
2571 force->speed_left = -1.f;
2572
2573 force->set_speed (duration ? 1.f / duration : 0.f);
2574 force->flag [FLAG_IS_USED_UP] = true;
2575 force->flag [FLAG_APPLIED] = true; 2622 force->flag [FLAG_APPLIED] = true;
2576 2623
2577 insert (force); 2624 return insert (force);
2578} 2625}
2579 2626
2580void 2627void
2581object::play_sound (faceidx sound) 2628object::play_sound (faceidx sound) const
2582{ 2629{
2583 if (!sound) 2630 if (!sound)
2584 return; 2631 return;
2585 2632
2586 if (flag [FLAG_REMOVED]) 2633 if (is_on_map ())
2634 map->play_sound (sound, x, y);
2635 else if (object *pl = in_player ())
2636 pl->contr->play_sound (sound);
2637}
2638
2639void
2640object::say_msg (const char *msg) const
2641{
2642 if (is_on_map ())
2643 map->say_msg (msg, x, y);
2644 else if (object *pl = in_player ())
2645 pl->contr->play_sound (sound);
2646}
2647
2648void
2649object::make_noise ()
2650{
2651 // we do not model noise in the map, so instead put
2652 // a temporary light into the noise source
2653 // could use the map instead, but that's less reliable for our
2654 // goal, which is to make invisibility a bit harder to exploit
2655
2656 // currently only works sensibly for players
2657 if (!is_player ())
2587 return; 2658 return;
2588 2659
2589 if (env) 2660 // find old force, or create new one
2590 { 2661 object *force = force_find (shstr_noise_force);
2591 if (object *pl = in_player ()) 2662
2592 pl->contr->play_sound (sound); 2663 if (force)
2593 } 2664 force->speed_left = -1.f; // patch old speed up
2594 else 2665 else
2595 map->play_sound (sound, x, y); 2666 {
2596} 2667 force = archetype::get (shstr_noise_force);
2597 2668
2669 force->slaying = shstr_noise_force;
2670 force->stats.food = 1;
2671 force->speed_left = -1.f;
2672
2673 force->set_speed (1.f / 4.f);
2674 force->flag [FLAG_IS_USED_UP] = true;
2675 force->flag [FLAG_APPLIED] = true;
2676
2677 insert (force);
2678 }
2679}
2680

Diff Legend

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