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.250 by root, Wed Jul 16 14:29:40 2008 UTC vs.
Revision 1.316 by root, Sun Mar 28 02:53:46 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 && pl->contr->ns && !pl->contr->ns->update_look) 415 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
351 || this == pl->container) 416 || pl->container_ () == this)
352 return pl; 417 return pl;
353 } 418 }
354 } 419 }
355 420
356 return 0; 421 return 0;
… …
434 object_freezer freezer; 499 object_freezer freezer;
435 op->write (freezer); 500 op->write (freezer);
436 return freezer.as_string (); 501 return freezer.as_string ();
437} 502}
438 503
439/* 504char *
440 * get_nearest_part(multi-object, object 2) returns the part of the 505object::as_string ()
441 * multi-object 1 which is closest to the second object.
442 * If it's not a multi-object, it is returned.
443 */
444object *
445get_nearest_part (object *op, const object *pl)
446{ 506{
447 object *tmp, *closest; 507 return dump_object (this);
448 int last_dist, i;
449
450 if (!op->more)
451 return op;
452
453 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
454 tmp;
455 tmp = tmp->more)
456 if ((i = distance (tmp, pl)) < last_dist)
457 closest = tmp, last_dist = i;
458
459 return closest;
460} 508}
461 509
462/* 510/*
463 * 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.
464 * VERRRY slow. 512 * VERRRY slow.
… …
466object * 514object *
467find_object (tag_t i) 515find_object (tag_t i)
468{ 516{
469 for_all_objects (op) 517 for_all_objects (op)
470 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)
471 return op; 534 return op;
472 535
473 return 0; 536 return 0;
474} 537}
475 538
… …
551 { 614 {
552 // now check wether any body locations became invalid, in which case 615 // now check wether any body locations became invalid, in which case
553 // we cannot apply the weapon at the moment. 616 // we cannot apply the weapon at the moment.
554 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i) 617 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
555 if (slot[i].used < 0) 618 if (slot[i].used < 0)
556 { 619 {
620 if (chosen_skill)
621 chosen_skill->flag [FLAG_APPLIED] = false;
622
557 current_weapon = chosen_skill = 0; 623 current_weapon = chosen_skill = 0;
558 update_stats (); 624 update_stats ();
559 625
560 new_draw_info_format (NDI_UNIQUE, 0, this, 626 new_draw_info_format (NDI_UNIQUE, 0, this,
561 "You try to balance all your items at once, " 627 "You try to balance all your items at once, "
562 "but the %s is just too much for your body. " 628 "but the %s is just too much for your body. "
563 "[You need to unapply some items first.]", &ob->name); 629 "[You need to unapply some items first - use the 'body' command to see "
630 "how many items you can wear on a specific body part.]", &ob->name);
564 return false; 631 return false;
565 } 632 }
566 633
567 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 634 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
568 } 635 }
… …
637 tail = new_link; 704 tail = new_link;
638 } 705 }
639 } 706 }
640 } 707 }
641 708
642 if (speed < 0) 709 dst->activate ();
643 dst->speed_left -= rndm ();
644
645 dst->set_speed (dst->speed);
646} 710}
647 711
648void 712void
649object::instantiate () 713object::instantiate ()
650{ 714{
651 if (!uuid.seq) // HACK 715 if (!uuid.seq) // HACK
652 uuid = UUID::gen (); 716 uuid = UUID::gen ();
653 717
718 // TODO: unclean state changes, should nt be done in copy_to AND instantiate
719 if (flag [FLAG_RANDOM_SPEED] && speed)
720 speed_left = - speed - rndm (); // TODO animation
721 else
654 speed_left = -0.1f; 722 speed_left = -1.;
723
655 /* copy the body_info to the body_used - this is only really 724 /* copy the body_info to the body_used - this is only really
656 * need for monsters, but doesn't hurt to do it for everything. 725 * need for monsters, but doesn't hurt to do it for everything.
657 * by doing so, when a monster is created, it has good starting 726 * by doing so, when a monster is created, it has good starting
658 * values for the body_used info, so when items are created 727 * values for the body_used info, so when items are created
659 * for it, they can be properly equipped. 728 * for it, they can be properly equipped.
… …
667object * 736object *
668object::clone () 737object::clone ()
669{ 738{
670 object *neu = create (); 739 object *neu = create ();
671 copy_to (neu); 740 copy_to (neu);
741
742 // TODO: unclean state changes, should not be done in clone AND instantiate
743 if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
744 neu->speed_left = - neu->speed - rndm (); // TODO animation
745
672 neu->map = map; // not copied by copy_to 746 neu->map = map; // not copied by copy_to
673 return neu; 747 return neu;
674} 748}
675 749
676/* 750/*
… …
694 * This function needs to be called whenever the speed of an object changes. 768 * This function needs to be called whenever the speed of an object changes.
695 */ 769 */
696void 770void
697object::set_speed (float speed) 771object::set_speed (float speed)
698{ 772{
699 if (flag [FLAG_FREED] && speed)
700 {
701 LOG (llevError, "Object %s is freed but has speed.\n", &name);
702 speed = 0;
703 }
704
705 this->speed = speed; 773 this->speed = speed;
706 774
707 if (has_active_speed ()) 775 if (has_active_speed ())
708 activate (); 776 activate ();
709 else 777 else
… …
759 827
760 if (!(m.flags_ & P_UPTODATE)) 828 if (!(m.flags_ & P_UPTODATE))
761 /* nop */; 829 /* nop */;
762 else if (action == UP_OBJ_INSERT) 830 else if (action == UP_OBJ_INSERT)
763 { 831 {
832#if 0
764 // this is likely overkill, TODO: revisit (schmorp) 833 // this is likely overkill, TODO: revisit (schmorp)
765 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 834 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
766 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 835 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
767 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 836 || (op->is_player () && !(m.flags_ & P_PLAYER))
768 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 837 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
769 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 838 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
770 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 839 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
771 || (m.move_on | op->move_on ) != m.move_on 840 || (m.move_on | op->move_on ) != m.move_on
772 || (m.move_off | op->move_off ) != m.move_off 841 || (m.move_off | op->move_off ) != m.move_off
773 || (m.move_slow | op->move_slow) != m.move_slow 842 || (m.move_slow | op->move_slow) != m.move_slow
774 /* This isn't perfect, but I don't expect a lot of objects to 843 /* This isn't perfect, but I don't expect a lot of objects to
775 * to have move_allow right now. 844 * have move_allow right now.
776 */ 845 */
777 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 846 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
847 m.invalidate ();
848#else
778 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 849 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
779 m.flags_ = 0; 850 m.invalidate ();
851#endif
780 } 852 }
781 /* if the object is being removed, we can't make intelligent 853 /* if the object is being removed, we can't make intelligent
782 * decisions, because remove_ob can't really pass the object 854 * decisions, because remove_ob can't really pass the object
783 * that is being removed. 855 * that is being removed.
784 */ 856 */
785 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 857 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
786 m.flags_ = 0; 858 m.invalidate ();
787 else if (action == UP_OBJ_FACE) 859 else if (action == UP_OBJ_FACE)
788 /* Nothing to do for that case */ ; 860 /* Nothing to do for that case */ ;
789 else 861 else
790 LOG (llevError, "update_object called with invalid action: %d\n", action); 862 LOG (llevError, "update_object called with invalid action: %d\n", action);
791 863
… …
795 867
796object::object () 868object::object ()
797{ 869{
798 SET_FLAG (this, FLAG_REMOVED); 870 SET_FLAG (this, FLAG_REMOVED);
799 871
800 expmul = 1.0; 872 //expmul = 1.0; declared const for the time being
801 face = blank_face; 873 face = blank_face;
874 material = MATERIAL_NULL;
802} 875}
803 876
804object::~object () 877object::~object ()
805{ 878{
806 unlink (); 879 unlink ();
… …
835 /* If already on active list, don't do anything */ 908 /* If already on active list, don't do anything */
836 if (active) 909 if (active)
837 return; 910 return;
838 911
839 if (has_active_speed ()) 912 if (has_active_speed ())
913 {
914 if (flag [FLAG_FREED])
915 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
916
840 actives.insert (this); 917 actives.insert (this);
918 }
841} 919}
842 920
843void 921void
844object::activate_recursive () 922object::activate_recursive ()
845{ 923{
… …
910 || map->in_memory != MAP_ACTIVE 988 || map->in_memory != MAP_ACTIVE
911 || map->no_drop 989 || map->no_drop
912 || ms ().move_block == MOVE_ALL) 990 || ms ().move_block == MOVE_ALL)
913 { 991 {
914 while (inv) 992 while (inv)
915 inv->destroy (true); 993 inv->destroy ();
916 } 994 }
917 else 995 else
918 { /* Put objects in inventory onto this space */ 996 { /* Put objects in inventory onto this space */
919 while (inv) 997 while (inv)
920 { 998 {
… …
924 || op->flag [FLAG_NO_DROP] 1002 || op->flag [FLAG_NO_DROP]
925 || op->type == RUNE 1003 || op->type == RUNE
926 || op->type == TRAP 1004 || op->type == TRAP
927 || op->flag [FLAG_IS_A_TEMPLATE] 1005 || op->flag [FLAG_IS_A_TEMPLATE]
928 || op->flag [FLAG_DESTROY_ON_DEATH]) 1006 || op->flag [FLAG_DESTROY_ON_DEATH])
929 op->destroy (true); 1007 op->destroy ();
930 else 1008 else
931 map->insert (op, x, y); 1009 map->insert (op, x, y);
932 } 1010 }
933 } 1011 }
934} 1012}
… …
963 1041
964void 1042void
965object::do_destroy () 1043object::do_destroy ()
966{ 1044{
967 if (flag [FLAG_IS_LINKED]) 1045 if (flag [FLAG_IS_LINKED])
968 remove_button_link (this); 1046 remove_link ();
969 1047
970 if (flag [FLAG_FRIENDLY]) 1048 if (flag [FLAG_FRIENDLY])
971 remove_friendly_object (this); 1049 remove_friendly_object (this);
972 1050
973 remove (); 1051 remove ();
… …
998 attacked_by = 0; 1076 attacked_by = 0;
999 current_weapon = 0; 1077 current_weapon = 0;
1000} 1078}
1001 1079
1002void 1080void
1003object::destroy (bool destroy_inventory) 1081object::destroy ()
1004{ 1082{
1005 if (destroyed ()) 1083 if (destroyed ())
1006 return; 1084 return;
1007 1085
1008 if (!is_head () && !head->destroyed ()) 1086 if (!is_head () && !head->destroyed ())
1009 { 1087 {
1010 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 1088 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1011 head->destroy (destroy_inventory); 1089 head->destroy ();
1012 return; 1090 return;
1013 } 1091 }
1014 1092
1015 destroy_inv (!destroy_inventory); 1093 destroy_inv (false);
1016 1094
1017 if (is_head ()) 1095 if (is_head ())
1018 if (sound_destroy) 1096 if (sound_destroy)
1019 play_sound (sound_destroy); 1097 play_sound (sound_destroy);
1020 else if (flag [FLAG_MONSTER]) 1098 else if (flag [FLAG_MONSTER])
… …
1031 * the previous environment. 1109 * the previous environment.
1032 */ 1110 */
1033void 1111void
1034object::do_remove () 1112object::do_remove ()
1035{ 1113{
1036 object *tmp, *last = 0;
1037 object *otmp;
1038
1039 if (flag [FLAG_REMOVED]) 1114 if (flag [FLAG_REMOVED])
1040 return; 1115 return;
1041 1116
1042 INVOKE_OBJECT (REMOVE, this); 1117 INVOKE_OBJECT (REMOVE, this);
1043 1118
… …
1056 if (object *pl = visible_to ()) 1131 if (object *pl = visible_to ())
1057 esrv_del_item (pl->contr, count); 1132 esrv_del_item (pl->contr, count);
1058 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1133 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059 1134
1060 adjust_weight (env, -total_weight ()); 1135 adjust_weight (env, -total_weight ());
1136
1137 object *pl = in_player ();
1061 1138
1062 /* we set up values so that it could be inserted into 1139 /* we set up values so that it could be inserted into
1063 * the map, but we don't actually do that - it is up 1140 * the map, but we don't actually do that - it is up
1064 * to the caller to decide what we want to do. 1141 * to the caller to decide what we want to do.
1065 */ 1142 */
… …
1073 1150
1074 above = 0; 1151 above = 0;
1075 below = 0; 1152 below = 0;
1076 env = 0; 1153 env = 0;
1077 1154
1078 /* NO_FIX_PLAYER is set when a great many changes are being 1155 if (pl && pl->is_player ())
1079 * made to players inventory. If set, avoiding the call
1080 * to save cpu time.
1081 */ 1156 {
1082 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1157 pl->contr->queue_stats_update ();
1083 otmp->update_stats (); 1158
1159 if (glow_radius && pl->is_on_map ())
1160 update_all_los (pl->map, pl->x, pl->y);
1161 }
1084 } 1162 }
1085 else if (map) 1163 else if (map)
1086 { 1164 {
1087 map->dirty = true; 1165 map->dirty = true;
1088 mapspace &ms = this->ms (); 1166 mapspace &ms = this->ms ();
1089 1167
1090 if (object *pl = ms.player ()) 1168 if (object *pl = ms.player ())
1091 { 1169 {
1092 if (type == PLAYER) // this == pl(!) 1170 if (is_player ())
1093 { 1171 {
1172 if (!flag [FLAG_WIZPASS])
1173 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1174
1094 // leaving a spot always closes any open container on the ground 1175 // leaving a spot always closes any open container on the ground
1095 if (container && !container->env) 1176 if (container && !container->env)
1096 // this causes spurious floorbox updates, but it ensures 1177 // this causes spurious floorbox updates, but it ensures
1097 // that the CLOSE event is being sent. 1178 // that the CLOSE event is being sent.
1098 close_container (); 1179 close_container ();
1099 1180
1100 --map->players; 1181 --map->players;
1101 map->touch (); 1182 map->touch ();
1102 } 1183 }
1103 else if (pl->container == this) 1184 else if (pl->container_ () == this)
1104 { 1185 {
1105 // removing a container should close it 1186 // removing a container should close it
1106 close_container (); 1187 close_container ();
1107 } 1188 }
1108 1189
… …
1115 *(below ? &below->above : &ms.bot) = above; 1196 *(below ? &below->above : &ms.bot) = above;
1116 1197
1117 above = 0; 1198 above = 0;
1118 below = 0; 1199 below = 0;
1119 1200
1201 ms.invalidate ();
1202
1120 if (map->in_memory == MAP_SAVING) 1203 if (map->in_memory == MAP_SAVING)
1121 return; 1204 return;
1122 1205
1123 int check_walk_off = !flag [FLAG_NO_APPLY]; 1206 int check_walk_off = !flag [FLAG_NO_APPLY];
1124 1207
1125 if (object *pl = ms.player ()) 1208 if (object *pl = ms.player ())
1126 { 1209 {
1127 if (pl->container == this) 1210 if (pl->container_ () == this)
1128 /* If a container that the player is currently using somehow gets 1211 /* If a container that the player is currently using somehow gets
1129 * removed (most likely destroyed), update the player view 1212 * removed (most likely destroyed), update the player view
1130 * appropriately. 1213 * appropriately.
1131 */ 1214 */
1132 pl->close_container (); 1215 pl->close_container ();
… …
1136 //TODO: update floorbox to preserve ordering 1219 //TODO: update floorbox to preserve ordering
1137 if (pl->contr->ns) 1220 if (pl->contr->ns)
1138 pl->contr->ns->floorbox_update (); 1221 pl->contr->ns->floorbox_update ();
1139 } 1222 }
1140 1223
1224 if (check_walk_off)
1141 for (tmp = ms.bot; tmp; tmp = tmp->above) 1225 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1142 { 1226 {
1227 above = tmp->above;
1228
1143 /* No point updating the players look faces if he is the object 1229 /* No point updating the players look faces if he is the object
1144 * being removed. 1230 * being removed.
1145 */ 1231 */
1146 1232
1147 /* See if object moving off should effect something */ 1233 /* See if object moving off should effect something */
1148 if (check_walk_off
1149 && ((move_type & tmp->move_off) 1234 if ((move_type & tmp->move_off)
1150 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1235 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1151 {
1152 move_apply (tmp, this, 0); 1236 move_apply (tmp, this, 0);
1153
1154 if (destroyed ())
1155 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1156 } 1237 }
1157 1238
1158 last = tmp; 1239 if (affects_los ())
1159 }
1160
1161 /* last == NULL if there are no objects on this space */
1162 //TODO: this makes little sense, why only update the topmost object?
1163 if (!last)
1164 map->at (x, y).flags_ = 0;
1165 else
1166 update_object (last, UP_OBJ_REMOVE);
1167
1168 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1169 update_all_los (map, x, y); 1240 update_all_los (map, x, y);
1170 } 1241 }
1171} 1242}
1172 1243
1173/* 1244/*
… …
1197 esrv_update_item (UPD_NROF, pl, top); 1268 esrv_update_item (UPD_NROF, pl, top);
1198 1269
1199 op->weight = 0; // cancel the addition above 1270 op->weight = 0; // cancel the addition above
1200 op->carrying = 0; // must be 0 already 1271 op->carrying = 0; // must be 0 already
1201 1272
1202 op->destroy (1); 1273 op->destroy ();
1203 1274
1204 return top; 1275 return top;
1205 } 1276 }
1206 1277
1207 return 0; 1278 return 0;
… …
1215 1286
1216 object *prev = this; 1287 object *prev = this;
1217 1288
1218 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more) 1289 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1219 { 1290 {
1220 object *op = arch_to_object (at); 1291 object *op = at->instance ();
1221 1292
1222 op->name = name; 1293 op->name = name;
1223 op->name_pl = name_pl; 1294 op->name_pl = name_pl;
1224 op->title = title; 1295 op->title = title;
1225 1296
… …
1263 * Passing 0 for flag gives proper default values, so flag really only needs 1334 * Passing 0 for flag gives proper default values, so flag really only needs
1264 * to be set if special handling is needed. 1335 * to be set if special handling is needed.
1265 * 1336 *
1266 * Return value: 1337 * Return value:
1267 * new object if 'op' was merged with other object 1338 * new object if 'op' was merged with other object
1268 * NULL if 'op' was destroyed 1339 * NULL if there was an error (destroyed, blocked etc.)
1269 * just 'op' otherwise 1340 * just 'op' otherwise
1270 */ 1341 */
1271object * 1342object *
1272insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1343insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1273{ 1344{
1274 if (op->is_on_map ())
1275 {
1276 LOG (llevError, "insert_ob_in_map called for object already on map");
1277 abort ();
1278 }
1279
1280 if (op->env)
1281 {
1282 LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1283 op->remove (); 1345 op->remove ();
1284 }
1285 1346
1286 if (op->face && !face_info (op->face))//D TODO: remove soon 1347 if (m == &freed_map)//D TODO: remove soon
1287 {//D 1348 {//D
1288 LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D 1349 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1289 op->face = 1;//D
1290 }//D 1350 }//D
1291 1351
1292 /* Ideally, the caller figures this out. However, it complicates a lot 1352 /* Ideally, the caller figures this out. However, it complicates a lot
1293 * of areas of callers (eg, anything that uses find_free_spot would now 1353 * of areas of callers (eg, anything that uses find_free_spot would now
1294 * need extra work 1354 * need extra work
1295 */ 1355 */
1356 maptile *newmap = m;
1296 if (!xy_normalise (m, op->x, op->y)) 1357 if (!xy_normalise (newmap, op->x, op->y))
1297 { 1358 {
1298 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found 1359 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1299 return 0; 1360 return 0;
1300 } 1361 }
1301 1362
1302 if (object *more = op->more) 1363 if (object *more = op->more)
1303 if (!insert_ob_in_map (more, m, originator, flag)) 1364 if (!insert_ob_in_map (more, m, originator, flag))
1304 return 0; 1365 return 0;
1305 1366
1306 CLEAR_FLAG (op, FLAG_REMOVED); 1367 op->flag [FLAG_REMOVED] = false;
1307 1368 op->env = 0;
1308 op->map = m; 1369 op->map = newmap;
1370
1309 mapspace &ms = op->ms (); 1371 mapspace &ms = op->ms ();
1310 1372
1311 /* this has to be done after we translate the coordinates. 1373 /* this has to be done after we translate the coordinates.
1312 */ 1374 */
1313 if (op->nrof && !(flag & INS_NO_MERGE)) 1375 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1316 { 1378 {
1317 // TODO: we actually want to update tmp, not op, 1379 // TODO: we actually want to update tmp, not op,
1318 // but some caller surely breaks when we return tmp 1380 // but some caller surely breaks when we return tmp
1319 // from here :/ 1381 // from here :/
1320 op->nrof += tmp->nrof; 1382 op->nrof += tmp->nrof;
1321 tmp->destroy (1); 1383 tmp->destroy ();
1322 } 1384 }
1323 1385
1324 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1386 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1325 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1387 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1326 1388
… …
1334 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1396 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1335 abort (); 1397 abort ();
1336 } 1398 }
1337 1399
1338 if (!originator->is_on_map ()) 1400 if (!originator->is_on_map ())
1401 {
1339 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", 1402 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1340 op->debug_desc (), originator->debug_desc ()); 1403 op->debug_desc (), originator->debug_desc ());
1404 abort ();
1405 }
1341 1406
1342 op->above = originator; 1407 op->above = originator;
1343 op->below = originator->below; 1408 op->below = originator->below;
1344 originator->below = op; 1409 originator->below = op;
1345 1410
… …
1431 op->below = top; 1496 op->below = top;
1432 *(op->above ? &op->above->below : &ms.top) = op; 1497 *(op->above ? &op->above->below : &ms.top) = op;
1433 } 1498 }
1434 } 1499 }
1435 1500
1436 if (op->type == PLAYER) 1501 if (op->is_player ())
1437 { 1502 {
1438 op->contr->do_los = 1; 1503 op->contr->do_los = 1;
1439 ++op->map->players; 1504 ++op->map->players;
1440 op->map->touch (); 1505 op->map->touch ();
1441 } 1506 }
… …
1456 * be far away from this change and not affected in any way - 1521 * be far away from this change and not affected in any way -
1457 * this should get redone to only look for players within range, 1522 * this should get redone to only look for players within range,
1458 * or just updating the P_UPTODATE for spaces within this area 1523 * or just updating the P_UPTODATE for spaces within this area
1459 * of effect may be sufficient. 1524 * of effect may be sufficient.
1460 */ 1525 */
1461 if (op->map->darkness && (op->glow_radius != 0)) 1526 if (op->affects_los ())
1527 {
1528 op->ms ().invalidate ();
1462 update_all_los (op->map, op->x, op->y); 1529 update_all_los (op->map, op->x, op->y);
1530 }
1463 1531
1464 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1532 /* updates flags (blocked, alive, no magic, etc) for this map space */
1465 update_object (op, UP_OBJ_INSERT); 1533 update_object (op, UP_OBJ_INSERT);
1466 1534
1467 INVOKE_OBJECT (INSERT, op); 1535 INVOKE_OBJECT (INSERT, op);
… …
1474 * blocked() and wall() work properly), and these flags are updated by 1542 * blocked() and wall() work properly), and these flags are updated by
1475 * update_object(). 1543 * update_object().
1476 */ 1544 */
1477 1545
1478 /* if this is not the head or flag has been passed, don't check walk on status */ 1546 /* if this is not the head or flag has been passed, don't check walk on status */
1479 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1547 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1480 { 1548 {
1481 if (check_move_on (op, originator)) 1549 if (check_move_on (op, originator))
1482 return 0; 1550 return 0;
1483 1551
1484 /* If we are a multi part object, lets work our way through the check 1552 /* If we are a multi part object, lets work our way through the check
… …
1495/* this function inserts an object in the map, but if it 1563/* this function inserts an object in the map, but if it
1496 * finds an object of its own type, it'll remove that one first. 1564 * finds an object of its own type, it'll remove that one first.
1497 * op is the object to insert it under: supplies x and the map. 1565 * op is the object to insert it under: supplies x and the map.
1498 */ 1566 */
1499void 1567void
1500replace_insert_ob_in_map (const char *arch_string, object *op) 1568replace_insert_ob_in_map (shstr_tmp archname, object *op)
1501{ 1569{
1502 /* first search for itself and remove any old instances */ 1570 /* first search for itself and remove any old instances */
1503 1571
1504 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1572 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1505 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1573 if (tmp->arch->archname == archname) /* same archetype */
1506 tmp->destroy (1); 1574 tmp->destroy ();
1507 1575
1508 object *tmp = arch_to_object (archetype::find (arch_string)); 1576 object *tmp = archetype::find (archname)->instance ();
1509 1577
1510 tmp->x = op->x; 1578 tmp->x = op->x;
1511 tmp->y = op->y; 1579 tmp->y = op->y;
1512 1580
1513 insert_ob_in_map (tmp, op->map, op, 0); 1581 insert_ob_in_map (tmp, op->map, op, 0);
… …
1518{ 1586{
1519 if (where->env) 1587 if (where->env)
1520 return where->env->insert (this); 1588 return where->env->insert (this);
1521 else 1589 else
1522 return where->map->insert (this, where->x, where->y, originator, flags); 1590 return where->map->insert (this, where->x, where->y, originator, flags);
1591}
1592
1593// check whether we can put this into the map, respect max_volume, max_items
1594bool
1595object::can_drop_at (maptile *m, int x, int y, object *originator)
1596{
1597 mapspace &ms = m->at (x, y);
1598
1599 int items = ms.items ();
1600
1601 if (!items // testing !items ensures we can drop at least one item
1602 || (items < m->max_items
1603 && ms.volume () < m->max_volume))
1604 return true;
1605
1606 if (originator && originator->is_player ())
1607 originator->contr->failmsg (format (
1608 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1609 query_name ()
1610 ));
1611
1612 return false;
1523} 1613}
1524 1614
1525/* 1615/*
1526 * decrease(object, number) decreases a specified number from 1616 * decrease(object, number) decreases a specified number from
1527 * the amount of an object. If the amount reaches 0, the object 1617 * the amount of an object. If the amount reaches 0, the object
… …
1535 if (!nr) 1625 if (!nr)
1536 return true; 1626 return true;
1537 1627
1538 nr = min (nr, nrof); 1628 nr = min (nr, nrof);
1539 1629
1630 if (nrof > nr)
1631 {
1540 nrof -= nr; 1632 nrof -= nr;
1541
1542 if (nrof)
1543 {
1544 adjust_weight (env, -weight * max (1, nr)); // carrying == 0 1633 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1545 1634
1546 if (object *pl = visible_to ()) 1635 if (object *pl = visible_to ())
1547 esrv_update_item (UPD_NROF, pl, this); 1636 esrv_update_item (UPD_NROF, pl, this);
1548 1637
… …
1635 if (object *pl = tmp->visible_to ()) 1724 if (object *pl = tmp->visible_to ())
1636 esrv_update_item (UPD_NROF, pl, tmp); 1725 esrv_update_item (UPD_NROF, pl, tmp);
1637 1726
1638 adjust_weight (this, op->total_weight ()); 1727 adjust_weight (this, op->total_weight ());
1639 1728
1640 op->destroy (1); 1729 op->destroy ();
1641 op = tmp; 1730 op = tmp;
1642 goto inserted; 1731 goto inserted;
1643 } 1732 }
1644 1733
1645 op->owner = 0; // it's his/hers now. period. 1734 op->owner = 0; // it's his/hers now. period.
… …
1663 1752
1664 adjust_weight (this, op->total_weight ()); 1753 adjust_weight (this, op->total_weight ());
1665 1754
1666inserted: 1755inserted:
1667 /* reset the light list and los of the players on the map */ 1756 /* reset the light list and los of the players on the map */
1668 if (op->glow_radius && map && map->darkness) 1757 if (op->glow_radius && is_on_map ())
1758 {
1759 update_stats ();
1669 update_all_los (map, x, y); 1760 update_all_los (map, x, y);
1670 1761 }
1762 else if (is_player ())
1671 // if this is a player's inventory, update stats 1763 // if this is a player's inventory, update stats
1672 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) 1764 contr->queue_stats_update ();
1673 update_stats ();
1674 1765
1675 INVOKE_OBJECT (INSERT, this); 1766 INVOKE_OBJECT (INSERT, this);
1676 1767
1677 return op; 1768 return op;
1678} 1769}
… …
1698 * on top. 1789 * on top.
1699 */ 1790 */
1700int 1791int
1701check_move_on (object *op, object *originator) 1792check_move_on (object *op, object *originator)
1702{ 1793{
1794 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1795 return 0;
1796
1703 object *tmp; 1797 object *tmp;
1704 maptile *m = op->map; 1798 maptile *m = op->map;
1705 int x = op->x, y = op->y; 1799 int x = op->x, y = op->y;
1706 1800
1707 MoveType move_on, move_slow, move_block; 1801 mapspace &ms = m->at (x, y);
1708 1802
1709 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1803 ms.update ();
1710 return 0;
1711 1804
1712 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1805 MoveType move_on = ms.move_on;
1713 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1806 MoveType move_slow = ms.move_slow;
1714 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1807 MoveType move_block = ms.move_block;
1715 1808
1716 /* if nothing on this space will slow op down or be applied, 1809 /* 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 1810 * 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 1811 * is set, as lots of objects don't have it set - we treat that
1719 * as walking. 1812 * as walking.
… …
1730 return 0; 1823 return 0;
1731 1824
1732 /* The objects have to be checked from top to bottom. 1825 /* The objects have to be checked from top to bottom.
1733 * Hence, we first go to the top: 1826 * Hence, we first go to the top:
1734 */ 1827 */
1735 1828 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 } 1829 {
1830 next = tmp->below;
1745 1831
1746 for (; tmp; tmp = tmp->below)
1747 {
1748 if (tmp == op) 1832 if (tmp == op)
1749 continue; /* Can't apply yourself */ 1833 continue; /* Can't apply yourself */
1750 1834
1751 /* Check to see if one of the movement types should be slowed down. 1835 /* 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 1836 * Second check makes sure that the movement types not being slowed
… …
1757 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1841 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1758 { 1842 {
1759 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1843 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)) 1844 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1761 { 1845 {
1762
1763 float
1764 diff = tmp->move_slow_penalty * fabs (op->speed); 1846 float diff = tmp->move_slow_penalty * fabs (op->speed);
1765 1847
1766 if (op->type == PLAYER) 1848 if (op->is_player ())
1767 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1849 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))) 1850 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1769 diff /= 4.0; 1851 diff /= 4.0;
1770 1852
1771 op->speed_left -= diff; 1853 op->speed_left -= diff;
1772 } 1854 }
1773 } 1855 }
… …
1979 * head of the object should correspond for the entire object. 2061 * head of the object should correspond for the entire object.
1980 */ 2062 */
1981 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 2063 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1982 continue; 2064 continue;
1983 2065
1984 if (ob->blocked (m, pos.x, pos.y)) 2066 if (ob->blocked (pos.m, pos.x, pos.y))
1985 continue; 2067 continue;
1986 2068
1987 altern [index++] = i; 2069 altern [index++] = i;
1988 } 2070 }
1989 2071
… …
2057 * there is capable of. 2139 * there is capable of.
2058 */ 2140 */
2059int 2141int
2060find_dir (maptile *m, int x, int y, object *exclude) 2142find_dir (maptile *m, int x, int y, object *exclude)
2061{ 2143{
2062 int i, max = SIZEOFFREE, mflags; 2144 int max = SIZEOFFREE, mflags;
2063
2064 sint16 nx, ny;
2065 object *tmp;
2066 maptile *mp;
2067
2068 MoveType blocked, move_type; 2145 MoveType move_type;
2069 2146
2070 if (exclude && exclude->head_ () != exclude) 2147 if (exclude && exclude->head_ () != exclude)
2071 { 2148 {
2072 exclude = exclude->head; 2149 exclude = exclude->head;
2073 move_type = exclude->move_type; 2150 move_type = exclude->move_type;
… …
2076 { 2153 {
2077 /* If we don't have anything, presume it can use all movement types. */ 2154 /* If we don't have anything, presume it can use all movement types. */
2078 move_type = MOVE_ALL; 2155 move_type = MOVE_ALL;
2079 } 2156 }
2080 2157
2081 for (i = 1; i < max; i++) 2158 for (int i = 1; i < max; i++)
2082 { 2159 {
2083 mp = m; 2160 mapxy pos (m, x, y);
2084 nx = x + freearr_x[i]; 2161 pos.move (i);
2085 ny = y + freearr_y[i];
2086 2162
2087 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2163 if (!pos.normalise ())
2088
2089 if (mflags & P_OUT_OF_MAP)
2090 max = maxfree[i]; 2164 max = maxfree[i];
2091 else 2165 else
2092 { 2166 {
2093 mapspace &ms = mp->at (nx, ny); 2167 mapspace &ms = *pos;
2094 2168
2095 blocked = ms.move_block;
2096
2097 if ((move_type & blocked) == move_type) 2169 if ((move_type & ms.move_block) == move_type)
2098 max = maxfree[i]; 2170 max = maxfree [i];
2099 else if (mflags & P_IS_ALIVE) 2171 else if (ms.flags () & P_IS_ALIVE)
2100 { 2172 {
2101 for (tmp = ms.bot; tmp; tmp = tmp->above) 2173 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2102 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2174 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2103 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2175 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2104 break;
2105
2106 if (tmp)
2107 return freedir[i]; 2176 return freedir [i];
2108 } 2177 }
2109 } 2178 }
2110 } 2179 }
2111 2180
2112 return 0; 2181 return 0;
… …
2187 * This basically means that if direction is 15, then it could either go 2256 * 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. 2257 * 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 2258 * Moved from spell_util.c to object.c with the other related direction
2190 * functions. 2259 * functions.
2191 */ 2260 */
2192int reduction_dir[SIZEOFFREE][3] = { 2261static const int reduction_dir[SIZEOFFREE][3] = {
2193 {0, 0, 0}, /* 0 */ 2262 {0, 0, 0}, /* 0 */
2194 {0, 0, 0}, /* 1 */ 2263 {0, 0, 0}, /* 1 */
2195 {0, 0, 0}, /* 2 */ 2264 {0, 0, 0}, /* 2 */
2196 {0, 0, 0}, /* 3 */ 2265 {0, 0, 0}, /* 3 */
2197 {0, 0, 0}, /* 4 */ 2266 {0, 0, 0}, /* 4 */
… …
2293int 2362int
2294can_pick (const object *who, const object *item) 2363can_pick (const object *who, const object *item)
2295{ 2364{
2296 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2365 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2297 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2366 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2298 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2367 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2299} 2368}
2300 2369
2301/* 2370/*
2302 * create clone from object to another 2371 * create clone from object to another
2303 */ 2372 */
… …
2335 return tmp; 2404 return tmp;
2336 2405
2337 return 0; 2406 return 0;
2338} 2407}
2339 2408
2340const shstr & 2409shstr_tmp
2341object::kv_get (const shstr &key) const 2410object::kv_get (shstr_tmp key) const
2342{ 2411{
2343 for (key_value *kv = key_values; kv; kv = kv->next) 2412 for (key_value *kv = key_values; kv; kv = kv->next)
2344 if (kv->key == key) 2413 if (kv->key == key)
2345 return kv->value; 2414 return kv->value;
2346 2415
2347 return shstr_null; 2416 return shstr ();
2348} 2417}
2349 2418
2350void 2419void
2351object::kv_set (const shstr &key, const shstr &value) 2420object::kv_set (shstr_tmp key, shstr_tmp value)
2352{ 2421{
2353 for (key_value *kv = key_values; kv; kv = kv->next) 2422 for (key_value *kv = key_values; kv; kv = kv->next)
2354 if (kv->key == key) 2423 if (kv->key == key)
2355 { 2424 {
2356 kv->value = value; 2425 kv->value = value;
… …
2365 2434
2366 key_values = kv; 2435 key_values = kv;
2367} 2436}
2368 2437
2369void 2438void
2370object::kv_del (const shstr &key) 2439object::kv_del (shstr_tmp key)
2371{ 2440{
2372 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2441 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2373 if ((*kvp)->key == key) 2442 if ((*kvp)->key == key)
2374 { 2443 {
2375 key_value *kv = *kvp; 2444 key_value *kv = *kvp;
… …
2468{ 2537{
2469 return map ? map->region (x, y) 2538 return map ? map->region (x, y)
2470 : region::default_region (); 2539 : region::default_region ();
2471} 2540}
2472 2541
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 2542void
2483object::open_container (object *new_container) 2543object::open_container (object *new_container)
2484{ 2544{
2485 if (container == new_container) 2545 if (container == new_container)
2486 return; 2546 return;
… …
2506 container = 0; 2566 container = 0;
2507 2567
2508 // client needs item update to make it work, client bug requires this to be separate 2568 // client needs item update to make it work, client bug requires this to be separate
2509 esrv_update_item (UPD_FLAGS, this, old_container); 2569 esrv_update_item (UPD_FLAGS, this, old_container);
2510 2570
2511 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2571 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2512 play_sound (sound_find ("chest_close")); 2572 play_sound (sound_find ("chest_close"));
2513 } 2573 }
2514 2574
2515 if (new_container) 2575 if (new_container)
2516 { 2576 {
… …
2520 // TODO: this does not seem to serve any purpose anymore? 2580 // TODO: this does not seem to serve any purpose anymore?
2521#if 0 2581#if 0
2522 // insert the "Close Container" object. 2582 // insert the "Close Container" object.
2523 if (archetype *closer = new_container->other_arch) 2583 if (archetype *closer = new_container->other_arch)
2524 { 2584 {
2525 object *closer = arch_to_object (new_container->other_arch); 2585 object *closer = new_container->other_arch->instance ();
2526 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2586 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2527 new_container->insert (closer); 2587 new_container->insert (closer);
2528 } 2588 }
2529#endif 2589#endif
2530 2590
2531 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2591 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2532 2592
2533 // make sure the container is available, client bug requires this to be separate 2593 // make sure the container is available, client bug requires this to be separate
2534 esrv_send_item (this, new_container); 2594 esrv_send_item (this, new_container);
2535 2595
2536 new_container->flag [FLAG_APPLIED] = true; 2596 new_container->flag [FLAG_APPLIED] = true;
… …
2544// else if (!old_container->env && contr && contr->ns) 2604// else if (!old_container->env && contr && contr->ns)
2545// contr->ns->floorbox_reset (); 2605// contr->ns->floorbox_reset ();
2546} 2606}
2547 2607
2548object * 2608object *
2549object::force_find (const shstr name) 2609object::force_find (shstr_tmp name)
2550{ 2610{
2551 /* cycle through his inventory to look for the MARK we want to 2611 /* cycle through his inventory to look for the MARK we want to
2552 * place 2612 * place
2553 */ 2613 */
2554 for (object *tmp = inv; tmp; tmp = tmp->below) 2614 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2556 return splay (tmp); 2616 return splay (tmp);
2557 2617
2558 return 0; 2618 return 0;
2559} 2619}
2560 2620
2621//-GPL
2622
2561void 2623void
2624object::force_set_timer (int duration)
2625{
2626 this->duration = 1;
2627 this->speed_left = -1.f;
2628
2629 this->set_speed (duration ? 1.f / duration : 0.f);
2630}
2631
2632object *
2562object::force_add (const shstr name, int duration) 2633object::force_add (shstr_tmp name, int duration)
2563{ 2634{
2564 if (object *force = force_find (name)) 2635 if (object *force = force_find (name))
2565 force->destroy (); 2636 force->destroy ();
2566 2637
2567 object *force = get_archetype (FORCE_NAME); 2638 object *force = get_archetype (FORCE_NAME);
2568 2639
2569 force->slaying = name; 2640 force->slaying = name;
2570 force->stats.food = 1; 2641 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; 2642 force->flag [FLAG_APPLIED] = true;
2576 2643
2577 insert (force); 2644 return insert (force);
2578} 2645}
2579 2646
2580void 2647void
2581object::play_sound (faceidx sound) 2648object::play_sound (faceidx sound) const
2582{ 2649{
2583 if (!sound) 2650 if (!sound)
2584 return; 2651 return;
2585 2652
2586 if (flag [FLAG_REMOVED]) 2653 if (is_on_map ())
2654 map->play_sound (sound, x, y);
2655 else if (object *pl = in_player ())
2656 pl->contr->play_sound (sound);
2657}
2658
2659void
2660object::say_msg (const char *msg) const
2661{
2662 if (is_on_map ())
2663 map->say_msg (msg, x, y);
2664 else if (object *pl = in_player ())
2665 pl->contr->play_sound (sound);
2666}
2667
2668void
2669object::make_noise ()
2670{
2671 // we do not model noise in the map, so instead put
2672 // a temporary light into the noise source
2673 // could use the map instead, but that's less reliable for our
2674 // goal, which is to make invisibility a bit harder to exploit
2675
2676 // currently only works sensibly for players
2677 if (!is_player ())
2587 return; 2678 return;
2588 2679
2589 if (env) 2680 // find old force, or create new one
2590 { 2681 object *force = force_find (shstr_noise_force);
2591 if (object *pl = in_player ()) 2682
2592 pl->contr->play_sound (sound); 2683 if (force)
2593 } 2684 force->speed_left = -1.f; // patch old speed up
2594 else 2685 else
2595 map->play_sound (sound, x, y); 2686 {
2596} 2687 force = archetype::get (shstr_noise_force);
2597 2688
2689 force->slaying = shstr_noise_force;
2690 force->stats.food = 1;
2691 force->speed_left = -1.f;
2692
2693 force->set_speed (1.f / 4.f);
2694 force->flag [FLAG_IS_USED_UP] = true;
2695 force->flag [FLAG_APPLIED] = true;
2696
2697 insert (force);
2698 }
2699}
2700
2701void object::change_move_type (MoveType mt)
2702{
2703 if (move_type == mt)
2704 return;
2705
2706 if (is_on_map ())
2707 {
2708 // we are on the map, so handle move_on/off effects
2709 remove ();
2710 move_type = mt;
2711 map->insert (this, x, y, this);
2712 }
2713 else
2714 move_type = mt;
2715}
2716

Diff Legend

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