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.252 by root, Mon Aug 11 23:23:41 2008 UTC vs.
Revision 1.303 by root, Tue Nov 10 04:38:45 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. First part checks 261 /* Do not merge objects if nrof would overflow, assume nrof
192 * for unsigned overflow (2c), second part checks whether the result 262 * is always 0 .. 2**31-1 */
193 * would fit into a 32 bit signed int, which is often used to hold 263 if (ob1->nrof > 0x7fffffff - ob2->nrof)
194 * nrof values.
195 */
196 if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
197 return 0; 264 return 0;
198 265
199 /* If the objects have been identified, set the BEEN_APPLIED flag. 266 /* If the objects have been identified, set the BEEN_APPLIED flag.
200 * 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
201 * 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
… …
219 || ob1->skill != ob2->skill 286 || ob1->skill != ob2->skill
220 || ob1->value != ob2->value 287 || ob1->value != ob2->value
221 || ob1->animation_id != ob2->animation_id 288 || ob1->animation_id != ob2->animation_id
222 || (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
223 || ob1->client_type != ob2->client_type 290 || ob1->client_type != ob2->client_type
224 || ob1->materialname != ob2->materialname 291 || ob1->material != ob2->material
225 || ob1->lore != ob2->lore 292 || ob1->lore != ob2->lore
226 || ob1->subtype != ob2->subtype 293 || ob1->subtype != ob2->subtype
227 || ob1->move_type != ob2->move_type 294 || ob1->move_type != ob2->move_type
228 || ob1->move_block != ob2->move_block 295 || ob1->move_block != ob2->move_block
229 || ob1->move_allow != ob2->move_allow 296 || ob1->move_allow != ob2->move_allow
230 || ob1->move_on != ob2->move_on 297 || ob1->move_on != ob2->move_on
231 || ob1->move_off != ob2->move_off 298 || ob1->move_off != ob2->move_off
232 || ob1->move_slow != ob2->move_slow 299 || ob1->move_slow != ob2->move_slow
233 || ob1->move_slow_penalty != ob2->move_slow_penalty 300 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
234 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) 301 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 302 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
236 return 0; 303 return 0;
237 304
238 if ((ob1->flag ^ ob2->flag) 305 if ((ob1->flag ^ ob2->flag)
239 .reset (FLAG_INV_LOCKED) 306 .reset (FLAG_INV_LOCKED)
240 .reset (FLAG_CLIENT_SENT)
241 .reset (FLAG_REMOVED) 307 .reset (FLAG_REMOVED)
242 .any ()) 308 .any ())
243 return 0; 309 return 0;
244 310
245 /* This is really a spellbook check - we should in general 311 /* This is really a spellbook check - we should in general
… …
327 { 393 {
328 // see if we are in a container of sorts 394 // see if we are in a container of sorts
329 if (env) 395 if (env)
330 { 396 {
331 // the player inventory itself is always visible 397 // the player inventory itself is always visible
332 if (env->type == PLAYER) 398 if (env->is_player ())
333 return env; 399 return env;
334 400
335 // else a player could have our env open 401 // else a player could have our env open
336 object *envest = env->outer_env (); 402 object *envest = env->outer_env_or_self ();
337 403
338 // 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
339 // even if our inv is in a player. 405 // even if our inv is in a player.
340 if (envest->is_on_map ()) 406 if (envest->is_on_map ())
341 if (object *pl = envest->ms ().player ()) 407 if (object *pl = envest->ms ().player ())
342 if (pl->container == env) 408 if (pl->container_ () == env)
343 return pl; 409 return pl;
344 } 410 }
345 else 411 else
346 { 412 {
347 // maybe there is a player standing on the same mapspace 413 // maybe there is a player standing on the same mapspace
348 // this will catch the case where "this" is a player 414 // this will catch the case where "this" is a player
349 if (object *pl = ms ().player ()) 415 if (object *pl = ms ().player ())
350 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) 416 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
351 || this == pl->container) 417 || pl->container_ () == this)
352 return pl; 418 return pl;
353 } 419 }
354 } 420 }
355 421
356 return 0; 422 return 0;
… …
434 object_freezer freezer; 500 object_freezer freezer;
435 op->write (freezer); 501 op->write (freezer);
436 return freezer.as_string (); 502 return freezer.as_string ();
437} 503}
438 504
439/* 505char *
440 * get_nearest_part(multi-object, object 2) returns the part of the 506object::as_string ()
441 * multi-object 1 which is closest to the second object.
442 * If it's not a multi-object, it is returned.
443 */
444object *
445get_nearest_part (object *op, const object *pl)
446{ 507{
447 object *tmp, *closest; 508 return dump_object (this);
448 int last_dist, i;
449
450 if (!op->more)
451 return op;
452
453 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
454 tmp;
455 tmp = tmp->more)
456 if ((i = distance (tmp, pl)) < last_dist)
457 closest = tmp, last_dist = i;
458
459 return closest;
460} 509}
461 510
462/* 511/*
463 * 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.
464 * VERRRY slow. 513 * VERRRY slow.
… …
558 update_stats (); 607 update_stats ();
559 608
560 new_draw_info_format (NDI_UNIQUE, 0, this, 609 new_draw_info_format (NDI_UNIQUE, 0, this,
561 "You try to balance all your items at once, " 610 "You try to balance all your items at once, "
562 "but the %s is just too much for your body. " 611 "but the %s is just too much for your body. "
563 "[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);
564 return false; 614 return false;
565 } 615 }
566 616
567 //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);
568 } 618 }
… …
640 } 690 }
641 691
642 if (speed < 0) 692 if (speed < 0)
643 dst->speed_left -= rndm (); 693 dst->speed_left -= rndm ();
644 694
645 dst->set_speed (dst->speed); 695 dst->activate ();
646} 696}
647 697
648void 698void
649object::instantiate () 699object::instantiate ()
650{ 700{
… …
694 * 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.
695 */ 745 */
696void 746void
697object::set_speed (float speed) 747object::set_speed (float speed)
698{ 748{
699 if (flag [FLAG_FREED] && speed)
700 {
701 LOG (llevError, "Object %s is freed but has speed.\n", &name);
702 speed = 0;
703 }
704
705 this->speed = speed; 749 this->speed = speed;
706 750
707 if (has_active_speed ()) 751 if (has_active_speed ())
708 activate (); 752 activate ();
709 else 753 else
… …
759 803
760 if (!(m.flags_ & P_UPTODATE)) 804 if (!(m.flags_ & P_UPTODATE))
761 /* nop */; 805 /* nop */;
762 else if (action == UP_OBJ_INSERT) 806 else if (action == UP_OBJ_INSERT)
763 { 807 {
808#if 0
764 // this is likely overkill, TODO: revisit (schmorp) 809 // this is likely overkill, TODO: revisit (schmorp)
765 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 810 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
766 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 811 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
812 || (op->is_player () && !(m.flags_ & P_PLAYER))
767 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 813 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
768 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 814 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
769 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 815 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
770 || (m.move_on | op->move_on ) != m.move_on 816 || (m.move_on | op->move_on ) != m.move_on
771 || (m.move_off | op->move_off ) != m.move_off 817 || (m.move_off | op->move_off ) != m.move_off
772 || (m.move_slow | op->move_slow) != m.move_slow 818 || (m.move_slow | op->move_slow) != m.move_slow
773 /* 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
774 * have move_allow right now. 820 * have move_allow right now.
775 */ 821 */
776 || ((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
777 || 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)
778 m.flags_ = 0; 826 m.invalidate ();
827#endif
779 } 828 }
780 /* if the object is being removed, we can't make intelligent 829 /* if the object is being removed, we can't make intelligent
781 * decisions, because remove_ob can't really pass the object 830 * decisions, because remove_ob can't really pass the object
782 * that is being removed. 831 * that is being removed.
783 */ 832 */
784 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 833 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
785 m.flags_ = 0; 834 m.invalidate ();
786 else if (action == UP_OBJ_FACE) 835 else if (action == UP_OBJ_FACE)
787 /* Nothing to do for that case */ ; 836 /* Nothing to do for that case */ ;
788 else 837 else
789 LOG (llevError, "update_object called with invalid action: %d\n", action); 838 LOG (llevError, "update_object called with invalid action: %d\n", action);
790 839
… …
794 843
795object::object () 844object::object ()
796{ 845{
797 SET_FLAG (this, FLAG_REMOVED); 846 SET_FLAG (this, FLAG_REMOVED);
798 847
799 expmul = 1.0; 848 //expmul = 1.0; declared const for the time being
800 face = blank_face; 849 face = blank_face;
850 material = &material_null;
801} 851}
802 852
803object::~object () 853object::~object ()
804{ 854{
805 unlink (); 855 unlink ();
… …
834 /* If already on active list, don't do anything */ 884 /* If already on active list, don't do anything */
835 if (active) 885 if (active)
836 return; 886 return;
837 887
838 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
839 actives.insert (this); 893 actives.insert (this);
894 }
840} 895}
841 896
842void 897void
843object::activate_recursive () 898object::activate_recursive ()
844{ 899{
… …
909 || map->in_memory != MAP_ACTIVE 964 || map->in_memory != MAP_ACTIVE
910 || map->no_drop 965 || map->no_drop
911 || ms ().move_block == MOVE_ALL) 966 || ms ().move_block == MOVE_ALL)
912 { 967 {
913 while (inv) 968 while (inv)
914 inv->destroy (true); 969 inv->destroy ();
915 } 970 }
916 else 971 else
917 { /* Put objects in inventory onto this space */ 972 { /* Put objects in inventory onto this space */
918 while (inv) 973 while (inv)
919 { 974 {
… …
923 || op->flag [FLAG_NO_DROP] 978 || op->flag [FLAG_NO_DROP]
924 || op->type == RUNE 979 || op->type == RUNE
925 || op->type == TRAP 980 || op->type == TRAP
926 || op->flag [FLAG_IS_A_TEMPLATE] 981 || op->flag [FLAG_IS_A_TEMPLATE]
927 || op->flag [FLAG_DESTROY_ON_DEATH]) 982 || op->flag [FLAG_DESTROY_ON_DEATH])
928 op->destroy (true); 983 op->destroy ();
929 else 984 else
930 map->insert (op, x, y); 985 map->insert (op, x, y);
931 } 986 }
932 } 987 }
933} 988}
… …
962 1017
963void 1018void
964object::do_destroy () 1019object::do_destroy ()
965{ 1020{
966 if (flag [FLAG_IS_LINKED]) 1021 if (flag [FLAG_IS_LINKED])
967 remove_button_link (this); 1022 remove_link ();
968 1023
969 if (flag [FLAG_FRIENDLY]) 1024 if (flag [FLAG_FRIENDLY])
970 remove_friendly_object (this); 1025 remove_friendly_object (this);
971 1026
972 remove (); 1027 remove ();
… …
997 attacked_by = 0; 1052 attacked_by = 0;
998 current_weapon = 0; 1053 current_weapon = 0;
999} 1054}
1000 1055
1001void 1056void
1002object::destroy (bool destroy_inventory) 1057object::destroy ()
1003{ 1058{
1004 if (destroyed ()) 1059 if (destroyed ())
1005 return; 1060 return;
1006 1061
1007 if (!is_head () && !head->destroyed ()) 1062 if (!is_head () && !head->destroyed ())
1008 { 1063 {
1009 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1064 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1010 head->destroy (destroy_inventory); 1065 head->destroy ();
1011 return; 1066 return;
1012 } 1067 }
1013 1068
1014 destroy_inv (!destroy_inventory); 1069 destroy_inv (false);
1015 1070
1016 if (is_head ()) 1071 if (is_head ())
1017 if (sound_destroy) 1072 if (sound_destroy)
1018 play_sound (sound_destroy); 1073 play_sound (sound_destroy);
1019 else if (flag [FLAG_MONSTER]) 1074 else if (flag [FLAG_MONSTER])
… …
1030 * the previous environment. 1085 * the previous environment.
1031 */ 1086 */
1032void 1087void
1033object::do_remove () 1088object::do_remove ()
1034{ 1089{
1035 object *tmp, *last = 0;
1036 object *otmp;
1037
1038 if (flag [FLAG_REMOVED]) 1090 if (flag [FLAG_REMOVED])
1039 return; 1091 return;
1040 1092
1041 INVOKE_OBJECT (REMOVE, this); 1093 INVOKE_OBJECT (REMOVE, this);
1042 1094
… …
1055 if (object *pl = visible_to ()) 1107 if (object *pl = visible_to ())
1056 esrv_del_item (pl->contr, count); 1108 esrv_del_item (pl->contr, count);
1057 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
1058 1110
1059 adjust_weight (env, -total_weight ()); 1111 adjust_weight (env, -total_weight ());
1112
1113 object *pl = in_player ();
1060 1114
1061 /* we set up values so that it could be inserted into 1115 /* we set up values so that it could be inserted into
1062 * 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
1063 * to the caller to decide what we want to do. 1117 * to the caller to decide what we want to do.
1064 */ 1118 */
… …
1076 1130
1077 /* 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
1078 * made to players inventory. If set, avoiding the call 1132 * made to players inventory. If set, avoiding the call
1079 * to save cpu time. 1133 * to save cpu time.
1080 */ 1134 */
1081 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 {
1082 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 }
1083 } 1143 }
1084 else if (map) 1144 else if (map)
1085 { 1145 {
1086 map->dirty = true; 1146 map->dirty = true;
1087 mapspace &ms = this->ms (); 1147 mapspace &ms = this->ms ();
1088 1148
1089 if (object *pl = ms.player ()) 1149 if (object *pl = ms.player ())
1090 { 1150 {
1091 if (type == PLAYER) // this == pl(!) 1151 if (is_player ())
1092 { 1152 {
1153 if (!flag [FLAG_WIZPASS])
1154 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1155
1093 // leaving a spot always closes any open container on the ground 1156 // leaving a spot always closes any open container on the ground
1094 if (container && !container->env) 1157 if (container && !container->env)
1095 // this causes spurious floorbox updates, but it ensures 1158 // this causes spurious floorbox updates, but it ensures
1096 // that the CLOSE event is being sent. 1159 // that the CLOSE event is being sent.
1097 close_container (); 1160 close_container ();
1098 1161
1099 --map->players; 1162 --map->players;
1100 map->touch (); 1163 map->touch ();
1101 } 1164 }
1102 else if (pl->container == this) 1165 else if (pl->container_ () == this)
1103 { 1166 {
1104 // removing a container should close it 1167 // removing a container should close it
1105 close_container (); 1168 close_container ();
1106 } 1169 }
1107 1170
… …
1114 *(below ? &below->above : &ms.bot) = above; 1177 *(below ? &below->above : &ms.bot) = above;
1115 1178
1116 above = 0; 1179 above = 0;
1117 below = 0; 1180 below = 0;
1118 1181
1182 ms.invalidate ();
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 /* last == NULL if there are no objects on this space */
1161 //TODO: this makes little sense, why only update the topmost object?
1162 if (!last)
1163 map->at (x, y).flags_ = 0;
1164 else
1165 update_object (last, UP_OBJ_REMOVE);
1166
1167 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1168 update_all_los (map, x, y); 1221 update_all_los (map, x, y);
1169 } 1222 }
1170} 1223}
1171 1224
1172/* 1225/*
… …
1196 esrv_update_item (UPD_NROF, pl, top); 1249 esrv_update_item (UPD_NROF, pl, top);
1197 1250
1198 op->weight = 0; // cancel the addition above 1251 op->weight = 0; // cancel the addition above
1199 op->carrying = 0; // must be 0 already 1252 op->carrying = 0; // must be 0 already
1200 1253
1201 op->destroy (1); 1254 op->destroy ();
1202 1255
1203 return top; 1256 return top;
1204 } 1257 }
1205 1258
1206 return 0; 1259 return 0;
… …
1268 * just 'op' otherwise 1321 * just 'op' otherwise
1269 */ 1322 */
1270object * 1323object *
1271insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1324insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1272{ 1325{
1273 if (op->is_on_map ())
1274 {
1275 LOG (llevError, "insert_ob_in_map called for object already on map");
1276 abort ();
1277 }
1278
1279 if (op->env)
1280 {
1281 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1282 op->remove (); 1326 op->remove ();
1283 }
1284 1327
1285 if (op->face && !face_info (op->face))//D TODO: remove soon 1328 if (m == &freed_map)//D TODO: remove soon
1286 {//D 1329 {//D
1287 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
1288 op->face = 1;//D
1289 }//D 1331 }//D
1290 1332
1291 /* Ideally, the caller figures this out. However, it complicates a lot 1333 /* Ideally, the caller figures this out. However, it complicates a lot
1292 * 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
1293 * need extra work 1335 * need extra work
1294 */ 1336 */
1337 maptile *newmap = m;
1295 if (!xy_normalise (m, op->x, op->y)) 1338 if (!xy_normalise (newmap, op->x, op->y))
1296 { 1339 {
1297 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found 1340 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1298 return 0; 1341 return 0;
1299 } 1342 }
1300 1343
1301 if (object *more = op->more) 1344 if (object *more = op->more)
1302 if (!insert_ob_in_map (more, m, originator, flag)) 1345 if (!insert_ob_in_map (more, m, originator, flag))
1303 return 0; 1346 return 0;
1304 1347
1305 CLEAR_FLAG (op, FLAG_REMOVED); 1348 op->flag [FLAG_REMOVED] = false;
1306 1349 op->env = 0;
1307 op->map = m; 1350 op->map = newmap;
1351
1308 mapspace &ms = op->ms (); 1352 mapspace &ms = op->ms ();
1309 1353
1310 /* this has to be done after we translate the coordinates. 1354 /* this has to be done after we translate the coordinates.
1311 */ 1355 */
1312 if (op->nrof && !(flag & INS_NO_MERGE)) 1356 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1315 { 1359 {
1316 // TODO: we actually want to update tmp, not op, 1360 // TODO: we actually want to update tmp, not op,
1317 // but some caller surely breaks when we return tmp 1361 // but some caller surely breaks when we return tmp
1318 // from here :/ 1362 // from here :/
1319 op->nrof += tmp->nrof; 1363 op->nrof += tmp->nrof;
1320 tmp->destroy (1); 1364 tmp->destroy ();
1321 } 1365 }
1322 1366
1323 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 */
1324 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1368 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1325 1369
… …
1333 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");
1334 abort (); 1378 abort ();
1335 } 1379 }
1336 1380
1337 if (!originator->is_on_map ()) 1381 if (!originator->is_on_map ())
1382 {
1338 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",
1339 op->debug_desc (), originator->debug_desc ()); 1384 op->debug_desc (), originator->debug_desc ());
1385 abort ();
1386 }
1340 1387
1341 op->above = originator; 1388 op->above = originator;
1342 op->below = originator->below; 1389 op->below = originator->below;
1343 originator->below = op; 1390 originator->below = op;
1344 1391
… …
1430 op->below = top; 1477 op->below = top;
1431 *(op->above ? &op->above->below : &ms.top) = op; 1478 *(op->above ? &op->above->below : &ms.top) = op;
1432 } 1479 }
1433 } 1480 }
1434 1481
1435 if (op->type == PLAYER) 1482 if (op->is_player ())
1436 { 1483 {
1437 op->contr->do_los = 1; 1484 op->contr->do_los = 1;
1438 ++op->map->players; 1485 ++op->map->players;
1439 op->map->touch (); 1486 op->map->touch ();
1440 } 1487 }
… …
1455 * 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 -
1456 * this should get redone to only look for players within range, 1503 * this should get redone to only look for players within range,
1457 * or just updating the P_UPTODATE for spaces within this area 1504 * or just updating the P_UPTODATE for spaces within this area
1458 * of effect may be sufficient. 1505 * of effect may be sufficient.
1459 */ 1506 */
1460 if (op->map->darkness && (op->glow_radius != 0)) 1507 if (op->affects_los ())
1508 {
1509 op->ms ().invalidate ();
1461 update_all_los (op->map, op->x, op->y); 1510 update_all_los (op->map, op->x, op->y);
1511 }
1462 1512
1463 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1513 /* updates flags (blocked, alive, no magic, etc) for this map space */
1464 update_object (op, UP_OBJ_INSERT); 1514 update_object (op, UP_OBJ_INSERT);
1465 1515
1466 INVOKE_OBJECT (INSERT, op); 1516 INVOKE_OBJECT (INSERT, op);
… …
1473 * blocked() and wall() work properly), and these flags are updated by 1523 * blocked() and wall() work properly), and these flags are updated by
1474 * update_object(). 1524 * update_object().
1475 */ 1525 */
1476 1526
1477 /* 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 */
1478 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1528 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1479 { 1529 {
1480 if (check_move_on (op, originator)) 1530 if (check_move_on (op, originator))
1481 return 0; 1531 return 0;
1482 1532
1483 /* 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
… …
1494/* this function inserts an object in the map, but if it 1544/* this function inserts an object in the map, but if it
1495 * 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.
1496 * 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.
1497 */ 1547 */
1498void 1548void
1499replace_insert_ob_in_map (const char *arch_string, object *op) 1549replace_insert_ob_in_map (shstr_tmp archname, object *op)
1500{ 1550{
1501 /* first search for itself and remove any old instances */ 1551 /* first search for itself and remove any old instances */
1502 1552
1503 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1553 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1504 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1554 if (tmp->arch->archname == archname) /* same archetype */
1505 tmp->destroy (1); 1555 tmp->destroy ();
1506 1556
1507 object *tmp = arch_to_object (archetype::find (arch_string)); 1557 object *tmp = arch_to_object (archetype::find (archname));
1508 1558
1509 tmp->x = op->x; 1559 tmp->x = op->x;
1510 tmp->y = op->y; 1560 tmp->y = op->y;
1511 1561
1512 insert_ob_in_map (tmp, op->map, op, 0); 1562 insert_ob_in_map (tmp, op->map, op, 0);
… …
1517{ 1567{
1518 if (where->env) 1568 if (where->env)
1519 return where->env->insert (this); 1569 return where->env->insert (this);
1520 else 1570 else
1521 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;
1522} 1594}
1523 1595
1524/* 1596/*
1525 * decrease(object, number) decreases a specified number from 1597 * decrease(object, number) decreases a specified number from
1526 * 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
… …
1633 if (object *pl = tmp->visible_to ()) 1705 if (object *pl = tmp->visible_to ())
1634 esrv_update_item (UPD_NROF, pl, tmp); 1706 esrv_update_item (UPD_NROF, pl, tmp);
1635 1707
1636 adjust_weight (this, op->total_weight ()); 1708 adjust_weight (this, op->total_weight ());
1637 1709
1638 op->destroy (1); 1710 op->destroy ();
1639 op = tmp; 1711 op = tmp;
1640 goto inserted; 1712 goto inserted;
1641 } 1713 }
1642 1714
1643 op->owner = 0; // it's his/hers now. period. 1715 op->owner = 0; // it's his/hers now. period.
… …
1661 1733
1662 adjust_weight (this, op->total_weight ()); 1734 adjust_weight (this, op->total_weight ());
1663 1735
1664inserted: 1736inserted:
1665 /* 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 */
1666 if (op->glow_radius && map && map->darkness) 1738 if (op->glow_radius && is_on_map ())
1739 {
1740 update_stats ();
1667 update_all_los (map, x, y); 1741 update_all_los (map, x, y);
1668 1742 }
1743 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1669 // if this is a player's inventory, update stats 1744 // if this is a player's inventory, update stats
1670 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1671 update_stats (); 1745 update_stats ();
1672 1746
1673 INVOKE_OBJECT (INSERT, this); 1747 INVOKE_OBJECT (INSERT, this);
1674 1748
1675 return op; 1749 return op;
… …
1696 * on top. 1770 * on top.
1697 */ 1771 */
1698int 1772int
1699check_move_on (object *op, object *originator) 1773check_move_on (object *op, object *originator)
1700{ 1774{
1775 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1776 return 0;
1777
1701 object *tmp; 1778 object *tmp;
1702 maptile *m = op->map; 1779 maptile *m = op->map;
1703 int x = op->x, y = op->y; 1780 int x = op->x, y = op->y;
1704 1781
1705 MoveType move_on, move_slow, move_block; 1782 mapspace &ms = m->at (x, y);
1706 1783
1707 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1784 ms.update ();
1708 return 0;
1709 1785
1710 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1786 MoveType move_on = ms.move_on;
1711 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1787 MoveType move_slow = ms.move_slow;
1712 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1788 MoveType move_block = ms.move_block;
1713 1789
1714 /* 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,
1715 * 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
1716 * 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
1717 * as walking. 1793 * as walking.
… …
1728 return 0; 1804 return 0;
1729 1805
1730 /* The objects have to be checked from top to bottom. 1806 /* The objects have to be checked from top to bottom.
1731 * Hence, we first go to the top: 1807 * Hence, we first go to the top:
1732 */ 1808 */
1733 1809 for (object *next, *tmp = ms.top; tmp; tmp = next)
1734 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1735 {
1736 /* Trim the search when we find the first other spell effect
1737 * this helps performance so that if a space has 50 spell objects,
1738 * we don't need to check all of them.
1739 */
1740 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1741 break;
1742 } 1810 {
1811 next = tmp->below;
1743 1812
1744 for (; tmp; tmp = tmp->below)
1745 {
1746 if (tmp == op) 1813 if (tmp == op)
1747 continue; /* Can't apply yourself */ 1814 continue; /* Can't apply yourself */
1748 1815
1749 /* 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.
1750 * Second check makes sure that the movement types not being slowed 1817 * Second check makes sure that the movement types not being slowed
… …
1755 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1822 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1756 { 1823 {
1757 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1824 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1758 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1825 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1759 { 1826 {
1760
1761 float
1762 diff = tmp->move_slow_penalty * fabs (op->speed); 1827 float diff = tmp->move_slow_penalty * fabs (op->speed);
1763 1828
1764 if (op->type == PLAYER) 1829 if (op->is_player ())
1765 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)) ||
1766 (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)))
1767 diff /= 4.0; 1832 diff /= 4.0;
1768 1833
1769 op->speed_left -= diff; 1834 op->speed_left -= diff;
1770 } 1835 }
1771 } 1836 }
… …
1977 * head of the object should correspond for the entire object. 2042 * head of the object should correspond for the entire object.
1978 */ 2043 */
1979 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 2044 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1980 continue; 2045 continue;
1981 2046
1982 if (ob->blocked (m, pos.x, pos.y)) 2047 if (ob->blocked (pos.m, pos.x, pos.y))
1983 continue; 2048 continue;
1984 2049
1985 altern [index++] = i; 2050 altern [index++] = i;
1986 } 2051 }
1987 2052
… …
2055 * there is capable of. 2120 * there is capable of.
2056 */ 2121 */
2057int 2122int
2058find_dir (maptile *m, int x, int y, object *exclude) 2123find_dir (maptile *m, int x, int y, object *exclude)
2059{ 2124{
2060 int i, max = SIZEOFFREE, mflags; 2125 int max = SIZEOFFREE, mflags;
2061
2062 sint16 nx, ny;
2063 object *tmp;
2064 maptile *mp;
2065
2066 MoveType blocked, move_type; 2126 MoveType move_type;
2067 2127
2068 if (exclude && exclude->head_ () != exclude) 2128 if (exclude && exclude->head_ () != exclude)
2069 { 2129 {
2070 exclude = exclude->head; 2130 exclude = exclude->head;
2071 move_type = exclude->move_type; 2131 move_type = exclude->move_type;
… …
2074 { 2134 {
2075 /* 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. */
2076 move_type = MOVE_ALL; 2136 move_type = MOVE_ALL;
2077 } 2137 }
2078 2138
2079 for (i = 1; i < max; i++) 2139 for (int i = 1; i < max; i++)
2080 { 2140 {
2081 mp = m; 2141 mapxy pos (m, x, y);
2082 nx = x + freearr_x[i]; 2142 pos.move (i);
2083 ny = y + freearr_y[i];
2084 2143
2085 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2144 if (!pos.normalise ())
2086
2087 if (mflags & P_OUT_OF_MAP)
2088 max = maxfree[i]; 2145 max = maxfree[i];
2089 else 2146 else
2090 { 2147 {
2091 mapspace &ms = mp->at (nx, ny); 2148 mapspace &ms = *pos;
2092 2149
2093 blocked = ms.move_block;
2094
2095 if ((move_type & blocked) == move_type) 2150 if ((move_type & ms.move_block) == move_type)
2096 max = maxfree[i]; 2151 max = maxfree [i];
2097 else if (mflags & P_IS_ALIVE) 2152 else if (ms.flags () & P_IS_ALIVE)
2098 { 2153 {
2099 for (tmp = ms.bot; tmp; tmp = tmp->above) 2154 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2100 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2155 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2101 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2156 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2102 break;
2103
2104 if (tmp)
2105 return freedir[i]; 2157 return freedir [i];
2106 } 2158 }
2107 } 2159 }
2108 } 2160 }
2109 2161
2110 return 0; 2162 return 0;
… …
2185 * 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
2186 * 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.
2187 * 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
2188 * functions. 2240 * functions.
2189 */ 2241 */
2190int reduction_dir[SIZEOFFREE][3] = { 2242static const int reduction_dir[SIZEOFFREE][3] = {
2191 {0, 0, 0}, /* 0 */ 2243 {0, 0, 0}, /* 0 */
2192 {0, 0, 0}, /* 1 */ 2244 {0, 0, 0}, /* 1 */
2193 {0, 0, 0}, /* 2 */ 2245 {0, 0, 0}, /* 2 */
2194 {0, 0, 0}, /* 3 */ 2246 {0, 0, 0}, /* 3 */
2195 {0, 0, 0}, /* 4 */ 2247 {0, 0, 0}, /* 4 */
… …
2291int 2343int
2292can_pick (const object *who, const object *item) 2344can_pick (const object *who, const object *item)
2293{ 2345{
2294 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2346 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2295 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2347 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2296 !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));
2297} 2349}
2298 2350
2299/* 2351/*
2300 * create clone from object to another 2352 * create clone from object to another
2301 */ 2353 */
… …
2333 return tmp; 2385 return tmp;
2334 2386
2335 return 0; 2387 return 0;
2336} 2388}
2337 2389
2338const shstr & 2390shstr_tmp
2339object::kv_get (const shstr &key) const 2391object::kv_get (shstr_tmp key) const
2340{ 2392{
2341 for (key_value *kv = key_values; kv; kv = kv->next) 2393 for (key_value *kv = key_values; kv; kv = kv->next)
2342 if (kv->key == key) 2394 if (kv->key == key)
2343 return kv->value; 2395 return kv->value;
2344 2396
2345 return shstr_null; 2397 return shstr ();
2346} 2398}
2347 2399
2348void 2400void
2349object::kv_set (const shstr &key, const shstr &value) 2401object::kv_set (shstr_tmp key, shstr_tmp value)
2350{ 2402{
2351 for (key_value *kv = key_values; kv; kv = kv->next) 2403 for (key_value *kv = key_values; kv; kv = kv->next)
2352 if (kv->key == key) 2404 if (kv->key == key)
2353 { 2405 {
2354 kv->value = value; 2406 kv->value = value;
… …
2363 2415
2364 key_values = kv; 2416 key_values = kv;
2365} 2417}
2366 2418
2367void 2419void
2368object::kv_del (const shstr &key) 2420object::kv_del (shstr_tmp key)
2369{ 2421{
2370 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2422 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2371 if ((*kvp)->key == key) 2423 if ((*kvp)->key == key)
2372 { 2424 {
2373 key_value *kv = *kvp; 2425 key_value *kv = *kvp;
… …
2466{ 2518{
2467 return map ? map->region (x, y) 2519 return map ? map->region (x, y)
2468 : region::default_region (); 2520 : region::default_region ();
2469} 2521}
2470 2522
2471const materialtype_t *
2472object::dominant_material () const
2473{
2474 if (materialtype_t *mt = name_to_material (materialname))
2475 return mt;
2476
2477 return name_to_material (shstr_unknown);
2478}
2479
2480void 2523void
2481object::open_container (object *new_container) 2524object::open_container (object *new_container)
2482{ 2525{
2483 if (container == new_container) 2526 if (container == new_container)
2484 return; 2527 return;
… …
2504 container = 0; 2547 container = 0;
2505 2548
2506 // 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
2507 esrv_update_item (UPD_FLAGS, this, old_container); 2550 esrv_update_item (UPD_FLAGS, this, old_container);
2508 2551
2509 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 ());
2510 play_sound (sound_find ("chest_close")); 2553 play_sound (sound_find ("chest_close"));
2511 } 2554 }
2512 2555
2513 if (new_container) 2556 if (new_container)
2514 { 2557 {
… …
2524 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2567 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2525 new_container->insert (closer); 2568 new_container->insert (closer);
2526 } 2569 }
2527#endif 2570#endif
2528 2571
2529 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 ());
2530 2573
2531 // 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
2532 esrv_send_item (this, new_container); 2575 esrv_send_item (this, new_container);
2533 2576
2534 new_container->flag [FLAG_APPLIED] = true; 2577 new_container->flag [FLAG_APPLIED] = true;
… …
2542// else if (!old_container->env && contr && contr->ns) 2585// else if (!old_container->env && contr && contr->ns)
2543// contr->ns->floorbox_reset (); 2586// contr->ns->floorbox_reset ();
2544} 2587}
2545 2588
2546object * 2589object *
2547object::force_find (const shstr name) 2590object::force_find (shstr_tmp name)
2548{ 2591{
2549 /* 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
2550 * place 2593 * place
2551 */ 2594 */
2552 for (object *tmp = inv; tmp; tmp = tmp->below) 2595 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2554 return splay (tmp); 2597 return splay (tmp);
2555 2598
2556 return 0; 2599 return 0;
2557} 2600}
2558 2601
2602//-GPL
2603
2559void 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 *
2560object::force_add (const shstr name, int duration) 2614object::force_add (shstr_tmp name, int duration)
2561{ 2615{
2562 if (object *force = force_find (name)) 2616 if (object *force = force_find (name))
2563 force->destroy (); 2617 force->destroy ();
2564 2618
2565 object *force = get_archetype (FORCE_NAME); 2619 object *force = get_archetype (FORCE_NAME);
2566 2620
2567 force->slaying = name; 2621 force->slaying = name;
2568 force->stats.food = 1; 2622 force->force_set_timer (duration);
2569 force->speed_left = -1.f;
2570
2571 force->set_speed (duration ? 1.f / duration : 0.f);
2572 force->flag [FLAG_IS_USED_UP] = true;
2573 force->flag [FLAG_APPLIED] = true; 2623 force->flag [FLAG_APPLIED] = true;
2574 2624
2575 insert (force); 2625 return insert (force);
2576} 2626}
2577 2627
2578void 2628void
2579object::play_sound (faceidx sound) 2629object::play_sound (faceidx sound) const
2580{ 2630{
2581 if (!sound) 2631 if (!sound)
2582 return; 2632 return;
2583 2633
2584 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 ())
2585 return; 2659 return;
2586 2660
2587 if (env) 2661 // find old force, or create new one
2588 { 2662 object *force = force_find (shstr_noise_force);
2589 if (object *pl = in_player ()) 2663
2590 pl->contr->play_sound (sound); 2664 if (force)
2591 } 2665 force->speed_left = -1.f; // patch old speed up
2592 else 2666 else
2593 map->play_sound (sound, x, y); 2667 {
2594} 2668 force = archetype::get (shstr_noise_force);
2595 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