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.246 by root, Thu May 22 15:37:44 2008 UTC vs.
Revision 1.314 by root, Fri Mar 26 00:59:20 2010 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,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 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>
25#include <stdio.h> 26#include <stdio.h>
26#include <sys/types.h> 27#include <sys/types.h>
27#include <sys/uio.h> 28#include <sys/uio.h>
28#include <object.h> 29#include <object.h>
29#include <sproto.h> 30#include <sproto.h>
30#include <loader.h>
31 31
32#include <bitset> 32#include <bitset>
33 33
34UUID UUID::cur; 34UUID UUID::cur;
35static uint64_t seq_next_save; 35static uint64_t seq_next_save;
36static const uint64 UUID_GAP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
37uint32_t mapspace::smellcount = 10000;
37 38
38objectvec objects; 39objectvec objects;
39activevec actives; 40activevec actives;
41
42//+GPL
40 43
41short freearr_x[SIZEOFFREE] = { 44short freearr_x[SIZEOFFREE] = {
42 0, 45 0,
43 0, 1, 1, 1, 0, -1, -1, -1, 46 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, 47 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
… …
48 0, 51 0,
49 -1, -1, 0, 1, 1, 1, 0, -1, 52 -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, 53 -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 54 -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}; 55};
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] = { 56int freedir[SIZEOFFREE] = {
60 0, 57 0,
61 1, 2, 3, 4, 5, 6, 7, 8, 58 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, 59 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 60 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
64}; 61};
65 62
63static int maxfree[SIZEOFFREE] = {
64 0,
65 9, 10, 13, 14, 17, 18, 21, 22,
66 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
67 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
68};
69
66static void 70static void
67write_uuid (uval64 skip, bool sync) 71write_uuid (uval64 skip, bool sync)
68{ 72{
69 CALL_BEGIN (2); 73 CALL_BEGIN (2);
70 CALL_ARG_SV (newSVval64 (skip)); 74 CALL_ARG_SV (newSVval64 (skip));
… …
72 CALL_CALL ("cf::write_uuid", G_DISCARD); 76 CALL_CALL ("cf::write_uuid", G_DISCARD);
73 CALL_END; 77 CALL_END;
74} 78}
75 79
76static void 80static void
77read_uuid (void) 81read_uuid ()
78{ 82{
79 char filename[MAX_BUF]; 83 char filename[MAX_BUF];
80 84
81 sprintf (filename, "%s/uuid", settings.localdir); 85 sprintf (filename, "%s/uuid", settings.localdir);
82 86
… …
96 100
97 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 101 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98 _exit (1); 102 _exit (1);
99 } 103 }
100 104
101 UUID::BUF buf; 105 char buf [UUID::MAX_LEN];
102 buf[0] = 0; 106 buf[0] = 0;
103 fgets (buf, sizeof (buf), fp); 107 fgets (buf, sizeof (buf), fp);
104 108
105 if (!UUID::cur.parse (buf)) 109 if (!UUID::cur.parse (buf))
106 { 110 {
… …
133 137
134void 138void
135UUID::init () 139UUID::init ()
136{ 140{
137 read_uuid (); 141 read_uuid ();
142}
143
144bool
145UUID::parse (const char *s)
146{
147 if (*s++ != '<' || *s++ != '1' || *s++ != '.')
148 return false;
149
150 seq = 0;
151
152 while (*s != '>')
153 {
154 if (*s < '0')
155 return false;
156
157 // this gives nice branchless code with gcc
158 assert ('0' < 'a' && '0' == 48 && 'a' == 97);
159 int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
160
161 seq = (seq << 4) | digit;
162
163 ++s;
164 }
165
166 return true;
167}
168
169char *
170UUID::append (char *buf) const
171{
172 *buf++ = '<';
173 *buf++ = '1';
174 *buf++ = '.';
175
176 uint64_t seq = this->seq;
177 const int bits = 64;
178 char nz = 0;
179 static const char tohex [] = "0123456789abcdef";
180
181 // assert (len >= 3 + bits / 4 + 1 + 1);
182 for (int i = bits / 4; --i; )
183 {
184 uint8_t digit = seq >> (bits - 4);
185
186 *buf = tohex [digit];
187 nz |= digit;
188 buf += nz ? 1 : 0;
189 seq <<= 4;
190 }
191
192 // last digit is special - always emit
193 uint8_t digit = seq >> (bits - 4);
194 *buf++ = tohex [digit];
195
196 *buf++ = '>';
197
198 return buf;
199}
200
201char *
202UUID::c_str () const
203{
204 static char buf [MAX_LEN];
205 *append (buf) = 0;
206 return buf;
138} 207}
139 208
140/* Returns TRUE if every key_values in wants has a partner with the same value in has. */ 209/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141static bool 210static bool
142compare_ob_value_lists_one (const object *wants, const object *has) 211compare_ob_value_lists_one (const object *wants, const object *has)
… …
178 * Improvements made with merge: Better checking on potion, and also 247 * Improvements made with merge: Better checking on potion, and also
179 * check weight 248 * check weight
180 */ 249 */
181bool object::can_merge_slow (object *ob1, object *ob2) 250bool object::can_merge_slow (object *ob1, object *ob2)
182{ 251{
183 /* A couple quicksanity checks */ 252 /* A couple quick sanity checks */
184 if (ob1 == ob2 253 if (ob1 == ob2
185 || ob1->type != ob2->type 254 || ob1->type != ob2->type
186 || ob1->speed != ob2->speed
187 || ob1->value != ob2->value 255 || ob1->value != ob2->value
188 || ob1->name != ob2->name) 256 || ob1->name != ob2->name
257 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
189 return 0; 258 return 0;
190 259
191 /* Do not merge objects if nrof would overflow. First part checks 260 /* Do not merge objects if nrof would overflow, assume nrof
192 * for unsigned overflow (2c), second part checks whether the result 261 * is always 0 .. 2**31-1 */
193 * would fit into a 32 bit signed int, which is often used to hold 262 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; 263 return 0;
198 264
199 /* If the objects have been identified, set the BEEN_APPLIED flag. 265 /* 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 266 * 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 267 * just can't ignore the been applied or identified flags, as they
… …
217 || ob1->magic != ob2->magic 283 || ob1->magic != ob2->magic
218 || ob1->slaying != ob2->slaying 284 || ob1->slaying != ob2->slaying
219 || ob1->skill != ob2->skill 285 || ob1->skill != ob2->skill
220 || ob1->value != ob2->value 286 || ob1->value != ob2->value
221 || ob1->animation_id != ob2->animation_id 287 || ob1->animation_id != ob2->animation_id
222 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other 288 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
223 || ob1->client_type != ob2->client_type 289 || ob1->client_type != ob2->client_type
224 || ob1->materialname != ob2->materialname 290 || ob1->material != ob2->material
225 || ob1->lore != ob2->lore 291 || ob1->lore != ob2->lore
226 || ob1->subtype != ob2->subtype 292 || ob1->subtype != ob2->subtype
227 || ob1->move_type != ob2->move_type 293 || ob1->move_type != ob2->move_type
228 || ob1->move_block != ob2->move_block 294 || ob1->move_block != ob2->move_block
229 || ob1->move_allow != ob2->move_allow 295 || ob1->move_allow != ob2->move_allow
230 || ob1->move_on != ob2->move_on 296 || ob1->move_on != ob2->move_on
231 || ob1->move_off != ob2->move_off 297 || ob1->move_off != ob2->move_off
232 || ob1->move_slow != ob2->move_slow 298 || ob1->move_slow != ob2->move_slow
233 || ob1->move_slow_penalty != ob2->move_slow_penalty 299 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
234 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) 300 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 301 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
236 return 0; 302 return 0;
237 303
238 if ((ob1->flag ^ ob2->flag) 304 if ((ob1->flag ^ ob2->flag)
239 .reset (FLAG_INV_LOCKED) 305 .reset (FLAG_INV_LOCKED)
240 .reset (FLAG_CLIENT_SENT)
241 .reset (FLAG_REMOVED) 306 .reset (FLAG_REMOVED)
242 .any ()) 307 .any ())
243 return 0; 308 return 0;
244 309
245 /* This is really a spellbook check - we should in general 310 /* This is really a spellbook check - we should in general
… …
327 { 392 {
328 // see if we are in a container of sorts 393 // see if we are in a container of sorts
329 if (env) 394 if (env)
330 { 395 {
331 // the player inventory itself is always visible 396 // the player inventory itself is always visible
332 if (env->type == PLAYER) 397 if (env->is_player ())
333 return env; 398 return env;
334 399
335 // else a player could have our env open 400 // else a player could have our env open
336 object *envest = env->outer_env (); 401 object *envest = env->outer_env_or_self ();
337 402
338 // the player itself is always on a map, so we will find him here 403 // the player itself is always on a map, so we will find him here
339 // even if our inv is in a player. 404 // even if our inv is in a player.
340 if (envest->is_on_map ()) 405 if (envest->is_on_map ())
341 if (object *pl = envest->ms ().player ()) 406 if (object *pl = envest->ms ().player ())
342 if (pl->container == env) 407 if (pl->container_ () == env)
343 return pl; 408 return pl;
344 } 409 }
345 else 410 else
346 { 411 {
347 // maybe there is a player standing on the same mapspace 412 // maybe there is a player standing on the same mapspace
348 // this will catch the case where "this" is a player 413 // this will catch the case where "this" is a player
349 if (object *pl = ms ().player ()) 414 if (object *pl = ms ().player ())
350 if (!pl->container || this == pl->container) 415 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
416 || pl->container_ () == this)
351 return pl; 417 return pl;
352 } 418 }
353 } 419 }
354 420
355 return 0; 421 return 0;
… …
433 object_freezer freezer; 499 object_freezer freezer;
434 op->write (freezer); 500 op->write (freezer);
435 return freezer.as_string (); 501 return freezer.as_string ();
436} 502}
437 503
438/* 504char *
439 * get_nearest_part(multi-object, object 2) returns the part of the 505object::as_string ()
440 * multi-object 1 which is closest to the second object.
441 * If it's not a multi-object, it is returned.
442 */
443object *
444get_nearest_part (object *op, const object *pl)
445{ 506{
446 object *tmp, *closest; 507 return dump_object (this);
447 int last_dist, i;
448
449 if (!op->more)
450 return op;
451
452 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
453 tmp;
454 tmp = tmp->more)
455 if ((i = distance (tmp, pl)) < last_dist)
456 closest = tmp, last_dist = i;
457
458 return closest;
459} 508}
460 509
461/* 510/*
462 * Returns the object which has the count-variable equal to the argument. 511 * Returns the object which has the count-variable equal to the argument.
463 * VERRRY slow. 512 * VERRRY slow.
… …
465object * 514object *
466find_object (tag_t i) 515find_object (tag_t i)
467{ 516{
468 for_all_objects (op) 517 for_all_objects (op)
469 if (op->count == i) 518 if (op->count == i)
519 return op;
520
521 return 0;
522}
523
524/*
525 * Returns the object which has the uuid equal to the argument.
526 * MOAR VERRRY slow.
527 */
528
529object *
530find_object_uuid (UUID i)
531{
532 for_all_objects (op)
533 if (op->uuid == i)
470 return op; 534 return op;
471 535
472 return 0; 536 return 0;
473} 537}
474 538
… …
557 update_stats (); 621 update_stats ();
558 622
559 new_draw_info_format (NDI_UNIQUE, 0, this, 623 new_draw_info_format (NDI_UNIQUE, 0, this,
560 "You try to balance all your items at once, " 624 "You try to balance all your items at once, "
561 "but the %s is just too much for your body. " 625 "but the %s is just too much for your body. "
562 "[You need to unapply some items first.]", &ob->name); 626 "[You need to unapply some items first - use the 'body' command to see "
627 "how many items you cna wera on a specific body part.]", &ob->name);
563 return false; 628 return false;
564 } 629 }
565 630
566 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 631 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
567 } 632 }
… …
636 tail = new_link; 701 tail = new_link;
637 } 702 }
638 } 703 }
639 } 704 }
640 705
641 if (speed < 0) 706 dst->activate ();
642 dst->speed_left -= rndm ();
643
644 dst->set_speed (dst->speed);
645} 707}
646 708
647void 709void
648object::instantiate () 710object::instantiate ()
649{ 711{
650 if (!uuid.seq) // HACK 712 if (!uuid.seq) // HACK
651 uuid = UUID::gen (); 713 uuid = UUID::gen ();
652 714
715 // TODO: unclean state changes, should nt be done in copy_to AND instantiate
716 if (flag [FLAG_RANDOM_SPEED] && speed)
717 speed_left = - speed - rndm (); // TODO animation
718 else
653 speed_left = -0.1f; 719 speed_left = -1.;
720
654 /* copy the body_info to the body_used - this is only really 721 /* copy the body_info to the body_used - this is only really
655 * need for monsters, but doesn't hurt to do it for everything. 722 * need for monsters, but doesn't hurt to do it for everything.
656 * by doing so, when a monster is created, it has good starting 723 * by doing so, when a monster is created, it has good starting
657 * values for the body_used info, so when items are created 724 * values for the body_used info, so when items are created
658 * for it, they can be properly equipped. 725 * for it, they can be properly equipped.
… …
666object * 733object *
667object::clone () 734object::clone ()
668{ 735{
669 object *neu = create (); 736 object *neu = create ();
670 copy_to (neu); 737 copy_to (neu);
738
739 // TODO: unclean state changes, should not be done in clone AND instantiate
740 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
741 neu->speed_left = - neu->speed - rndm (); // TODO animation
742
671 neu->map = map; // not copied by copy_to 743 neu->map = map; // not copied by copy_to
672 return neu; 744 return neu;
673} 745}
674 746
675/* 747/*
… …
693 * This function needs to be called whenever the speed of an object changes. 765 * This function needs to be called whenever the speed of an object changes.
694 */ 766 */
695void 767void
696object::set_speed (float speed) 768object::set_speed (float speed)
697{ 769{
698 if (flag [FLAG_FREED] && speed)
699 {
700 LOG (llevError, "Object %s is freed but has speed.\n", &name);
701 speed = 0;
702 }
703
704 this->speed = speed; 770 this->speed = speed;
705 771
706 if (has_active_speed ()) 772 if (has_active_speed ())
707 activate (); 773 activate ();
708 else 774 else
… …
758 824
759 if (!(m.flags_ & P_UPTODATE)) 825 if (!(m.flags_ & P_UPTODATE))
760 /* nop */; 826 /* nop */;
761 else if (action == UP_OBJ_INSERT) 827 else if (action == UP_OBJ_INSERT)
762 { 828 {
829#if 0
763 // this is likely overkill, TODO: revisit (schmorp) 830 // this is likely overkill, TODO: revisit (schmorp)
764 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 831 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
765 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 832 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
766 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 833 || (op->is_player () && !(m.flags_ & P_PLAYER))
767 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 834 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
768 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 835 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
769 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 836 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
770 || (m.move_on | op->move_on ) != m.move_on 837 || (m.move_on | op->move_on ) != m.move_on
771 || (m.move_off | op->move_off ) != m.move_off 838 || (m.move_off | op->move_off ) != m.move_off
772 || (m.move_slow | op->move_slow) != m.move_slow 839 || (m.move_slow | op->move_slow) != m.move_slow
773 /* This isn't perfect, but I don't expect a lot of objects to 840 /* This isn't perfect, but I don't expect a lot of objects to
774 * to have move_allow right now. 841 * have move_allow right now.
775 */ 842 */
776 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 843 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
844 m.invalidate ();
845#else
777 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 846 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
778 m.flags_ = 0; 847 m.invalidate ();
848#endif
779 } 849 }
780 /* if the object is being removed, we can't make intelligent 850 /* if the object is being removed, we can't make intelligent
781 * decisions, because remove_ob can't really pass the object 851 * decisions, because remove_ob can't really pass the object
782 * that is being removed. 852 * that is being removed.
783 */ 853 */
784 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 854 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
785 m.flags_ = 0; 855 m.invalidate ();
786 else if (action == UP_OBJ_FACE) 856 else if (action == UP_OBJ_FACE)
787 /* Nothing to do for that case */ ; 857 /* Nothing to do for that case */ ;
788 else 858 else
789 LOG (llevError, "update_object called with invalid action: %d\n", action); 859 LOG (llevError, "update_object called with invalid action: %d\n", action);
790 860
… …
794 864
795object::object () 865object::object ()
796{ 866{
797 SET_FLAG (this, FLAG_REMOVED); 867 SET_FLAG (this, FLAG_REMOVED);
798 868
799 expmul = 1.0; 869 //expmul = 1.0; declared const for the time being
800 face = blank_face; 870 face = blank_face;
871 material = MATERIAL_NULL;
801} 872}
802 873
803object::~object () 874object::~object ()
804{ 875{
805 unlink (); 876 unlink ();
… …
834 /* If already on active list, don't do anything */ 905 /* If already on active list, don't do anything */
835 if (active) 906 if (active)
836 return; 907 return;
837 908
838 if (has_active_speed ()) 909 if (has_active_speed ())
910 {
911 if (flag [FLAG_FREED])
912 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
913
839 actives.insert (this); 914 actives.insert (this);
915 }
840} 916}
841 917
842void 918void
843object::activate_recursive () 919object::activate_recursive ()
844{ 920{
… …
909 || map->in_memory != MAP_ACTIVE 985 || map->in_memory != MAP_ACTIVE
910 || map->no_drop 986 || map->no_drop
911 || ms ().move_block == MOVE_ALL) 987 || ms ().move_block == MOVE_ALL)
912 { 988 {
913 while (inv) 989 while (inv)
914 {
915 inv->destroy_inv (false);
916 inv->destroy (); 990 inv->destroy ();
917 }
918 } 991 }
919 else 992 else
920 { /* Put objects in inventory onto this space */ 993 { /* Put objects in inventory onto this space */
921 while (inv) 994 while (inv)
922 { 995 {
… …
926 || op->flag [FLAG_NO_DROP] 999 || op->flag [FLAG_NO_DROP]
927 || op->type == RUNE 1000 || op->type == RUNE
928 || op->type == TRAP 1001 || op->type == TRAP
929 || op->flag [FLAG_IS_A_TEMPLATE] 1002 || op->flag [FLAG_IS_A_TEMPLATE]
930 || op->flag [FLAG_DESTROY_ON_DEATH]) 1003 || op->flag [FLAG_DESTROY_ON_DEATH])
931 op->destroy (true); 1004 op->destroy ();
932 else 1005 else
933 map->insert (op, x, y); 1006 map->insert (op, x, y);
934 } 1007 }
935 } 1008 }
936} 1009}
… …
965 1038
966void 1039void
967object::do_destroy () 1040object::do_destroy ()
968{ 1041{
969 if (flag [FLAG_IS_LINKED]) 1042 if (flag [FLAG_IS_LINKED])
970 remove_button_link (this); 1043 remove_link ();
971 1044
972 if (flag [FLAG_FRIENDLY]) 1045 if (flag [FLAG_FRIENDLY])
973 remove_friendly_object (this); 1046 remove_friendly_object (this);
974 1047
975 remove (); 1048 remove ();
… …
1000 attacked_by = 0; 1073 attacked_by = 0;
1001 current_weapon = 0; 1074 current_weapon = 0;
1002} 1075}
1003 1076
1004void 1077void
1005object::destroy (bool destroy_inventory) 1078object::destroy ()
1006{ 1079{
1007 if (destroyed ()) 1080 if (destroyed ())
1008 return; 1081 return;
1009 1082
1010 if (!is_head () && !head->destroyed ()) 1083 if (!is_head () && !head->destroyed ())
1011 { 1084 {
1012 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1085 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1013 head->destroy (destroy_inventory); 1086 head->destroy ();
1014 return; 1087 return;
1015 } 1088 }
1016 1089
1017 destroy_inv (!destroy_inventory); 1090 destroy_inv (false);
1018 1091
1019 if (is_head ()) 1092 if (is_head ())
1020 if (sound_destroy) 1093 if (sound_destroy)
1021 play_sound (sound_destroy); 1094 play_sound (sound_destroy);
1022 else if (flag [FLAG_MONSTER]) 1095 else if (flag [FLAG_MONSTER])
… …
1033 * the previous environment. 1106 * the previous environment.
1034 */ 1107 */
1035void 1108void
1036object::do_remove () 1109object::do_remove ()
1037{ 1110{
1038 object *tmp, *last = 0;
1039 object *otmp;
1040
1041 if (flag [FLAG_REMOVED]) 1111 if (flag [FLAG_REMOVED])
1042 return; 1112 return;
1043 1113
1044 INVOKE_OBJECT (REMOVE, this); 1114 INVOKE_OBJECT (REMOVE, this);
1045 1115
… …
1058 if (object *pl = visible_to ()) 1128 if (object *pl = visible_to ())
1059 esrv_del_item (pl->contr, count); 1129 esrv_del_item (pl->contr, count);
1060 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1130 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1061 1131
1062 adjust_weight (env, -total_weight ()); 1132 adjust_weight (env, -total_weight ());
1133
1134 object *pl = in_player ();
1063 1135
1064 /* we set up values so that it could be inserted into 1136 /* we set up values so that it could be inserted into
1065 * the map, but we don't actually do that - it is up 1137 * the map, but we don't actually do that - it is up
1066 * to the caller to decide what we want to do. 1138 * to the caller to decide what we want to do.
1067 */ 1139 */
… …
1075 1147
1076 above = 0; 1148 above = 0;
1077 below = 0; 1149 below = 0;
1078 env = 0; 1150 env = 0;
1079 1151
1080 /* NO_FIX_PLAYER is set when a great many changes are being 1152 if (pl && pl->is_player ())
1081 * made to players inventory. If set, avoiding the call
1082 * to save cpu time.
1083 */ 1153 {
1084 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1154 pl->contr->queue_stats_update ();
1085 otmp->update_stats (); 1155
1156 if (glow_radius && pl->is_on_map ())
1157 update_all_los (pl->map, pl->x, pl->y);
1158 }
1086 } 1159 }
1087 else if (map) 1160 else if (map)
1088 { 1161 {
1089 map->dirty = true; 1162 map->dirty = true;
1090 mapspace &ms = this->ms (); 1163 mapspace &ms = this->ms ();
1091 1164
1092 if (object *pl = ms.player ()) 1165 if (object *pl = ms.player ())
1093 { 1166 {
1094 if (type == PLAYER) // this == pl(!) 1167 if (is_player ())
1095 { 1168 {
1169 if (!flag [FLAG_WIZPASS])
1170 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1171
1096 // leaving a spot always closes any open container on the ground 1172 // leaving a spot always closes any open container on the ground
1097 if (container && !container->env) 1173 if (container && !container->env)
1098 // this causes spurious floorbox updates, but it ensures 1174 // this causes spurious floorbox updates, but it ensures
1099 // that the CLOSE event is being sent. 1175 // that the CLOSE event is being sent.
1100 close_container (); 1176 close_container ();
1101 1177
1102 --map->players; 1178 --map->players;
1103 map->touch (); 1179 map->touch ();
1104 } 1180 }
1105 else if (pl->container == this) 1181 else if (pl->container_ () == this)
1106 { 1182 {
1107 // removing a container should close it 1183 // removing a container should close it
1108 close_container (); 1184 close_container ();
1109 } 1185 }
1110 1186
… …
1117 *(below ? &below->above : &ms.bot) = above; 1193 *(below ? &below->above : &ms.bot) = above;
1118 1194
1119 above = 0; 1195 above = 0;
1120 below = 0; 1196 below = 0;
1121 1197
1198 ms.invalidate ();
1199
1122 if (map->in_memory == MAP_SAVING) 1200 if (map->in_memory == MAP_SAVING)
1123 return; 1201 return;
1124 1202
1125 int check_walk_off = !flag [FLAG_NO_APPLY]; 1203 int check_walk_off = !flag [FLAG_NO_APPLY];
1126 1204
1127 if (object *pl = ms.player ()) 1205 if (object *pl = ms.player ())
1128 { 1206 {
1129 if (pl->container == this) 1207 if (pl->container_ () == this)
1130 /* If a container that the player is currently using somehow gets 1208 /* If a container that the player is currently using somehow gets
1131 * removed (most likely destroyed), update the player view 1209 * removed (most likely destroyed), update the player view
1132 * appropriately. 1210 * appropriately.
1133 */ 1211 */
1134 pl->close_container (); 1212 pl->close_container ();
… …
1138 //TODO: update floorbox to preserve ordering 1216 //TODO: update floorbox to preserve ordering
1139 if (pl->contr->ns) 1217 if (pl->contr->ns)
1140 pl->contr->ns->floorbox_update (); 1218 pl->contr->ns->floorbox_update ();
1141 } 1219 }
1142 1220
1221 if (check_walk_off)
1143 for (tmp = ms.bot; tmp; tmp = tmp->above) 1222 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1144 { 1223 {
1224 above = tmp->above;
1225
1145 /* No point updating the players look faces if he is the object 1226 /* No point updating the players look faces if he is the object
1146 * being removed. 1227 * being removed.
1147 */ 1228 */
1148 1229
1149 /* See if object moving off should effect something */ 1230 /* See if object moving off should effect something */
1150 if (check_walk_off
1151 && ((move_type & tmp->move_off) 1231 if ((move_type & tmp->move_off)
1152 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1232 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1153 {
1154 move_apply (tmp, this, 0); 1233 move_apply (tmp, this, 0);
1155
1156 if (destroyed ())
1157 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1158 } 1234 }
1159 1235
1160 last = tmp; 1236 if (affects_los ())
1161 }
1162
1163 /* last == NULL if there are no objects on this space */
1164 //TODO: this makes little sense, why only update the topmost object?
1165 if (!last)
1166 map->at (x, y).flags_ = 0;
1167 else
1168 update_object (last, UP_OBJ_REMOVE);
1169
1170 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1171 update_all_los (map, x, y); 1237 update_all_los (map, x, y);
1172 } 1238 }
1173} 1239}
1174 1240
1175/* 1241/*
… …
1199 esrv_update_item (UPD_NROF, pl, top); 1265 esrv_update_item (UPD_NROF, pl, top);
1200 1266
1201 op->weight = 0; // cancel the addition above 1267 op->weight = 0; // cancel the addition above
1202 op->carrying = 0; // must be 0 already 1268 op->carrying = 0; // must be 0 already
1203 1269
1204 op->destroy (1); 1270 op->destroy ();
1205 1271
1206 return top; 1272 return top;
1207 } 1273 }
1208 1274
1209 return 0; 1275 return 0;
… …
1217 1283
1218 object *prev = this; 1284 object *prev = this;
1219 1285
1220 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) 1286 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1221 { 1287 {
1222 object *op = arch_to_object (at); 1288 object *op = at->instance ();
1223 1289
1224 op->name = name; 1290 op->name = name;
1225 op->name_pl = name_pl; 1291 op->name_pl = name_pl;
1226 op->title = title; 1292 op->title = title;
1227 1293
… …
1265 * Passing 0 for flag gives proper default values, so flag really only needs 1331 * Passing 0 for flag gives proper default values, so flag really only needs
1266 * to be set if special handling is needed. 1332 * to be set if special handling is needed.
1267 * 1333 *
1268 * Return value: 1334 * Return value:
1269 * new object if 'op' was merged with other object 1335 * new object if 'op' was merged with other object
1270 * NULL if 'op' was destroyed 1336 * NULL if there was an error (destroyed, blocked etc.)
1271 * just 'op' otherwise 1337 * just 'op' otherwise
1272 */ 1338 */
1273object * 1339object *
1274insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1340insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1275{ 1341{
1276 if (op->is_on_map ())
1277 {
1278 LOG (llevError, "insert_ob_in_map called for object already on map");
1279 abort ();
1280 }
1281
1282 if (op->env)
1283 {
1284 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1285 op->remove (); 1342 op->remove ();
1286 }
1287 1343
1288 if (op->face && !face_info (op->face))//D TODO: remove soon 1344 if (m == &freed_map)//D TODO: remove soon
1289 {//D 1345 {//D
1290 LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D 1346 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1291 op->face = 1;//D
1292 }//D 1347 }//D
1293 1348
1294 /* Ideally, the caller figures this out. However, it complicates a lot 1349 /* Ideally, the caller figures this out. However, it complicates a lot
1295 * of areas of callers (eg, anything that uses find_free_spot would now 1350 * of areas of callers (eg, anything that uses find_free_spot would now
1296 * need extra work 1351 * need extra work
1297 */ 1352 */
1353 maptile *newmap = m;
1298 if (!xy_normalise (m, op->x, op->y)) 1354 if (!xy_normalise (newmap, op->x, op->y))
1299 { 1355 {
1300 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found 1356 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1301 return 0; 1357 return 0;
1302 } 1358 }
1303 1359
1304 if (object *more = op->more) 1360 if (object *more = op->more)
1305 if (!insert_ob_in_map (more, m, originator, flag)) 1361 if (!insert_ob_in_map (more, m, originator, flag))
1306 return 0; 1362 return 0;
1307 1363
1308 CLEAR_FLAG (op, FLAG_REMOVED); 1364 op->flag [FLAG_REMOVED] = false;
1309 1365 op->env = 0;
1310 op->map = m; 1366 op->map = newmap;
1367
1311 mapspace &ms = op->ms (); 1368 mapspace &ms = op->ms ();
1312 1369
1313 /* this has to be done after we translate the coordinates. 1370 /* this has to be done after we translate the coordinates.
1314 */ 1371 */
1315 if (op->nrof && !(flag & INS_NO_MERGE)) 1372 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1318 { 1375 {
1319 // TODO: we actually want to update tmp, not op, 1376 // TODO: we actually want to update tmp, not op,
1320 // but some caller surely breaks when we return tmp 1377 // but some caller surely breaks when we return tmp
1321 // from here :/ 1378 // from here :/
1322 op->nrof += tmp->nrof; 1379 op->nrof += tmp->nrof;
1323 tmp->destroy (1); 1380 tmp->destroy ();
1324 } 1381 }
1325 1382
1326 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1383 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1327 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1384 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1328 1385
… …
1336 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1393 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1337 abort (); 1394 abort ();
1338 } 1395 }
1339 1396
1340 if (!originator->is_on_map ()) 1397 if (!originator->is_on_map ())
1398 {
1341 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", 1399 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1342 op->debug_desc (), originator->debug_desc ()); 1400 op->debug_desc (), originator->debug_desc ());
1401 abort ();
1402 }
1343 1403
1344 op->above = originator; 1404 op->above = originator;
1345 op->below = originator->below; 1405 op->below = originator->below;
1346 originator->below = op; 1406 originator->below = op;
1347 1407
… …
1433 op->below = top; 1493 op->below = top;
1434 *(op->above ? &op->above->below : &ms.top) = op; 1494 *(op->above ? &op->above->below : &ms.top) = op;
1435 } 1495 }
1436 } 1496 }
1437 1497
1438 if (op->type == PLAYER) 1498 if (op->is_player ())
1439 { 1499 {
1440 op->contr->do_los = 1; 1500 op->contr->do_los = 1;
1441 ++op->map->players; 1501 ++op->map->players;
1442 op->map->touch (); 1502 op->map->touch ();
1443 } 1503 }
… …
1458 * be far away from this change and not affected in any way - 1518 * be far away from this change and not affected in any way -
1459 * this should get redone to only look for players within range, 1519 * this should get redone to only look for players within range,
1460 * or just updating the P_UPTODATE for spaces within this area 1520 * or just updating the P_UPTODATE for spaces within this area
1461 * of effect may be sufficient. 1521 * of effect may be sufficient.
1462 */ 1522 */
1463 if (op->map->darkness && (op->glow_radius != 0)) 1523 if (op->affects_los ())
1524 {
1525 op->ms ().invalidate ();
1464 update_all_los (op->map, op->x, op->y); 1526 update_all_los (op->map, op->x, op->y);
1527 }
1465 1528
1466 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1529 /* updates flags (blocked, alive, no magic, etc) for this map space */
1467 update_object (op, UP_OBJ_INSERT); 1530 update_object (op, UP_OBJ_INSERT);
1468 1531
1469 INVOKE_OBJECT (INSERT, op); 1532 INVOKE_OBJECT (INSERT, op);
… …
1476 * blocked() and wall() work properly), and these flags are updated by 1539 * blocked() and wall() work properly), and these flags are updated by
1477 * update_object(). 1540 * update_object().
1478 */ 1541 */
1479 1542
1480 /* if this is not the head or flag has been passed, don't check walk on status */ 1543 /* if this is not the head or flag has been passed, don't check walk on status */
1481 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1544 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1482 { 1545 {
1483 if (check_move_on (op, originator)) 1546 if (check_move_on (op, originator))
1484 return 0; 1547 return 0;
1485 1548
1486 /* If we are a multi part object, lets work our way through the check 1549 /* If we are a multi part object, lets work our way through the check
… …
1497/* this function inserts an object in the map, but if it 1560/* this function inserts an object in the map, but if it
1498 * finds an object of its own type, it'll remove that one first. 1561 * finds an object of its own type, it'll remove that one first.
1499 * op is the object to insert it under: supplies x and the map. 1562 * op is the object to insert it under: supplies x and the map.
1500 */ 1563 */
1501void 1564void
1502replace_insert_ob_in_map (const char *arch_string, object *op) 1565replace_insert_ob_in_map (shstr_tmp archname, object *op)
1503{ 1566{
1504 /* first search for itself and remove any old instances */ 1567 /* first search for itself and remove any old instances */
1505 1568
1506 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1569 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1507 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1570 if (tmp->arch->archname == archname) /* same archetype */
1508 tmp->destroy (1); 1571 tmp->destroy ();
1509 1572
1510 object *tmp = arch_to_object (archetype::find (arch_string)); 1573 object *tmp = archetype::find (archname)->instance ();
1511 1574
1512 tmp->x = op->x; 1575 tmp->x = op->x;
1513 tmp->y = op->y; 1576 tmp->y = op->y;
1514 1577
1515 insert_ob_in_map (tmp, op->map, op, 0); 1578 insert_ob_in_map (tmp, op->map, op, 0);
… …
1520{ 1583{
1521 if (where->env) 1584 if (where->env)
1522 return where->env->insert (this); 1585 return where->env->insert (this);
1523 else 1586 else
1524 return where->map->insert (this, where->x, where->y, originator, flags); 1587 return where->map->insert (this, where->x, where->y, originator, flags);
1588}
1589
1590// check whether we can put this into the map, respect max_volume, max_items
1591bool
1592object::can_drop_at (maptile *m, int x, int y, object *originator)
1593{
1594 mapspace &ms = m->at (x, y);
1595
1596 int items = ms.items ();
1597
1598 if (!items // testing !items ensures we can drop at least one item
1599 || (items < m->max_items
1600 && ms.volume () < m->max_volume))
1601 return true;
1602
1603 if (originator && originator->is_player ())
1604 originator->contr->failmsg (format (
1605 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1606 query_name ()
1607 ));
1608
1609 return false;
1525} 1610}
1526 1611
1527/* 1612/*
1528 * decrease(object, number) decreases a specified number from 1613 * decrease(object, number) decreases a specified number from
1529 * the amount of an object. If the amount reaches 0, the object 1614 * the amount of an object. If the amount reaches 0, the object
… …
1537 if (!nr) 1622 if (!nr)
1538 return true; 1623 return true;
1539 1624
1540 nr = min (nr, nrof); 1625 nr = min (nr, nrof);
1541 1626
1627 if (nrof > nr)
1628 {
1542 nrof -= nr; 1629 nrof -= nr;
1543
1544 if (nrof)
1545 {
1546 adjust_weight (env, -weight * nr); // carrying == 0 1630 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1547 1631
1548 if (object *pl = visible_to ()) 1632 if (object *pl = visible_to ())
1549 esrv_update_item (UPD_NROF, pl, this); 1633 esrv_update_item (UPD_NROF, pl, this);
1550 1634
1551 return true; 1635 return true;
1552 } 1636 }
1553 else 1637 else
1554 { 1638 {
1555 destroy (1); 1639 destroy ();
1556 return false; 1640 return false;
1557 } 1641 }
1558} 1642}
1559 1643
1560/* 1644/*
… …
1637 if (object *pl = tmp->visible_to ()) 1721 if (object *pl = tmp->visible_to ())
1638 esrv_update_item (UPD_NROF, pl, tmp); 1722 esrv_update_item (UPD_NROF, pl, tmp);
1639 1723
1640 adjust_weight (this, op->total_weight ()); 1724 adjust_weight (this, op->total_weight ());
1641 1725
1642 op->destroy (1); 1726 op->destroy ();
1643 op = tmp; 1727 op = tmp;
1644 goto inserted; 1728 goto inserted;
1645 } 1729 }
1646 1730
1647 op->owner = 0; // it's his/hers now. period. 1731 op->owner = 0; // it's his/hers now. period.
… …
1665 1749
1666 adjust_weight (this, op->total_weight ()); 1750 adjust_weight (this, op->total_weight ());
1667 1751
1668inserted: 1752inserted:
1669 /* reset the light list and los of the players on the map */ 1753 /* reset the light list and los of the players on the map */
1670 if (op->glow_radius && map && map->darkness) 1754 if (op->glow_radius && is_on_map ())
1755 {
1756 update_stats ();
1671 update_all_los (map, x, y); 1757 update_all_los (map, x, y);
1672 1758 }
1759 else if (is_player ())
1673 // if this is a player's inventory, update stats 1760 // if this is a player's inventory, update stats
1674 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) 1761 contr->queue_stats_update ();
1675 update_stats ();
1676 1762
1677 INVOKE_OBJECT (INSERT, this); 1763 INVOKE_OBJECT (INSERT, this);
1678 1764
1679 return op; 1765 return op;
1680} 1766}
… …
1700 * on top. 1786 * on top.
1701 */ 1787 */
1702int 1788int
1703check_move_on (object *op, object *originator) 1789check_move_on (object *op, object *originator)
1704{ 1790{
1791 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1792 return 0;
1793
1705 object *tmp; 1794 object *tmp;
1706 maptile *m = op->map; 1795 maptile *m = op->map;
1707 int x = op->x, y = op->y; 1796 int x = op->x, y = op->y;
1708 1797
1709 MoveType move_on, move_slow, move_block; 1798 mapspace &ms = m->at (x, y);
1710 1799
1711 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1800 ms.update ();
1712 return 0;
1713 1801
1714 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1802 MoveType move_on = ms.move_on;
1715 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1803 MoveType move_slow = ms.move_slow;
1716 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1804 MoveType move_block = ms.move_block;
1717 1805
1718 /* if nothing on this space will slow op down or be applied, 1806 /* if nothing on this space will slow op down or be applied,
1719 * no need to do checking below. have to make sure move_type 1807 * no need to do checking below. have to make sure move_type
1720 * is set, as lots of objects don't have it set - we treat that 1808 * is set, as lots of objects don't have it set - we treat that
1721 * as walking. 1809 * as walking.
… …
1732 return 0; 1820 return 0;
1733 1821
1734 /* The objects have to be checked from top to bottom. 1822 /* The objects have to be checked from top to bottom.
1735 * Hence, we first go to the top: 1823 * Hence, we first go to the top:
1736 */ 1824 */
1737 1825 for (object *next, *tmp = ms.top; tmp; tmp = next)
1738 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1739 {
1740 /* Trim the search when we find the first other spell effect
1741 * this helps performance so that if a space has 50 spell objects,
1742 * we don't need to check all of them.
1743 */
1744 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1745 break;
1746 } 1826 {
1827 next = tmp->below;
1747 1828
1748 for (; tmp; tmp = tmp->below)
1749 {
1750 if (tmp == op) 1829 if (tmp == op)
1751 continue; /* Can't apply yourself */ 1830 continue; /* Can't apply yourself */
1752 1831
1753 /* Check to see if one of the movement types should be slowed down. 1832 /* Check to see if one of the movement types should be slowed down.
1754 * Second check makes sure that the movement types not being slowed 1833 * Second check makes sure that the movement types not being slowed
… …
1759 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1838 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1760 { 1839 {
1761 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1840 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1762 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1841 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1763 { 1842 {
1764
1765 float
1766 diff = tmp->move_slow_penalty * fabs (op->speed); 1843 float diff = tmp->move_slow_penalty * fabs (op->speed);
1767 1844
1768 if (op->type == PLAYER) 1845 if (op->is_player ())
1769 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1846 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1770 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1847 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1771 diff /= 4.0; 1848 diff /= 4.0;
1772 1849
1773 op->speed_left -= diff; 1850 op->speed_left -= diff;
1774 } 1851 }
1775 } 1852 }
… …
1981 * head of the object should correspond for the entire object. 2058 * head of the object should correspond for the entire object.
1982 */ 2059 */
1983 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 2060 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1984 continue; 2061 continue;
1985 2062
1986 if (ob->blocked (m, pos.x, pos.y)) 2063 if (ob->blocked (pos.m, pos.x, pos.y))
1987 continue; 2064 continue;
1988 2065
1989 altern [index++] = i; 2066 altern [index++] = i;
1990 } 2067 }
1991 2068
… …
2059 * there is capable of. 2136 * there is capable of.
2060 */ 2137 */
2061int 2138int
2062find_dir (maptile *m, int x, int y, object *exclude) 2139find_dir (maptile *m, int x, int y, object *exclude)
2063{ 2140{
2064 int i, max = SIZEOFFREE, mflags; 2141 int max = SIZEOFFREE, mflags;
2065
2066 sint16 nx, ny;
2067 object *tmp;
2068 maptile *mp;
2069
2070 MoveType blocked, move_type; 2142 MoveType move_type;
2071 2143
2072 if (exclude && exclude->head_ () != exclude) 2144 if (exclude && exclude->head_ () != exclude)
2073 { 2145 {
2074 exclude = exclude->head; 2146 exclude = exclude->head;
2075 move_type = exclude->move_type; 2147 move_type = exclude->move_type;
… …
2078 { 2150 {
2079 /* If we don't have anything, presume it can use all movement types. */ 2151 /* If we don't have anything, presume it can use all movement types. */
2080 move_type = MOVE_ALL; 2152 move_type = MOVE_ALL;
2081 } 2153 }
2082 2154
2083 for (i = 1; i < max; i++) 2155 for (int i = 1; i < max; i++)
2084 { 2156 {
2085 mp = m; 2157 mapxy pos (m, x, y);
2086 nx = x + freearr_x[i]; 2158 pos.move (i);
2087 ny = y + freearr_y[i];
2088 2159
2089 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2160 if (!pos.normalise ())
2090
2091 if (mflags & P_OUT_OF_MAP)
2092 max = maxfree[i]; 2161 max = maxfree[i];
2093 else 2162 else
2094 { 2163 {
2095 mapspace &ms = mp->at (nx, ny); 2164 mapspace &ms = *pos;
2096 2165
2097 blocked = ms.move_block;
2098
2099 if ((move_type & blocked) == move_type) 2166 if ((move_type & ms.move_block) == move_type)
2100 max = maxfree[i]; 2167 max = maxfree [i];
2101 else if (mflags & P_IS_ALIVE) 2168 else if (ms.flags () & P_IS_ALIVE)
2102 { 2169 {
2103 for (tmp = ms.bot; tmp; tmp = tmp->above) 2170 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2104 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2171 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2105 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2172 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2106 break;
2107
2108 if (tmp)
2109 return freedir[i]; 2173 return freedir [i];
2110 } 2174 }
2111 } 2175 }
2112 } 2176 }
2113 2177
2114 return 0; 2178 return 0;
… …
2189 * This basically means that if direction is 15, then it could either go 2253 * This basically means that if direction is 15, then it could either go
2190 * direction 4, 14, or 16 to get back to where we are. 2254 * direction 4, 14, or 16 to get back to where we are.
2191 * Moved from spell_util.c to object.c with the other related direction 2255 * Moved from spell_util.c to object.c with the other related direction
2192 * functions. 2256 * functions.
2193 */ 2257 */
2194int reduction_dir[SIZEOFFREE][3] = { 2258static const int reduction_dir[SIZEOFFREE][3] = {
2195 {0, 0, 0}, /* 0 */ 2259 {0, 0, 0}, /* 0 */
2196 {0, 0, 0}, /* 1 */ 2260 {0, 0, 0}, /* 1 */
2197 {0, 0, 0}, /* 2 */ 2261 {0, 0, 0}, /* 2 */
2198 {0, 0, 0}, /* 3 */ 2262 {0, 0, 0}, /* 3 */
2199 {0, 0, 0}, /* 4 */ 2263 {0, 0, 0}, /* 4 */
… …
2295int 2359int
2296can_pick (const object *who, const object *item) 2360can_pick (const object *who, const object *item)
2297{ 2361{
2298 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2362 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2299 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2363 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2300 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2364 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2301} 2365}
2302 2366
2303/* 2367/*
2304 * create clone from object to another 2368 * create clone from object to another
2305 */ 2369 */
… …
2337 return tmp; 2401 return tmp;
2338 2402
2339 return 0; 2403 return 0;
2340} 2404}
2341 2405
2342const shstr & 2406shstr_tmp
2343object::kv_get (const shstr &key) const 2407object::kv_get (shstr_tmp key) const
2344{ 2408{
2345 for (key_value *kv = key_values; kv; kv = kv->next) 2409 for (key_value *kv = key_values; kv; kv = kv->next)
2346 if (kv->key == key) 2410 if (kv->key == key)
2347 return kv->value; 2411 return kv->value;
2348 2412
2349 return shstr_null; 2413 return shstr ();
2350} 2414}
2351 2415
2352void 2416void
2353object::kv_set (const shstr &key, const shstr &value) 2417object::kv_set (shstr_tmp key, shstr_tmp value)
2354{ 2418{
2355 for (key_value *kv = key_values; kv; kv = kv->next) 2419 for (key_value *kv = key_values; kv; kv = kv->next)
2356 if (kv->key == key) 2420 if (kv->key == key)
2357 { 2421 {
2358 kv->value = value; 2422 kv->value = value;
… …
2367 2431
2368 key_values = kv; 2432 key_values = kv;
2369} 2433}
2370 2434
2371void 2435void
2372object::kv_del (const shstr &key) 2436object::kv_del (shstr_tmp key)
2373{ 2437{
2374 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2438 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2375 if ((*kvp)->key == key) 2439 if ((*kvp)->key == key)
2376 { 2440 {
2377 key_value *kv = *kvp; 2441 key_value *kv = *kvp;
… …
2470{ 2534{
2471 return map ? map->region (x, y) 2535 return map ? map->region (x, y)
2472 : region::default_region (); 2536 : region::default_region ();
2473} 2537}
2474 2538
2475const materialtype_t *
2476object::dominant_material () const
2477{
2478 if (materialtype_t *mt = name_to_material (materialname))
2479 return mt;
2480
2481 return name_to_material (shstr_unknown);
2482}
2483
2484void 2539void
2485object::open_container (object *new_container) 2540object::open_container (object *new_container)
2486{ 2541{
2487 if (container == new_container) 2542 if (container == new_container)
2488 return; 2543 return;
… …
2508 container = 0; 2563 container = 0;
2509 2564
2510 // client needs item update to make it work, client bug requires this to be separate 2565 // client needs item update to make it work, client bug requires this to be separate
2511 esrv_update_item (UPD_FLAGS, this, old_container); 2566 esrv_update_item (UPD_FLAGS, this, old_container);
2512 2567
2513 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2568 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2514 play_sound (sound_find ("chest_close")); 2569 play_sound (sound_find ("chest_close"));
2515 } 2570 }
2516 2571
2517 if (new_container) 2572 if (new_container)
2518 { 2573 {
… …
2522 // TODO: this does not seem to serve any purpose anymore? 2577 // TODO: this does not seem to serve any purpose anymore?
2523#if 0 2578#if 0
2524 // insert the "Close Container" object. 2579 // insert the "Close Container" object.
2525 if (archetype *closer = new_container->other_arch) 2580 if (archetype *closer = new_container->other_arch)
2526 { 2581 {
2527 object *closer = arch_to_object (new_container->other_arch); 2582 object *closer = new_container->other_arch->instance ();
2528 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2583 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2529 new_container->insert (closer); 2584 new_container->insert (closer);
2530 } 2585 }
2531#endif 2586#endif
2532 2587
2533 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2588 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2534 2589
2535 // make sure the container is available, client bug requires this to be separate 2590 // make sure the container is available, client bug requires this to be separate
2536 esrv_send_item (this, new_container); 2591 esrv_send_item (this, new_container);
2537 2592
2538 new_container->flag [FLAG_APPLIED] = true; 2593 new_container->flag [FLAG_APPLIED] = true;
… …
2546// else if (!old_container->env && contr && contr->ns) 2601// else if (!old_container->env && contr && contr->ns)
2547// contr->ns->floorbox_reset (); 2602// contr->ns->floorbox_reset ();
2548} 2603}
2549 2604
2550object * 2605object *
2551object::force_find (const shstr name) 2606object::force_find (shstr_tmp name)
2552{ 2607{
2553 /* cycle through his inventory to look for the MARK we want to 2608 /* cycle through his inventory to look for the MARK we want to
2554 * place 2609 * place
2555 */ 2610 */
2556 for (object *tmp = inv; tmp; tmp = tmp->below) 2611 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2558 return splay (tmp); 2613 return splay (tmp);
2559 2614
2560 return 0; 2615 return 0;
2561} 2616}
2562 2617
2618//-GPL
2619
2563void 2620void
2621object::force_set_timer (int duration)
2622{
2623 this->duration = 1;
2624 this->speed_left = -1.f;
2625
2626 this->set_speed (duration ? 1.f / duration : 0.f);
2627}
2628
2629object *
2564object::force_add (const shstr name, int duration) 2630object::force_add (shstr_tmp name, int duration)
2565{ 2631{
2566 if (object *force = force_find (name)) 2632 if (object *force = force_find (name))
2567 force->destroy (); 2633 force->destroy ();
2568 2634
2569 object *force = get_archetype (FORCE_NAME); 2635 object *force = get_archetype (FORCE_NAME);
2570 2636
2571 force->slaying = name; 2637 force->slaying = name;
2572 force->stats.food = 1; 2638 force->force_set_timer (duration);
2573 force->speed_left = -1.f;
2574
2575 force->set_speed (duration ? 1.f / duration : 0.f);
2576 force->flag [FLAG_IS_USED_UP] = true;
2577 force->flag [FLAG_APPLIED] = true; 2639 force->flag [FLAG_APPLIED] = true;
2578 2640
2579 insert (force); 2641 return insert (force);
2580} 2642}
2581 2643
2582void 2644void
2583object::play_sound (faceidx sound) 2645object::play_sound (faceidx sound) const
2584{ 2646{
2585 if (!sound) 2647 if (!sound)
2586 return; 2648 return;
2587 2649
2588 if (flag [FLAG_REMOVED]) 2650 if (is_on_map ())
2651 map->play_sound (sound, x, y);
2652 else if (object *pl = in_player ())
2653 pl->contr->play_sound (sound);
2654}
2655
2656void
2657object::say_msg (const char *msg) const
2658{
2659 if (is_on_map ())
2660 map->say_msg (msg, x, y);
2661 else if (object *pl = in_player ())
2662 pl->contr->play_sound (sound);
2663}
2664
2665void
2666object::make_noise ()
2667{
2668 // we do not model noise in the map, so instead put
2669 // a temporary light into the noise source
2670 // could use the map instead, but that's less reliable for our
2671 // goal, which is to make invisibility a bit harder to exploit
2672
2673 // currently only works sensibly for players
2674 if (!is_player ())
2589 return; 2675 return;
2590 2676
2591 if (env) 2677 // find old force, or create new one
2592 { 2678 object *force = force_find (shstr_noise_force);
2593 if (object *pl = in_player ()) 2679
2594 pl->contr->play_sound (sound); 2680 if (force)
2595 } 2681 force->speed_left = -1.f; // patch old speed up
2596 else 2682 else
2597 map->play_sound (sound, x, y); 2683 {
2598} 2684 force = archetype::get (shstr_noise_force);
2599 2685
2686 force->slaying = shstr_noise_force;
2687 force->stats.food = 1;
2688 force->speed_left = -1.f;
2689
2690 force->set_speed (1.f / 4.f);
2691 force->flag [FLAG_IS_USED_UP] = true;
2692 force->flag [FLAG_APPLIED] = true;
2693
2694 insert (force);
2695 }
2696}
2697
2698void object::change_move_type (MoveType mt)
2699{
2700 if (move_type == mt)
2701 return;
2702
2703 if (is_on_map ())
2704 {
2705 // we are on the map, so handle move_on/off effects
2706 remove ();
2707 move_type = mt;
2708 map->insert (this, x, y, this);
2709 }
2710 else
2711 move_type = mt;
2712}
2713

Diff Legend

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