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.274 by root, Sun Dec 28 03:58:36 2008 UTC vs.
Revision 1.318 by root, Sat Apr 3 02:27:24 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; 37uint32_t mapspace::smellcount = 10000;
38 38
39objectvec objects; 39objectvec objects;
40activevec actives; 40activevec actives;
41
42//+GPL
41 43
42short freearr_x[SIZEOFFREE] = { 44short freearr_x[SIZEOFFREE] = {
43 0, 45 0,
44 0, 1, 1, 1, 0, -1, -1, -1, 46 0, 1, 1, 1, 0, -1, -1, -1,
45 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,
… …
49 0, 51 0,
50 -1, -1, 0, 1, 1, 1, 0, -1, 52 -1, -1, 0, 1, 1, 1, 0, -1,
51 -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,
52 -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
53}; 55};
54int maxfree[SIZEOFFREE] = {
55 0,
56 9, 10, 13, 14, 17, 18, 21, 22,
57 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
58 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
59};
60int freedir[SIZEOFFREE] = { 56int freedir[SIZEOFFREE] = {
61 0, 57 0,
62 1, 2, 3, 4, 5, 6, 7, 8, 58 1, 2, 3, 4, 5, 6, 7, 8,
63 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,
64 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
65}; 61};
66 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
67static void 70static void
68write_uuid (uval64 skip, bool sync) 71write_uuid (uval64 skip, bool sync)
69{ 72{
70 CALL_BEGIN (2); 73 CALL_BEGIN (2);
71 CALL_ARG_SV (newSVval64 (skip)); 74 CALL_ARG_SV (newSVval64 (skip));
… …
73 CALL_CALL ("cf::write_uuid", G_DISCARD); 76 CALL_CALL ("cf::write_uuid", G_DISCARD);
74 CALL_END; 77 CALL_END;
75} 78}
76 79
77static void 80static void
78read_uuid (void) 81read_uuid ()
79{ 82{
80 char filename[MAX_BUF]; 83 char filename[MAX_BUF];
81 84
82 sprintf (filename, "%s/uuid", settings.localdir); 85 sprintf (filename, "%s/uuid", settings.localdir);
83 86
… …
97 100
98 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename); 101 LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
99 _exit (1); 102 _exit (1);
100 } 103 }
101 104
102 UUID::BUF buf; 105 char buf [UUID::MAX_LEN];
103 buf[0] = 0; 106 buf[0] = 0;
104 fgets (buf, sizeof (buf), fp); 107 fgets (buf, sizeof (buf), fp);
105 108
106 if (!UUID::cur.parse (buf)) 109 if (!UUID::cur.parse (buf))
107 { 110 {
… …
134 137
135void 138void
136UUID::init () 139UUID::init ()
137{ 140{
138 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;
139} 207}
140 208
141/* 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. */
142static bool 210static bool
143compare_ob_value_lists_one (const object *wants, const object *has) 211compare_ob_value_lists_one (const object *wants, const object *has)
… …
179 * Improvements made with merge: Better checking on potion, and also 247 * Improvements made with merge: Better checking on potion, and also
180 * check weight 248 * check weight
181 */ 249 */
182bool object::can_merge_slow (object *ob1, object *ob2) 250bool object::can_merge_slow (object *ob1, object *ob2)
183{ 251{
184 /* A couple quicksanity checks */ 252 /* A couple quick sanity checks */
185 if (ob1 == ob2 253 if (ob1 == ob2
186 || ob1->type != ob2->type 254 || ob1->type != ob2->type
187 || ob1->speed != ob2->speed
188 || ob1->value != ob2->value 255 || ob1->value != ob2->value
189 || ob1->name != ob2->name) 256 || ob1->name != ob2->name
257 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
190 return 0; 258 return 0;
191 259
192 /* Do not merge objects if nrof would overflow, assume nrof 260 /* Do not merge objects if nrof would overflow, assume nrof
193 * is always 0 .. 2**31-1 */ 261 * is always 0 .. 2**31-1 */
194 if (ob1->nrof > 0x7fffffff - ob2->nrof) 262 if (ob1->nrof > 0x7fffffff - ob2->nrof)
… …
215 || ob1->magic != ob2->magic 283 || ob1->magic != ob2->magic
216 || ob1->slaying != ob2->slaying 284 || ob1->slaying != ob2->slaying
217 || ob1->skill != ob2->skill 285 || ob1->skill != ob2->skill
218 || ob1->value != ob2->value 286 || ob1->value != ob2->value
219 || ob1->animation_id != ob2->animation_id 287 || ob1->animation_id != ob2->animation_id
220 || (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
221 || ob1->client_type != ob2->client_type 289 || ob1->client_type != ob2->client_type
222 || ob1->materialname != ob2->materialname 290 || ob1->material != ob2->material
223 || ob1->lore != ob2->lore 291 || ob1->lore != ob2->lore
224 || ob1->subtype != ob2->subtype 292 || ob1->subtype != ob2->subtype
225 || ob1->move_type != ob2->move_type 293 || ob1->move_type != ob2->move_type
226 || ob1->move_block != ob2->move_block 294 || ob1->move_block != ob2->move_block
227 || ob1->move_allow != ob2->move_allow 295 || ob1->move_allow != ob2->move_allow
228 || ob1->move_on != ob2->move_on 296 || ob1->move_on != ob2->move_on
229 || ob1->move_off != ob2->move_off 297 || ob1->move_off != ob2->move_off
230 || ob1->move_slow != ob2->move_slow 298 || ob1->move_slow != ob2->move_slow
231 || ob1->move_slow_penalty != ob2->move_slow_penalty 299 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
232 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) 300 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
233 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 301 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
234 return 0; 302 return 0;
235 303
236 if ((ob1->flag ^ ob2->flag) 304 if ((ob1->flag ^ ob2->flag)
… …
328 // the player inventory itself is always visible 396 // the player inventory itself is always visible
329 if (env->is_player ()) 397 if (env->is_player ())
330 return env; 398 return env;
331 399
332 // else a player could have our env open 400 // else a player could have our env open
333 object *envest = env->outer_env (); 401 object *envest = env->outer_env_or_self ();
334 402
335 // 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
336 // even if our inv is in a player. 404 // even if our inv is in a player.
337 if (envest->is_on_map ()) 405 if (envest->is_on_map ())
338 if (object *pl = envest->ms ().player ()) 406 if (object *pl = envest->ms ().player ())
339 if (pl->container == env) 407 if (pl->container_ () == env)
340 return pl; 408 return pl;
341 } 409 }
342 else 410 else
343 { 411 {
344 // maybe there is a player standing on the same mapspace 412 // maybe there is a player standing on the same mapspace
345 // this will catch the case where "this" is a player 413 // this will catch the case where "this" is a player
346 if (object *pl = ms ().player ()) 414 if (object *pl = ms ().player ())
347 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) 415 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
348 || this == pl->container) 416 || pl->container_ () == this)
349 return pl; 417 return pl;
350 } 418 }
351 } 419 }
352 420
353 return 0; 421 return 0;
… …
431 object_freezer freezer; 499 object_freezer freezer;
432 op->write (freezer); 500 op->write (freezer);
433 return freezer.as_string (); 501 return freezer.as_string ();
434} 502}
435 503
436/* 504char *
437 * get_nearest_part(multi-object, object 2) returns the part of the 505object::as_string ()
438 * multi-object 1 which is closest to the second object.
439 * If it's not a multi-object, it is returned.
440 */
441object *
442get_nearest_part (object *op, const object *pl)
443{ 506{
444 object *tmp, *closest; 507 return dump_object (this);
445 int last_dist, i;
446
447 if (!op->more)
448 return op;
449
450 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
451 tmp;
452 tmp = tmp->more)
453 if ((i = distance (tmp, pl)) < last_dist)
454 closest = tmp, last_dist = i;
455
456 return closest;
457} 508}
458 509
459/* 510/*
460 * 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.
461 * VERRRY slow. 512 * VERRRY slow.
… …
463object * 514object *
464find_object (tag_t i) 515find_object (tag_t i)
465{ 516{
466 for_all_objects (op) 517 for_all_objects (op)
467 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)
468 return op; 534 return op;
469 535
470 return 0; 536 return 0;
471} 537}
472 538
… …
523 if (slot [body_combat].info) return slot_combat; 589 if (slot [body_combat].info) return slot_combat;
524 if (slot [body_range ].info) return slot_ranged; 590 if (slot [body_range ].info) return slot_ranged;
525 } 591 }
526 592
527 return slot_none; 593 return slot_none;
528}
529
530bool
531object::change_weapon (object *ob)
532{
533 if (current_weapon == ob)
534 return true;
535
536 if (chosen_skill)
537 chosen_skill->flag [FLAG_APPLIED] = false;
538
539 current_weapon = ob;
540 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
541
542 if (chosen_skill)
543 chosen_skill->flag [FLAG_APPLIED] = true;
544
545 update_stats ();
546
547 if (ob)
548 {
549 // now check wether any body locations became invalid, in which case
550 // we cannot apply the weapon at the moment.
551 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
552 if (slot[i].used < 0)
553 {
554 current_weapon = chosen_skill = 0;
555 update_stats ();
556
557 new_draw_info_format (NDI_UNIQUE, 0, this,
558 "You try to balance all your items at once, "
559 "but the %s is just too much for your body. "
560 "[You need to unapply some items first.]", &ob->name);
561 return false;
562 }
563
564 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
565 }
566 else
567 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
568
569 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
570 {
571 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
572 &name, ob->debug_desc ());
573 return false;
574 }
575
576 return true;
577} 594}
578 595
579/* Zero the key_values on op, decrementing the shared-string 596/* Zero the key_values on op, decrementing the shared-string
580 * refcounts and freeing the links. 597 * refcounts and freeing the links.
581 */ 598 */
… …
634 tail = new_link; 651 tail = new_link;
635 } 652 }
636 } 653 }
637 } 654 }
638 655
639 if (speed < 0)
640 dst->speed_left -= rndm ();
641
642 dst->activate (); 656 dst->activate ();
643} 657}
644 658
645void 659void
646object::instantiate () 660object::instantiate ()
647{ 661{
648 if (!uuid.seq) // HACK 662 if (!uuid.seq) // HACK
649 uuid = UUID::gen (); 663 uuid = UUID::gen ();
650 664
665 // TODO: unclean state changes, should nt be done in copy_to AND instantiate
666 if (flag [FLAG_RANDOM_SPEED] && speed)
667 speed_left = - speed - rndm (); // TODO animation
668 else
651 speed_left = -0.1f; 669 speed_left = -1.;
670
652 /* copy the body_info to the body_used - this is only really 671 /* copy the body_info to the body_used - this is only really
653 * need for monsters, but doesn't hurt to do it for everything. 672 * need for monsters, but doesn't hurt to do it for everything.
654 * by doing so, when a monster is created, it has good starting 673 * by doing so, when a monster is created, it has good starting
655 * values for the body_used info, so when items are created 674 * values for the body_used info, so when items are created
656 * for it, they can be properly equipped. 675 * for it, they can be properly equipped.
… …
664object * 683object *
665object::clone () 684object::clone ()
666{ 685{
667 object *neu = create (); 686 object *neu = create ();
668 copy_to (neu); 687 copy_to (neu);
688
689 // TODO: unclean state changes, should not be done in clone AND instantiate
690 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
691 neu->speed_left = - neu->speed - rndm (); // TODO animation
692
669 neu->map = map; // not copied by copy_to 693 neu->map = map; // not copied by copy_to
670 return neu; 694 return neu;
671} 695}
672 696
673/* 697/*
… …
691 * This function needs to be called whenever the speed of an object changes. 715 * This function needs to be called whenever the speed of an object changes.
692 */ 716 */
693void 717void
694object::set_speed (float speed) 718object::set_speed (float speed)
695{ 719{
696 if (flag [FLAG_FREED] && speed)
697 {
698 LOG (llevError, "Object %s is freed but has speed.\n", &name);
699 speed = 0;
700 }
701
702 this->speed = speed; 720 this->speed = speed;
703 721
704 if (has_active_speed ()) 722 if (has_active_speed ())
705 activate (); 723 activate ();
706 else 724 else
… …
756 774
757 if (!(m.flags_ & P_UPTODATE)) 775 if (!(m.flags_ & P_UPTODATE))
758 /* nop */; 776 /* nop */;
759 else if (action == UP_OBJ_INSERT) 777 else if (action == UP_OBJ_INSERT)
760 { 778 {
779#if 0
761 // this is likely overkill, TODO: revisit (schmorp) 780 // this is likely overkill, TODO: revisit (schmorp)
762 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 781 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
763 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 782 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
764 || (op->is_player () && !(m.flags_ & P_PLAYER)) 783 || (op->is_player () && !(m.flags_ & P_PLAYER))
765 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 784 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
… …
770 || (m.move_slow | op->move_slow) != m.move_slow 789 || (m.move_slow | op->move_slow) != m.move_slow
771 /* This isn't perfect, but I don't expect a lot of objects to 790 /* This isn't perfect, but I don't expect a lot of objects to
772 * have move_allow right now. 791 * have move_allow right now.
773 */ 792 */
774 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 793 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
775 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
776 m.invalidate (); 794 m.invalidate ();
795#else
796 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
797 m.invalidate ();
798#endif
777 } 799 }
778 /* if the object is being removed, we can't make intelligent 800 /* if the object is being removed, we can't make intelligent
779 * decisions, because remove_ob can't really pass the object 801 * decisions, because remove_ob can't really pass the object
780 * that is being removed. 802 * that is being removed.
781 */ 803 */
… …
792 814
793object::object () 815object::object ()
794{ 816{
795 SET_FLAG (this, FLAG_REMOVED); 817 SET_FLAG (this, FLAG_REMOVED);
796 818
797 expmul = 1.0; 819 //expmul = 1.0; declared const for the time being
798 face = blank_face; 820 face = blank_face;
821 material = MATERIAL_NULL;
799} 822}
800 823
801object::~object () 824object::~object ()
802{ 825{
803 unlink (); 826 unlink ();
… …
831{ 854{
832 /* If already on active list, don't do anything */ 855 /* If already on active list, don't do anything */
833 if (active) 856 if (active)
834 return; 857 return;
835 858
836 if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
837 if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
838
839 if (has_active_speed ()) 859 if (has_active_speed ())
860 {
861 if (flag [FLAG_FREED])
862 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
863
840 actives.insert (this); 864 actives.insert (this);
865 }
841} 866}
842 867
843void 868void
844object::activate_recursive () 869object::activate_recursive ()
845{ 870{
… …
963 988
964void 989void
965object::do_destroy () 990object::do_destroy ()
966{ 991{
967 if (flag [FLAG_IS_LINKED]) 992 if (flag [FLAG_IS_LINKED])
968 remove_button_link (this); 993 remove_link ();
969 994
970 if (flag [FLAG_FRIENDLY]) 995 if (flag [FLAG_FRIENDLY])
971 remove_friendly_object (this); 996 remove_friendly_object (this);
972 997
973 remove (); 998 remove ();
… …
1031 * the previous environment. 1056 * the previous environment.
1032 */ 1057 */
1033void 1058void
1034object::do_remove () 1059object::do_remove ()
1035{ 1060{
1036 object *tmp, *last = 0;
1037 object *otmp;
1038
1039 if (flag [FLAG_REMOVED]) 1061 if (flag [FLAG_REMOVED])
1040 return; 1062 return;
1041 1063
1042 INVOKE_OBJECT (REMOVE, this); 1064 INVOKE_OBJECT (REMOVE, this);
1043 1065
… …
1075 1097
1076 above = 0; 1098 above = 0;
1077 below = 0; 1099 below = 0;
1078 env = 0; 1100 env = 0;
1079 1101
1080 /* NO_FIX_PLAYER is set when a great many changes are being 1102 if (pl && pl->is_player ())
1081 * made to players inventory. If set, avoiding the call
1082 * to save cpu time.
1083 */ 1103 {
1084 if (pl) 1104 if (expect_false (pl->contr->combat_ob == this))
1085 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1086 { 1105 {
1087 pl->update_stats (); 1106 pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
1107 pl->contr->combat_ob = 0;
1108 if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
1109 }
1088 1110
1111 if (expect_false (pl->contr->ranged_ob == this))
1112 {
1113 pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
1114 pl->contr->ranged_ob = 0;
1115 if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
1116 }
1117
1118 pl->contr->queue_stats_update ();
1119
1089 if (glow_radius && pl->is_on_map ()) 1120 if (expect_false (glow_radius) && pl->is_on_map ())
1090 update_all_los (pl->map, pl->x, pl->y); 1121 update_all_los (pl->map, pl->x, pl->y);
1091 } 1122 }
1092 } 1123 }
1093 else if (map) 1124 else if (map)
1094 { 1125 {
1095 map->dirty = true; 1126 map->dirty = true;
1096 mapspace &ms = this->ms (); 1127 mapspace &ms = this->ms ();
… …
1109 close_container (); 1140 close_container ();
1110 1141
1111 --map->players; 1142 --map->players;
1112 map->touch (); 1143 map->touch ();
1113 } 1144 }
1114 else if (pl->container == this) 1145 else if (pl->container_ () == this)
1115 { 1146 {
1116 // removing a container should close it 1147 // removing a container should close it
1117 close_container (); 1148 close_container ();
1118 } 1149 }
1119 1150
… …
1135 1166
1136 int check_walk_off = !flag [FLAG_NO_APPLY]; 1167 int check_walk_off = !flag [FLAG_NO_APPLY];
1137 1168
1138 if (object *pl = ms.player ()) 1169 if (object *pl = ms.player ())
1139 { 1170 {
1140 if (pl->container == this) 1171 if (pl->container_ () == this)
1141 /* If a container that the player is currently using somehow gets 1172 /* If a container that the player is currently using somehow gets
1142 * removed (most likely destroyed), update the player view 1173 * removed (most likely destroyed), update the player view
1143 * appropriately. 1174 * appropriately.
1144 */ 1175 */
1145 pl->close_container (); 1176 pl->close_container ();
… …
1149 //TODO: update floorbox to preserve ordering 1180 //TODO: update floorbox to preserve ordering
1150 if (pl->contr->ns) 1181 if (pl->contr->ns)
1151 pl->contr->ns->floorbox_update (); 1182 pl->contr->ns->floorbox_update ();
1152 } 1183 }
1153 1184
1185 if (check_walk_off)
1154 for (tmp = ms.bot; tmp; tmp = tmp->above) 1186 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1155 { 1187 {
1188 above = tmp->above;
1189
1156 /* No point updating the players look faces if he is the object 1190 /* No point updating the players look faces if he is the object
1157 * being removed. 1191 * being removed.
1158 */ 1192 */
1159 1193
1160 /* See if object moving off should effect something */ 1194 /* See if object moving off should effect something */
1161 if (check_walk_off
1162 && ((move_type & tmp->move_off) 1195 if ((move_type & tmp->move_off)
1163 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1196 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1164 {
1165 move_apply (tmp, this, 0); 1197 move_apply (tmp, this, 0);
1166
1167 if (destroyed ())
1168 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1169 } 1198 }
1170
1171 last = tmp;
1172 }
1173 1199
1174 if (affects_los ()) 1200 if (affects_los ())
1175 update_all_los (map, x, y); 1201 update_all_los (map, x, y);
1176 } 1202 }
1177} 1203}
… …
1221 1247
1222 object *prev = this; 1248 object *prev = this;
1223 1249
1224 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) 1250 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1225 { 1251 {
1226 object *op = arch_to_object (at); 1252 object *op = at->instance ();
1227 1253
1228 op->name = name; 1254 op->name = name;
1229 op->name_pl = name_pl; 1255 op->name_pl = name_pl;
1230 op->title = title; 1256 op->title = title;
1231 1257
… …
1269 * Passing 0 for flag gives proper default values, so flag really only needs 1295 * Passing 0 for flag gives proper default values, so flag really only needs
1270 * to be set if special handling is needed. 1296 * to be set if special handling is needed.
1271 * 1297 *
1272 * Return value: 1298 * Return value:
1273 * new object if 'op' was merged with other object 1299 * new object if 'op' was merged with other object
1274 * NULL if 'op' was destroyed 1300 * NULL if there was an error (destroyed, blocked etc.)
1275 * just 'op' otherwise 1301 * just 'op' otherwise
1276 */ 1302 */
1277object * 1303object *
1278insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1304insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1279{ 1305{
… …
1297 1323
1298 if (object *more = op->more) 1324 if (object *more = op->more)
1299 if (!insert_ob_in_map (more, m, originator, flag)) 1325 if (!insert_ob_in_map (more, m, originator, flag))
1300 return 0; 1326 return 0;
1301 1327
1302 CLEAR_FLAG (op, FLAG_REMOVED); 1328 op->flag [FLAG_REMOVED] = false;
1303 1329 op->env = 0;
1304 op->map = newmap; 1330 op->map = newmap;
1331
1305 mapspace &ms = op->ms (); 1332 mapspace &ms = op->ms ();
1306 1333
1307 /* this has to be done after we translate the coordinates. 1334 /* this has to be done after we translate the coordinates.
1308 */ 1335 */
1309 if (op->nrof && !(flag & INS_NO_MERGE)) 1336 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1330 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1357 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1331 abort (); 1358 abort ();
1332 } 1359 }
1333 1360
1334 if (!originator->is_on_map ()) 1361 if (!originator->is_on_map ())
1362 {
1335 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", 1363 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1336 op->debug_desc (), originator->debug_desc ()); 1364 op->debug_desc (), originator->debug_desc ());
1365 abort ();
1366 }
1337 1367
1338 op->above = originator; 1368 op->above = originator;
1339 op->below = originator->below; 1369 op->below = originator->below;
1340 originator->below = op; 1370 originator->below = op;
1341 1371
… …
1473 * blocked() and wall() work properly), and these flags are updated by 1503 * blocked() and wall() work properly), and these flags are updated by
1474 * update_object(). 1504 * update_object().
1475 */ 1505 */
1476 1506
1477 /* if this is not the head or flag has been passed, don't check walk on status */ 1507 /* 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) 1508 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1479 { 1509 {
1480 if (check_move_on (op, originator)) 1510 if (check_move_on (op, originator))
1481 return 0; 1511 return 0;
1482 1512
1483 /* If we are a multi part object, lets work our way through the check 1513 /* 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 1524/* 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. 1525 * 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. 1526 * op is the object to insert it under: supplies x and the map.
1497 */ 1527 */
1498void 1528void
1499replace_insert_ob_in_map (const char *arch_string, object *op) 1529replace_insert_ob_in_map (shstr_tmp archname, object *op)
1500{ 1530{
1501 /* first search for itself and remove any old instances */ 1531 /* first search for itself and remove any old instances */
1502 1532
1503 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1533 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1504 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1534 if (tmp->arch->archname == archname) /* same archetype */
1505 tmp->destroy (); 1535 tmp->destroy ();
1506 1536
1507 object *tmp = arch_to_object (archetype::find (arch_string)); 1537 object *tmp = archetype::find (archname)->instance ();
1508 1538
1509 tmp->x = op->x; 1539 tmp->x = op->x;
1510 tmp->y = op->y; 1540 tmp->y = op->y;
1511 1541
1512 insert_ob_in_map (tmp, op->map, op, 0); 1542 insert_ob_in_map (tmp, op->map, op, 0);
… …
1517{ 1547{
1518 if (where->env) 1548 if (where->env)
1519 return where->env->insert (this); 1549 return where->env->insert (this);
1520 else 1550 else
1521 return where->map->insert (this, where->x, where->y, originator, flags); 1551 return where->map->insert (this, where->x, where->y, originator, flags);
1552}
1553
1554// check whether we can put this into the map, respect max_volume, max_items
1555bool
1556object::can_drop_at (maptile *m, int x, int y, object *originator)
1557{
1558 mapspace &ms = m->at (x, y);
1559
1560 int items = ms.items ();
1561
1562 if (!items // testing !items ensures we can drop at least one item
1563 || (items < m->max_items
1564 && ms.volume () < m->max_volume))
1565 return true;
1566
1567 if (originator && originator->is_player ())
1568 originator->contr->failmsg (format (
1569 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1570 query_name ()
1571 ));
1572
1573 return false;
1522} 1574}
1523 1575
1524/* 1576/*
1525 * decrease(object, number) decreases a specified number from 1577 * decrease(object, number) decreases a specified number from
1526 * the amount of an object. If the amount reaches 0, the object 1578 * the amount of an object. If the amount reaches 0, the object
… …
1666 if (op->glow_radius && is_on_map ()) 1718 if (op->glow_radius && is_on_map ())
1667 { 1719 {
1668 update_stats (); 1720 update_stats ();
1669 update_all_los (map, x, y); 1721 update_all_los (map, x, y);
1670 } 1722 }
1671 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) 1723 else if (is_player ())
1672 // if this is a player's inventory, update stats 1724 // if this is a player's inventory, update stats
1673 update_stats (); 1725 contr->queue_stats_update ();
1674 1726
1675 INVOKE_OBJECT (INSERT, this); 1727 INVOKE_OBJECT (INSERT, this);
1676 1728
1677 return op; 1729 return op;
1678} 1730}
… …
1698 * on top. 1750 * on top.
1699 */ 1751 */
1700int 1752int
1701check_move_on (object *op, object *originator) 1753check_move_on (object *op, object *originator)
1702{ 1754{
1755 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1756 return 0;
1757
1703 object *tmp; 1758 object *tmp;
1704 maptile *m = op->map; 1759 maptile *m = op->map;
1705 int x = op->x, y = op->y; 1760 int x = op->x, y = op->y;
1706 1761
1707 MoveType move_on, move_slow, move_block; 1762 mapspace &ms = m->at (x, y);
1708 1763
1709 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1764 ms.update ();
1710 return 0;
1711 1765
1712 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1766 MoveType move_on = ms.move_on;
1713 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1767 MoveType move_slow = ms.move_slow;
1714 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1768 MoveType move_block = ms.move_block;
1715 1769
1716 /* if nothing on this space will slow op down or be applied, 1770 /* if nothing on this space will slow op down or be applied,
1717 * no need to do checking below. have to make sure move_type 1771 * no need to do checking below. have to make sure move_type
1718 * is set, as lots of objects don't have it set - we treat that 1772 * is set, as lots of objects don't have it set - we treat that
1719 * as walking. 1773 * as walking.
… …
1730 return 0; 1784 return 0;
1731 1785
1732 /* The objects have to be checked from top to bottom. 1786 /* The objects have to be checked from top to bottom.
1733 * Hence, we first go to the top: 1787 * Hence, we first go to the top:
1734 */ 1788 */
1735 1789 for (object *next, *tmp = ms.top; tmp; tmp = next)
1736 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1737 {
1738 /* Trim the search when we find the first other spell effect
1739 * this helps performance so that if a space has 50 spell objects,
1740 * we don't need to check all of them.
1741 */
1742 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1743 break;
1744 } 1790 {
1791 next = tmp->below;
1745 1792
1746 for (; tmp; tmp = tmp->below)
1747 {
1748 if (tmp == op) 1793 if (tmp == op)
1749 continue; /* Can't apply yourself */ 1794 continue; /* Can't apply yourself */
1750 1795
1751 /* Check to see if one of the movement types should be slowed down. 1796 /* Check to see if one of the movement types should be slowed down.
1752 * Second check makes sure that the movement types not being slowed 1797 * Second check makes sure that the movement types not being slowed
… …
1757 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1802 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1758 { 1803 {
1759 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1804 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1760 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1805 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1761 { 1806 {
1762
1763 float
1764 diff = tmp->move_slow_penalty * fabs (op->speed); 1807 float diff = tmp->move_slow_penalty * fabs (op->speed);
1765 1808
1766 if (op->is_player ()) 1809 if (op->is_player ())
1767 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1810 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1768 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1811 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1769 diff /= 4.0; 1812 diff /= 4.0;
1770 1813
1771 op->speed_left -= diff; 1814 op->speed_left -= diff;
1772 } 1815 }
1773 } 1816 }
… …
2057 * there is capable of. 2100 * there is capable of.
2058 */ 2101 */
2059int 2102int
2060find_dir (maptile *m, int x, int y, object *exclude) 2103find_dir (maptile *m, int x, int y, object *exclude)
2061{ 2104{
2062 int i, max = SIZEOFFREE, mflags; 2105 int max = SIZEOFFREE, mflags;
2063
2064 sint16 nx, ny;
2065 object *tmp;
2066 maptile *mp;
2067
2068 MoveType blocked, move_type; 2106 MoveType move_type;
2069 2107
2070 if (exclude && exclude->head_ () != exclude) 2108 if (exclude && exclude->head_ () != exclude)
2071 { 2109 {
2072 exclude = exclude->head; 2110 exclude = exclude->head;
2073 move_type = exclude->move_type; 2111 move_type = exclude->move_type;
… …
2076 { 2114 {
2077 /* If we don't have anything, presume it can use all movement types. */ 2115 /* If we don't have anything, presume it can use all movement types. */
2078 move_type = MOVE_ALL; 2116 move_type = MOVE_ALL;
2079 } 2117 }
2080 2118
2081 for (i = 1; i < max; i++) 2119 for (int i = 1; i < max; i++)
2082 { 2120 {
2083 mp = m; 2121 mapxy pos (m, x, y);
2084 nx = x + freearr_x[i]; 2122 pos.move (i);
2085 ny = y + freearr_y[i];
2086 2123
2087 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2124 if (!pos.normalise ())
2088
2089 if (mflags & P_OUT_OF_MAP)
2090 max = maxfree[i]; 2125 max = maxfree[i];
2091 else 2126 else
2092 { 2127 {
2093 mapspace &ms = mp->at (nx, ny); 2128 mapspace &ms = *pos;
2094 2129
2095 blocked = ms.move_block;
2096
2097 if ((move_type & blocked) == move_type) 2130 if ((move_type & ms.move_block) == move_type)
2098 max = maxfree[i]; 2131 max = maxfree [i];
2099 else if (mflags & P_IS_ALIVE) 2132 else if (ms.flags () & P_IS_ALIVE)
2100 { 2133 {
2101 for (tmp = ms.bot; tmp; tmp = tmp->above) 2134 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2102 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) 2135 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2103 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2136 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2104 break;
2105
2106 if (tmp)
2107 return freedir[i]; 2137 return freedir [i];
2108 } 2138 }
2109 } 2139 }
2110 } 2140 }
2111 2141
2112 return 0; 2142 return 0;
… …
2187 * This basically means that if direction is 15, then it could either go 2217 * This basically means that if direction is 15, then it could either go
2188 * direction 4, 14, or 16 to get back to where we are. 2218 * direction 4, 14, or 16 to get back to where we are.
2189 * Moved from spell_util.c to object.c with the other related direction 2219 * Moved from spell_util.c to object.c with the other related direction
2190 * functions. 2220 * functions.
2191 */ 2221 */
2192int reduction_dir[SIZEOFFREE][3] = { 2222static const int reduction_dir[SIZEOFFREE][3] = {
2193 {0, 0, 0}, /* 0 */ 2223 {0, 0, 0}, /* 0 */
2194 {0, 0, 0}, /* 1 */ 2224 {0, 0, 0}, /* 1 */
2195 {0, 0, 0}, /* 2 */ 2225 {0, 0, 0}, /* 2 */
2196 {0, 0, 0}, /* 3 */ 2226 {0, 0, 0}, /* 3 */
2197 {0, 0, 0}, /* 4 */ 2227 {0, 0, 0}, /* 4 */
… …
2335 return tmp; 2365 return tmp;
2336 2366
2337 return 0; 2367 return 0;
2338} 2368}
2339 2369
2340const shstr & 2370shstr_tmp
2341object::kv_get (const shstr &key) const 2371object::kv_get (shstr_tmp key) const
2342{ 2372{
2343 for (key_value *kv = key_values; kv; kv = kv->next) 2373 for (key_value *kv = key_values; kv; kv = kv->next)
2344 if (kv->key == key) 2374 if (kv->key == key)
2345 return kv->value; 2375 return kv->value;
2346 2376
2347 return shstr_null; 2377 return shstr ();
2348} 2378}
2349 2379
2350void 2380void
2351object::kv_set (const shstr &key, const shstr &value) 2381object::kv_set (shstr_tmp key, shstr_tmp value)
2352{ 2382{
2353 for (key_value *kv = key_values; kv; kv = kv->next) 2383 for (key_value *kv = key_values; kv; kv = kv->next)
2354 if (kv->key == key) 2384 if (kv->key == key)
2355 { 2385 {
2356 kv->value = value; 2386 kv->value = value;
… …
2365 2395
2366 key_values = kv; 2396 key_values = kv;
2367} 2397}
2368 2398
2369void 2399void
2370object::kv_del (const shstr &key) 2400object::kv_del (shstr_tmp key)
2371{ 2401{
2372 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2402 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2373 if ((*kvp)->key == key) 2403 if ((*kvp)->key == key)
2374 { 2404 {
2375 key_value *kv = *kvp; 2405 key_value *kv = *kvp;
… …
2468{ 2498{
2469 return map ? map->region (x, y) 2499 return map ? map->region (x, y)
2470 : region::default_region (); 2500 : region::default_region ();
2471} 2501}
2472 2502
2473const materialtype_t *
2474object::dominant_material () const
2475{
2476 if (materialtype_t *mt = name_to_material (materialname))
2477 return mt;
2478
2479 return name_to_material (shstr_unknown);
2480}
2481
2482void 2503void
2483object::open_container (object *new_container) 2504object::open_container (object *new_container)
2484{ 2505{
2485 if (container == new_container) 2506 if (container == new_container)
2486 return; 2507 return;
… …
2506 container = 0; 2527 container = 0;
2507 2528
2508 // client needs item update to make it work, client bug requires this to be separate 2529 // client needs item update to make it work, client bug requires this to be separate
2509 esrv_update_item (UPD_FLAGS, this, old_container); 2530 esrv_update_item (UPD_FLAGS, this, old_container);
2510 2531
2511 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2532 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2512 play_sound (sound_find ("chest_close")); 2533 play_sound (sound_find ("chest_close"));
2513 } 2534 }
2514 2535
2515 if (new_container) 2536 if (new_container)
2516 { 2537 {
… …
2520 // TODO: this does not seem to serve any purpose anymore? 2541 // TODO: this does not seem to serve any purpose anymore?
2521#if 0 2542#if 0
2522 // insert the "Close Container" object. 2543 // insert the "Close Container" object.
2523 if (archetype *closer = new_container->other_arch) 2544 if (archetype *closer = new_container->other_arch)
2524 { 2545 {
2525 object *closer = arch_to_object (new_container->other_arch); 2546 object *closer = new_container->other_arch->instance ();
2526 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2547 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2527 new_container->insert (closer); 2548 new_container->insert (closer);
2528 } 2549 }
2529#endif 2550#endif
2530 2551
2531 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2552 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2532 2553
2533 // make sure the container is available, client bug requires this to be separate 2554 // make sure the container is available, client bug requires this to be separate
2534 esrv_send_item (this, new_container); 2555 esrv_send_item (this, new_container);
2535 2556
2536 new_container->flag [FLAG_APPLIED] = true; 2557 new_container->flag [FLAG_APPLIED] = true;
… …
2544// else if (!old_container->env && contr && contr->ns) 2565// else if (!old_container->env && contr && contr->ns)
2545// contr->ns->floorbox_reset (); 2566// contr->ns->floorbox_reset ();
2546} 2567}
2547 2568
2548object * 2569object *
2549object::force_find (const shstr name) 2570object::force_find (shstr_tmp name)
2550{ 2571{
2551 /* cycle through his inventory to look for the MARK we want to 2572 /* cycle through his inventory to look for the MARK we want to
2552 * place 2573 * place
2553 */ 2574 */
2554 for (object *tmp = inv; tmp; tmp = tmp->below) 2575 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2556 return splay (tmp); 2577 return splay (tmp);
2557 2578
2558 return 0; 2579 return 0;
2559} 2580}
2560 2581
2582//-GPL
2583
2584void
2585object::force_set_timer (int duration)
2586{
2587 this->duration = 1;
2588 this->speed_left = -1.f;
2589
2590 this->set_speed (duration ? 1.f / duration : 0.f);
2591}
2592
2561object * 2593object *
2562object::force_add (const shstr name, int duration) 2594object::force_add (shstr_tmp name, int duration)
2563{ 2595{
2564 if (object *force = force_find (name)) 2596 if (object *force = force_find (name))
2565 force->destroy (); 2597 force->destroy ();
2566 2598
2567 object *force = get_archetype (FORCE_NAME); 2599 object *force = get_archetype (FORCE_NAME);
2568 2600
2569 force->slaying = name; 2601 force->slaying = name;
2570 force->stats.food = 1; 2602 force->force_set_timer (duration);
2571 force->speed_left = -1.f;
2572
2573 force->set_speed (duration ? 1.f / duration : 0.f);
2574 force->flag [FLAG_IS_USED_UP] = true;
2575 force->flag [FLAG_APPLIED] = true; 2603 force->flag [FLAG_APPLIED] = true;
2576 2604
2577 return insert (force); 2605 return insert (force);
2578} 2606}
2579 2607
2580void 2608void
2581object::play_sound (faceidx sound) 2609object::play_sound (faceidx sound) const
2582{ 2610{
2583 if (!sound) 2611 if (!sound)
2584 return; 2612 return;
2585 2613
2586 if (flag [FLAG_REMOVED]) 2614 if (is_on_map ())
2587 return;
2588
2589 if (env)
2590 {
2591 if (object *pl = in_player ())
2592 pl->contr->play_sound (sound);
2593 }
2594 else
2595 map->play_sound (sound, x, y); 2615 map->play_sound (sound, x, y);
2616 else if (object *pl = in_player ())
2617 pl->contr->play_sound (sound);
2618}
2619
2620void
2621object::say_msg (const char *msg) const
2622{
2623 if (is_on_map ())
2624 map->say_msg (msg, x, y);
2625 else if (object *pl = in_player ())
2626 pl->contr->play_sound (sound);
2596} 2627}
2597 2628
2598void 2629void
2599object::make_noise () 2630object::make_noise ()
2600{ 2631{
… …
2626 2657
2627 insert (force); 2658 insert (force);
2628 } 2659 }
2629} 2660}
2630 2661
2662void object::change_move_type (MoveType mt)
2663{
2664 if (move_type == mt)
2665 return;
2666
2667 if (is_on_map ())
2668 {
2669 // we are on the map, so handle move_on/off effects
2670 remove ();
2671 move_type = mt;
2672 map->insert (this, x, y, this);
2673 }
2674 else
2675 move_type = mt;
2676}
2677

Diff Legend

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