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.232 by root, Tue May 6 18:09:42 2008 UTC vs.
Revision 1.299 by root, Sun Nov 8 20:55:39 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
32#include <bitset> 33#include <bitset>
33 34
34UUID UUID::cur; 35UUID UUID::cur;
35static uint64_t seq_next_save; 36static uint64_t seq_next_save;
36static const uint64 UUID_GAP = 1<<19; 37static const uint64 UUID_GAP = 1<<19;
38uint32_t mapspace::smellcount = 10000;
37 39
38objectvec objects; 40objectvec objects;
39activevec actives; 41activevec actives;
42
43//+GPL
40 44
41short freearr_x[SIZEOFFREE] = { 45short freearr_x[SIZEOFFREE] = {
42 0, 46 0,
43 0, 1, 1, 1, 0, -1, -1, -1, 47 0, 1, 1, 1, 0, -1, -1, -1,
44 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 48 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
… …
48 0, 52 0,
49 -1, -1, 0, 1, 1, 1, 0, -1, 53 -1, -1, 0, 1, 1, 1, 0, -1,
50 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 54 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
51 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 55 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
52}; 56};
53int maxfree[SIZEOFFREE] = {
54 0,
55 9, 10, 13, 14, 17, 18, 21, 22,
56 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
57 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
58};
59int freedir[SIZEOFFREE] = { 57int freedir[SIZEOFFREE] = {
60 0, 58 0,
61 1, 2, 3, 4, 5, 6, 7, 8, 59 1, 2, 3, 4, 5, 6, 7, 8,
62 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 60 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
63 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 61 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
62};
63
64static int maxfree[SIZEOFFREE] = {
65 0,
66 9, 10, 13, 14, 17, 18, 21, 22,
67 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
68 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
64}; 69};
65 70
66static void 71static void
67write_uuid (uval64 skip, bool sync) 72write_uuid (uval64 skip, bool sync)
68{ 73{
… …
181bool object::can_merge_slow (object *ob1, object *ob2) 186bool object::can_merge_slow (object *ob1, object *ob2)
182{ 187{
183 /* A couple quicksanity checks */ 188 /* A couple quicksanity checks */
184 if (ob1 == ob2 189 if (ob1 == ob2
185 || ob1->type != ob2->type 190 || ob1->type != ob2->type
186 || ob1->speed != ob2->speed 191 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
187 || ob1->value != ob2->value 192 || ob1->value != ob2->value
188 || ob1->name != ob2->name) 193 || ob1->name != ob2->name)
189 return 0; 194 return 0;
190 195
191 /* Do not merge objects if nrof would overflow. First part checks 196 /* Do not merge objects if nrof would overflow, assume nrof
192 * for unsigned overflow (2c), second part checks whether the result 197 * is always 0 .. 2**31-1 */
193 * would fit into a 32 bit signed int, which is often used to hold 198 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; 199 return 0;
198 200
199 /* If the objects have been identified, set the BEEN_APPLIED flag. 201 /* 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 202 * 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 203 * just can't ignore the been applied or identified flags, as they
… …
206 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 208 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
207 209
208 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 210 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
209 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 211 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
210 212
211 if (ob1->arch->name != ob2->arch->name 213 if (ob1->arch->archname != ob2->arch->archname
212 || ob1->name != ob2->name 214 || ob1->name != ob2->name
213 || ob1->title != ob2->title 215 || ob1->title != ob2->title
214 || ob1->msg != ob2->msg 216 || ob1->msg != ob2->msg
215 || ob1->weight != ob2->weight 217 || ob1->weight != ob2->weight
216 || ob1->attacktype != ob2->attacktype 218 || ob1->attacktype != ob2->attacktype
217 || ob1->magic != ob2->magic 219 || ob1->magic != ob2->magic
218 || ob1->slaying != ob2->slaying 220 || ob1->slaying != ob2->slaying
219 || ob1->skill != ob2->skill 221 || ob1->skill != ob2->skill
220 || ob1->value != ob2->value 222 || ob1->value != ob2->value
221 || ob1->animation_id != ob2->animation_id 223 || ob1->animation_id != ob2->animation_id
224 || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
222 || ob1->client_type != ob2->client_type 225 || ob1->client_type != ob2->client_type
223 || ob1->materialname != ob2->materialname 226 || ob1->materialname != ob2->materialname
224 || ob1->lore != ob2->lore 227 || ob1->lore != ob2->lore
225 || ob1->subtype != ob2->subtype 228 || ob1->subtype != ob2->subtype
226 || ob1->move_type != ob2->move_type 229 || ob1->move_type != ob2->move_type
227 || ob1->move_block != ob2->move_block 230 || ob1->move_block != ob2->move_block
228 || ob1->move_allow != ob2->move_allow 231 || ob1->move_allow != ob2->move_allow
229 || ob1->move_on != ob2->move_on 232 || ob1->move_on != ob2->move_on
230 || ob1->move_off != ob2->move_off 233 || ob1->move_off != ob2->move_off
231 || ob1->move_slow != ob2->move_slow 234 || ob1->move_slow != ob2->move_slow
232 || ob1->move_slow_penalty != ob2->move_slow_penalty 235 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) 236 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 237 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235 return 0; 238 return 0;
236 239
237 if ((ob1->flag ^ ob2->flag) 240 if ((ob1->flag ^ ob2->flag)
238 .reset (FLAG_INV_LOCKED) 241 .reset (FLAG_INV_LOCKED)
239 .reset (FLAG_CLIENT_SENT)
240 .reset (FLAG_REMOVED) 242 .reset (FLAG_REMOVED)
241 .any ()) 243 .any ())
242 return 0; 244 return 0;
243 245
244 /* This is really a spellbook check - we should in general 246 /* This is really a spellbook check - we should in general
… …
326 { 328 {
327 // see if we are in a container of sorts 329 // see if we are in a container of sorts
328 if (env) 330 if (env)
329 { 331 {
330 // the player inventory itself is always visible 332 // the player inventory itself is always visible
331 if (env->type == PLAYER) 333 if (env->is_player ())
332 return env; 334 return env;
333 335
334 // else a player could have our env open 336 // else a player could have our env open
335 object *envest = env->outer_env (); 337 object *envest = env->outer_env_or_self ();
336 338
337 // the player itself is always on a map, so we will find him here 339 // the player itself is always on a map, so we will find him here
338 // even if our inv is in a player. 340 // even if our inv is in a player.
339 if (envest->is_on_map ()) 341 if (envest->is_on_map ())
340 if (object *pl = envest->ms ().player ()) 342 if (object *pl = envest->ms ().player ())
341 if (pl->container == env) 343 if (pl->container_ () == env)
342 return pl; 344 return pl;
343 } 345 }
344 else 346 else
345 { 347 {
346 // maybe there is a player standing on the same mapspace 348 // maybe there is a player standing on the same mapspace
347 // this will catch the case where "this" is a player 349 // this will catch the case where "this" is a player
348 if (object *pl = ms ().player ()) 350 if (object *pl = ms ().player ())
349 if (!pl->container || this == pl->container) 351 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
352 || pl->container_ () == this)
350 return pl; 353 return pl;
351 } 354 }
352 } 355 }
353 356
354 return 0; 357 return 0;
355} 358}
356 359
357// adjust weight per container type ("of holding") 360// adjust weight per container type ("of holding")
358static sint32 361static sint32
359weight_adjust (object *op, sint32 weight) 362weight_adjust_for (object *op, sint32 weight)
360{ 363{
361 return op->type == CONTAINER 364 return op->type == CONTAINER
362 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str) 365 ? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
363 : weight; 366 : weight;
364} 367}
… …
370static void 373static void
371adjust_weight (object *op, sint32 weight) 374adjust_weight (object *op, sint32 weight)
372{ 375{
373 while (op) 376 while (op)
374 { 377 {
378 // adjust by actual difference to account for rounding errors
379 // i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
375 weight = weight_adjust (op, weight); 380 weight = weight_adjust_for (op, op->carrying)
381 - weight_adjust_for (op, op->carrying - weight);
376 382
377 if (!weight) 383 if (!weight)
378 return; 384 return;
379 385
380 op->carrying += weight; 386 op->carrying += weight;
… …
403 op->update_weight (); 409 op->update_weight ();
404 410
405 sum += op->total_weight (); 411 sum += op->total_weight ();
406 } 412 }
407 413
408 sum = weight_adjust (this, sum); 414 sum = weight_adjust_for (this, sum);
409 415
410 if (sum != carrying) 416 if (sum != carrying)
411 { 417 {
412 carrying = sum; 418 carrying = sum;
413 419
… …
429 object_freezer freezer; 435 object_freezer freezer;
430 op->write (freezer); 436 op->write (freezer);
431 return freezer.as_string (); 437 return freezer.as_string ();
432} 438}
433 439
434/* 440char *
435 * get_nearest_part(multi-object, object 2) returns the part of the 441object::as_string ()
436 * multi-object 1 which is closest to the second object.
437 * If it's not a multi-object, it is returned.
438 */
439object *
440get_nearest_part (object *op, const object *pl)
441{ 442{
442 object *tmp, *closest; 443 return dump_object (this);
443 int last_dist, i;
444
445 if (!op->more)
446 return op;
447
448 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
449 tmp;
450 tmp = tmp->more)
451 if ((i = distance (tmp, pl)) < last_dist)
452 closest = tmp, last_dist = i;
453
454 return closest;
455} 444}
456 445
457/* 446/*
458 * Returns the object which has the count-variable equal to the argument. 447 * Returns the object which has the count-variable equal to the argument.
459 * VERRRY slow. 448 * VERRRY slow.
… …
475 */ 464 */
476object * 465object *
477find_object_name (const char *str) 466find_object_name (const char *str)
478{ 467{
479 shstr_cmp str_ (str); 468 shstr_cmp str_ (str);
480 object *op;
481 469
470 if (str_)
482 for_all_objects (op) 471 for_all_objects (op)
483 if (op->name == str_) 472 if (op->name == str_)
484 break; 473 return op;
485 474
486 return op; 475 return 0;
487} 476}
488 477
489/* 478/*
490 * Sets the owner and sets the skill and exp pointers to owner's current 479 * Sets the owner and sets the skill and exp pointers to owner's current
491 * skill and experience objects. 480 * skill and experience objects.
… …
553 update_stats (); 542 update_stats ();
554 543
555 new_draw_info_format (NDI_UNIQUE, 0, this, 544 new_draw_info_format (NDI_UNIQUE, 0, this,
556 "You try to balance all your items at once, " 545 "You try to balance all your items at once, "
557 "but the %s is just too much for your body. " 546 "but the %s is just too much for your body. "
558 "[You need to unapply some items first.]", &ob->name); 547 "[You need to unapply some items first - use the 'body' command to see "
548 "how many items you cna wera on a specific body part.]", &ob->name);
559 return false; 549 return false;
560 } 550 }
561 551
562 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 552 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
563 } 553 }
… …
635 } 625 }
636 626
637 if (speed < 0) 627 if (speed < 0)
638 dst->speed_left -= rndm (); 628 dst->speed_left -= rndm ();
639 629
640 dst->set_speed (dst->speed); 630 dst->activate ();
641} 631}
642 632
643void 633void
644object::instantiate () 634object::instantiate ()
645{ 635{
… …
689 * This function needs to be called whenever the speed of an object changes. 679 * This function needs to be called whenever the speed of an object changes.
690 */ 680 */
691void 681void
692object::set_speed (float speed) 682object::set_speed (float speed)
693{ 683{
694 if (flag [FLAG_FREED] && speed)
695 {
696 LOG (llevError, "Object %s is freed but has speed.\n", &name);
697 speed = 0;
698 }
699
700 this->speed = speed; 684 this->speed = speed;
701 685
702 if (has_active_speed ()) 686 if (has_active_speed ())
703 activate (); 687 activate ();
704 else 688 else
… …
754 738
755 if (!(m.flags_ & P_UPTODATE)) 739 if (!(m.flags_ & P_UPTODATE))
756 /* nop */; 740 /* nop */;
757 else if (action == UP_OBJ_INSERT) 741 else if (action == UP_OBJ_INSERT)
758 { 742 {
743#if 0
759 // this is likely overkill, TODO: revisit (schmorp) 744 // this is likely overkill, TODO: revisit (schmorp)
760 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 745 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
761 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 746 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
762 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 747 || (op->is_player () && !(m.flags_ & P_PLAYER))
763 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 748 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
764 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 749 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
765 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 750 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
766 || (m.move_on | op->move_on ) != m.move_on 751 || (m.move_on | op->move_on ) != m.move_on
767 || (m.move_off | op->move_off ) != m.move_off 752 || (m.move_off | op->move_off ) != m.move_off
768 || (m.move_slow | op->move_slow) != m.move_slow 753 || (m.move_slow | op->move_slow) != m.move_slow
769 /* This isn't perfect, but I don't expect a lot of objects to 754 /* This isn't perfect, but I don't expect a lot of objects to
770 * to have move_allow right now. 755 * have move_allow right now.
771 */ 756 */
772 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 757 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
758 m.invalidate ();
759#else
773 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 760 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
774 m.flags_ = 0; 761 m.invalidate ();
762#endif
775 } 763 }
776 /* if the object is being removed, we can't make intelligent 764 /* if the object is being removed, we can't make intelligent
777 * decisions, because remove_ob can't really pass the object 765 * decisions, because remove_ob can't really pass the object
778 * that is being removed. 766 * that is being removed.
779 */ 767 */
780 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 768 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
781 m.flags_ = 0; 769 m.invalidate ();
782 else if (action == UP_OBJ_FACE) 770 else if (action == UP_OBJ_FACE)
783 /* Nothing to do for that case */ ; 771 /* Nothing to do for that case */ ;
784 else 772 else
785 LOG (llevError, "update_object called with invalid action: %d\n", action); 773 LOG (llevError, "update_object called with invalid action: %d\n", action);
786 774
… …
790 778
791object::object () 779object::object ()
792{ 780{
793 SET_FLAG (this, FLAG_REMOVED); 781 SET_FLAG (this, FLAG_REMOVED);
794 782
795 expmul = 1.0; 783 //expmul = 1.0; declared const for the time being
796 face = blank_face; 784 face = blank_face;
797} 785}
798 786
799object::~object () 787object::~object ()
800{ 788{
… …
830 /* If already on active list, don't do anything */ 818 /* If already on active list, don't do anything */
831 if (active) 819 if (active)
832 return; 820 return;
833 821
834 if (has_active_speed ()) 822 if (has_active_speed ())
823 {
824 if (flag [FLAG_FREED])
825 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
826
835 actives.insert (this); 827 actives.insert (this);
828 }
836} 829}
837 830
838void 831void
839object::activate_recursive () 832object::activate_recursive ()
840{ 833{
… …
901 * drop on that space. 894 * drop on that space.
902 */ 895 */
903 if (!drop_to_ground 896 if (!drop_to_ground
904 || !map 897 || !map
905 || map->in_memory != MAP_ACTIVE 898 || map->in_memory != MAP_ACTIVE
906 || map->nodrop 899 || map->no_drop
907 || ms ().move_block == MOVE_ALL) 900 || ms ().move_block == MOVE_ALL)
908 { 901 {
909 while (inv) 902 while (inv)
910 {
911 inv->destroy_inv (false);
912 inv->destroy (); 903 inv->destroy ();
913 }
914 } 904 }
915 else 905 else
916 { /* Put objects in inventory onto this space */ 906 { /* Put objects in inventory onto this space */
917 while (inv) 907 while (inv)
918 { 908 {
… …
922 || op->flag [FLAG_NO_DROP] 912 || op->flag [FLAG_NO_DROP]
923 || op->type == RUNE 913 || op->type == RUNE
924 || op->type == TRAP 914 || op->type == TRAP
925 || op->flag [FLAG_IS_A_TEMPLATE] 915 || op->flag [FLAG_IS_A_TEMPLATE]
926 || op->flag [FLAG_DESTROY_ON_DEATH]) 916 || op->flag [FLAG_DESTROY_ON_DEATH])
927 op->destroy (true); 917 op->destroy ();
928 else 918 else
929 map->insert (op, x, y); 919 map->insert (op, x, y);
930 } 920 }
931 } 921 }
932} 922}
… …
940 930
941static struct freed_map : maptile 931static struct freed_map : maptile
942{ 932{
943 freed_map () 933 freed_map ()
944 { 934 {
945 path = "<freed objects map>"; 935 path = "<freed objects map>";
946 name = "/internal/freed_objects_map"; 936 name = "/internal/freed_objects_map";
947 width = 3; 937 width = 3;
948 height = 3; 938 height = 3;
949 nodrop = 1; 939 no_drop = 1;
940 no_reset = 1;
950 941
951 alloc (); 942 alloc ();
952 in_memory = MAP_ACTIVE; 943 in_memory = MAP_ACTIVE;
953 } 944 }
954 945
… …
960 951
961void 952void
962object::do_destroy () 953object::do_destroy ()
963{ 954{
964 if (flag [FLAG_IS_LINKED]) 955 if (flag [FLAG_IS_LINKED])
965 remove_button_link (this); 956 remove_link ();
966 957
967 if (flag [FLAG_FRIENDLY]) 958 if (flag [FLAG_FRIENDLY])
968 remove_friendly_object (this); 959 remove_friendly_object (this);
969 960
970 remove (); 961 remove ();
… …
995 attacked_by = 0; 986 attacked_by = 0;
996 current_weapon = 0; 987 current_weapon = 0;
997} 988}
998 989
999void 990void
1000object::destroy (bool destroy_inventory) 991object::destroy ()
1001{ 992{
1002 if (destroyed ()) 993 if (destroyed ())
1003 return; 994 return;
1004 995
1005 if (!is_head () && !head->destroyed ()) 996 if (!is_head () && !head->destroyed ())
1006 { 997 {
1007 LOG (llevError | logBacktrace, "tried to destroy the tail of an object"); 998 LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1008 head->destroy (destroy_inventory); 999 head->destroy ();
1009 return; 1000 return;
1010 } 1001 }
1011 1002
1012 destroy_inv (!destroy_inventory); 1003 destroy_inv (false);
1013 1004
1014 if (is_head ()) 1005 if (is_head ())
1015 if (sound_destroy) 1006 if (sound_destroy)
1016 play_sound (sound_destroy); 1007 play_sound (sound_destroy);
1017 else if (flag [FLAG_MONSTER]) 1008 else if (flag [FLAG_MONSTER])
… …
1028 * the previous environment. 1019 * the previous environment.
1029 */ 1020 */
1030void 1021void
1031object::do_remove () 1022object::do_remove ()
1032{ 1023{
1033 object *tmp, *last = 0;
1034 object *otmp;
1035
1036 if (flag [FLAG_REMOVED]) 1024 if (flag [FLAG_REMOVED])
1037 return; 1025 return;
1038 1026
1039 INVOKE_OBJECT (REMOVE, this); 1027 INVOKE_OBJECT (REMOVE, this);
1040 1028
… …
1054 esrv_del_item (pl->contr, count); 1042 esrv_del_item (pl->contr, count);
1055 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1043 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1056 1044
1057 adjust_weight (env, -total_weight ()); 1045 adjust_weight (env, -total_weight ());
1058 1046
1059 *(above ? &above->below : &env->inv) = below; 1047 object *pl = in_player ();
1060
1061 if (below)
1062 below->above = above;
1063 1048
1064 /* we set up values so that it could be inserted into 1049 /* we set up values so that it could be inserted into
1065 * the map, but we don't actually do that - it is up 1050 * the map, but we don't actually do that - it is up
1066 * to the caller to decide what we want to do. 1051 * to the caller to decide what we want to do.
1067 */ 1052 */
1068 map = env->map; 1053 map = env->map;
1069 x = env->x; 1054 x = env->x;
1070 y = env->y; 1055 y = env->y;
1056
1057 // make sure cmov optimisation is applicable
1058 *(above ? &above->below : &env->inv) = below;
1059 *(below ? &below->above : &above ) = above; // &above is just a dummy
1060
1071 above = 0; 1061 above = 0;
1072 below = 0; 1062 below = 0;
1073 env = 0; 1063 env = 0;
1074 1064
1075 /* NO_FIX_PLAYER is set when a great many changes are being 1065 /* NO_FIX_PLAYER is set when a great many changes are being
1076 * made to players inventory. If set, avoiding the call 1066 * made to players inventory. If set, avoiding the call
1077 * to save cpu time. 1067 * to save cpu time.
1078 */ 1068 */
1079 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1069 if (pl)
1070 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1071 {
1080 otmp->update_stats (); 1072 pl->update_stats ();
1073
1074 if (glow_radius && pl->is_on_map ())
1075 update_all_los (pl->map, pl->x, pl->y);
1076 }
1081 } 1077 }
1082 else if (map) 1078 else if (map)
1083 { 1079 {
1084 map->dirty = true; 1080 map->dirty = true;
1085 mapspace &ms = this->ms (); 1081 mapspace &ms = this->ms ();
1086 1082
1087 if (object *pl = ms.player ()) 1083 if (object *pl = ms.player ())
1088 { 1084 {
1089 if (type == PLAYER) // this == pl(!) 1085 if (is_player ())
1090 { 1086 {
1087 if (!flag [FLAG_WIZPASS])
1088 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1089
1091 // leaving a spot always closes any open container on the ground 1090 // leaving a spot always closes any open container on the ground
1092 if (container && !container->env) 1091 if (container && !container->env)
1093 // this causes spurious floorbox updates, but it ensures 1092 // this causes spurious floorbox updates, but it ensures
1094 // that the CLOSE event is being sent. 1093 // that the CLOSE event is being sent.
1095 close_container (); 1094 close_container ();
1096 1095
1097 --map->players; 1096 --map->players;
1098 map->touch (); 1097 map->touch ();
1099 } 1098 }
1100 else if (pl->container == this) 1099 else if (pl->container_ () == this)
1101 { 1100 {
1102 // removing a container should close it 1101 // removing a container should close it
1103 close_container (); 1102 close_container ();
1104 } 1103 }
1105 1104
1106 esrv_del_item (pl->contr, count); 1105 esrv_del_item (pl->contr, count);
1107 } 1106 }
1108 1107
1109 /* link the object above us */ 1108 /* link the object above us */
1110 if (above) 1109 // re-link, make sure compiler can easily use cmove
1111 above->below = below; 1110 *(above ? &above->below : &ms.top) = below;
1112 else 1111 *(below ? &below->above : &ms.bot) = above;
1113 ms.top = below; /* we were top, set new top */
1114
1115 /* Relink the object below us, if there is one */
1116 if (below)
1117 below->above = above;
1118 else
1119 {
1120 /* Nothing below, which means we need to relink map object for this space
1121 * use translated coordinates in case some oddness with map tiling is
1122 * evident
1123 */
1124 if (GET_MAP_OB (map, x, y) != this)
1125 LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1126
1127 ms.bot = above; /* goes on above it. */
1128 }
1129 1112
1130 above = 0; 1113 above = 0;
1131 below = 0; 1114 below = 0;
1132 1115
1116 ms.invalidate ();
1117
1133 if (map->in_memory == MAP_SAVING) 1118 if (map->in_memory == MAP_SAVING)
1134 return; 1119 return;
1135 1120
1136 int check_walk_off = !flag [FLAG_NO_APPLY]; 1121 int check_walk_off = !flag [FLAG_NO_APPLY];
1137 1122
1138 if (object *pl = ms.player ()) 1123 if (object *pl = ms.player ())
1139 { 1124 {
1140 if (pl->container == this) 1125 if (pl->container_ () == this)
1141 /* If a container that the player is currently using somehow gets 1126 /* If a container that the player is currently using somehow gets
1142 * removed (most likely destroyed), update the player view 1127 * removed (most likely destroyed), update the player view
1143 * appropriately. 1128 * appropriately.
1144 */ 1129 */
1145 pl->close_container (); 1130 pl->close_container ();
… …
1149 //TODO: update floorbox to preserve ordering 1134 //TODO: update floorbox to preserve ordering
1150 if (pl->contr->ns) 1135 if (pl->contr->ns)
1151 pl->contr->ns->floorbox_update (); 1136 pl->contr->ns->floorbox_update ();
1152 } 1137 }
1153 1138
1139 if (check_walk_off)
1154 for (tmp = ms.bot; tmp; tmp = tmp->above) 1140 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1155 { 1141 {
1142 above = tmp->above;
1143
1156 /* No point updating the players look faces if he is the object 1144 /* No point updating the players look faces if he is the object
1157 * being removed. 1145 * being removed.
1158 */ 1146 */
1159 1147
1160 /* See if object moving off should effect something */ 1148 /* See if object moving off should effect something */
1161 if (check_walk_off
1162 && ((move_type & tmp->move_off) 1149 if ((move_type & tmp->move_off)
1163 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1150 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1164 {
1165 move_apply (tmp, this, 0); 1151 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 } 1152 }
1170 1153
1171 last = tmp; 1154 if (affects_los ())
1172 }
1173
1174 /* last == NULL if there are no objects on this space */
1175 //TODO: this makes little sense, why only update the topmost object?
1176 if (!last)
1177 map->at (x, y).flags_ = 0;
1178 else
1179 update_object (last, UP_OBJ_REMOVE);
1180
1181 if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1182 update_all_los (map, x, y); 1155 update_all_los (map, x, y);
1183 } 1156 }
1184} 1157}
1185 1158
1186/* 1159/*
… …
1210 esrv_update_item (UPD_NROF, pl, top); 1183 esrv_update_item (UPD_NROF, pl, top);
1211 1184
1212 op->weight = 0; // cancel the addition above 1185 op->weight = 0; // cancel the addition above
1213 op->carrying = 0; // must be 0 already 1186 op->carrying = 0; // must be 0 already
1214 1187
1215 op->destroy (1); 1188 op->destroy ();
1216 1189
1217 return top; 1190 return top;
1218 } 1191 }
1219 1192
1220 return 0; 1193 return 0;
… …
1248 * job preparing multi-part monsters. 1221 * job preparing multi-part monsters.
1249 */ 1222 */
1250object * 1223object *
1251insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1224insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1252{ 1225{
1226 op->remove ();
1227
1253 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1228 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1254 { 1229 {
1255 tmp->x = x + tmp->arch->x; 1230 tmp->x = x + tmp->arch->x;
1256 tmp->y = y + tmp->arch->y; 1231 tmp->y = y + tmp->arch->y;
1257 } 1232 }
… …
1280 * just 'op' otherwise 1255 * just 'op' otherwise
1281 */ 1256 */
1282object * 1257object *
1283insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1258insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1284{ 1259{
1285 assert (!op->flag [FLAG_FREED]);
1286
1287 op->remove (); 1260 op->remove ();
1261
1262 if (m == &freed_map)//D TODO: remove soon
1263 {//D
1264 LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1265 }//D
1288 1266
1289 /* Ideally, the caller figures this out. However, it complicates a lot 1267 /* Ideally, the caller figures this out. However, it complicates a lot
1290 * of areas of callers (eg, anything that uses find_free_spot would now 1268 * of areas of callers (eg, anything that uses find_free_spot would now
1291 * need extra work 1269 * need extra work
1292 */ 1270 */
1271 maptile *newmap = m;
1293 if (!xy_normalise (m, op->x, op->y)) 1272 if (!xy_normalise (newmap, op->x, op->y))
1294 { 1273 {
1295 op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found 1274 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1296 return 0; 1275 return 0;
1297 } 1276 }
1298 1277
1299 if (object *more = op->more) 1278 if (object *more = op->more)
1300 if (!insert_ob_in_map (more, m, originator, flag)) 1279 if (!insert_ob_in_map (more, m, originator, flag))
1301 return 0; 1280 return 0;
1302 1281
1303 CLEAR_FLAG (op, FLAG_REMOVED); 1282 op->flag [FLAG_REMOVED] = false;
1304 1283 op->env = 0;
1305 op->map = m; 1284 op->map = newmap;
1285
1306 mapspace &ms = op->ms (); 1286 mapspace &ms = op->ms ();
1307 1287
1308 /* this has to be done after we translate the coordinates. 1288 /* this has to be done after we translate the coordinates.
1309 */ 1289 */
1310 if (op->nrof && !(flag & INS_NO_MERGE)) 1290 if (op->nrof && !(flag & INS_NO_MERGE))
1311 for (object *tmp = ms.bot; tmp; tmp = tmp->above) 1291 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1312 if (object::can_merge (op, tmp)) 1292 if (object::can_merge (op, tmp))
1313 { 1293 {
1314 // TODO: we atcually want to update tmp, not op, 1294 // TODO: we actually want to update tmp, not op,
1315 // but some caller surely breaks when we return tmp 1295 // but some caller surely breaks when we return tmp
1316 // from here :/ 1296 // from here :/
1317 op->nrof += tmp->nrof; 1297 op->nrof += tmp->nrof;
1318 tmp->destroy (1); 1298 tmp->destroy ();
1319 } 1299 }
1320 1300
1321 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1301 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1322 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1302 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1323 1303
… …
1330 { 1310 {
1331 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1311 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1332 abort (); 1312 abort ();
1333 } 1313 }
1334 1314
1315 if (!originator->is_on_map ())
1316 {
1317 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1318 op->debug_desc (), originator->debug_desc ());
1319 abort ();
1320 }
1321
1335 op->above = originator; 1322 op->above = originator;
1336 op->below = originator->below; 1323 op->below = originator->below;
1337
1338 if (op->below)
1339 op->below->above = op;
1340 else
1341 ms.bot = op;
1342
1343 /* since *below* originator, no need to update top */
1344 originator->below = op; 1324 originator->below = op;
1325
1326 *(op->below ? &op->below->above : &ms.bot) = op;
1345 } 1327 }
1346 else 1328 else
1347 { 1329 {
1348 object *top, *floor = NULL; 1330 object *floor = 0;
1349 1331 object *top = ms.top;
1350 top = ms.bot;
1351 1332
1352 /* If there are other objects, then */ 1333 /* If there are other objects, then */
1353 if (top) 1334 if (top)
1354 { 1335 {
1355 object *last = 0;
1356
1357 /* 1336 /*
1358 * If there are multiple objects on this space, we do some trickier handling. 1337 * If there are multiple objects on this space, we do some trickier handling.
1359 * We've already dealt with merging if appropriate. 1338 * We've already dealt with merging if appropriate.
1360 * Generally, we want to put the new object on top. But if 1339 * Generally, we want to put the new object on top. But if
1361 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last 1340 * flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
… …
1364 * once we get to them. This reduces the need to traverse over all of 1343 * once we get to them. This reduces the need to traverse over all of
1365 * them when adding another one - this saves quite a bit of cpu time 1344 * them when adding another one - this saves quite a bit of cpu time
1366 * when lots of spells are cast in one area. Currently, it is presumed 1345 * when lots of spells are cast in one area. Currently, it is presumed
1367 * that flying non pickable objects are spell objects. 1346 * that flying non pickable objects are spell objects.
1368 */ 1347 */
1369 for (top = ms.bot; top; top = top->above) 1348 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1370 { 1349 {
1371 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1350 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1372 floor = top; 1351 floor = tmp;
1373 1352
1374 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1353 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1375 { 1354 {
1376 /* We insert above top, so we want this object below this */ 1355 /* We insert above top, so we want this object below this */
1377 top = top->below; 1356 top = tmp->below;
1378 break; 1357 break;
1379 } 1358 }
1380 1359
1381 last = top; 1360 top = tmp;
1382 } 1361 }
1383
1384 /* Don't want top to be NULL, so set it to the last valid object */
1385 top = last;
1386 1362
1387 /* We let update_position deal with figuring out what the space 1363 /* We let update_position deal with figuring out what the space
1388 * looks like instead of lots of conditions here. 1364 * looks like instead of lots of conditions here.
1389 * makes things faster, and effectively the same result. 1365 * makes things faster, and effectively the same result.
1390 */ 1366 */
… …
1397 */ 1373 */
1398 if (!(flag & INS_ON_TOP) 1374 if (!(flag & INS_ON_TOP)
1399 && ms.flags () & P_BLOCKSVIEW 1375 && ms.flags () & P_BLOCKSVIEW
1400 && (op->face && !faces [op->face].visibility)) 1376 && (op->face && !faces [op->face].visibility))
1401 { 1377 {
1378 object *last;
1379
1402 for (last = top; last != floor; last = last->below) 1380 for (last = top; last != floor; last = last->below)
1403 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1381 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1404 break; 1382 break;
1405 1383
1406 /* Check to see if we found the object that blocks view, 1384 /* Check to see if we found the object that blocks view,
… …
1414 } /* If objects on this space */ 1392 } /* If objects on this space */
1415 1393
1416 if (flag & INS_ABOVE_FLOOR_ONLY) 1394 if (flag & INS_ABOVE_FLOOR_ONLY)
1417 top = floor; 1395 top = floor;
1418 1396
1419 /* Top is the object that our object (op) is going to get inserted above. 1397 // insert object above top, or bottom-most if top = 0
1420 */
1421
1422 /* First object on this space */
1423 if (!top) 1398 if (!top)
1424 { 1399 {
1400 op->below = 0;
1425 op->above = ms.bot; 1401 op->above = ms.bot;
1426
1427 if (op->above)
1428 op->above->below = op;
1429
1430 op->below = 0;
1431 ms.bot = op; 1402 ms.bot = op;
1403
1404 *(op->above ? &op->above->below : &ms.top) = op;
1432 } 1405 }
1433 else 1406 else
1434 { /* get inserted into the stack above top */ 1407 {
1435 op->above = top->above; 1408 op->above = top->above;
1436
1437 if (op->above)
1438 op->above->below = op; 1409 top->above = op;
1439 1410
1440 op->below = top; 1411 op->below = top;
1441 top->above = op; 1412 *(op->above ? &op->above->below : &ms.top) = op;
1442 } 1413 }
1414 }
1443 1415
1444 if (!op->above) 1416 if (op->is_player ())
1445 ms.top = op;
1446 } /* else not INS_BELOW_ORIGINATOR */
1447
1448 if (op->type == PLAYER)
1449 { 1417 {
1450 op->contr->do_los = 1; 1418 op->contr->do_los = 1;
1451 ++op->map->players; 1419 ++op->map->players;
1452 op->map->touch (); 1420 op->map->touch ();
1453 } 1421 }
… …
1468 * be far away from this change and not affected in any way - 1436 * be far away from this change and not affected in any way -
1469 * this should get redone to only look for players within range, 1437 * this should get redone to only look for players within range,
1470 * or just updating the P_UPTODATE for spaces within this area 1438 * or just updating the P_UPTODATE for spaces within this area
1471 * of effect may be sufficient. 1439 * of effect may be sufficient.
1472 */ 1440 */
1473 if (op->map->darkness && (op->glow_radius != 0)) 1441 if (op->affects_los ())
1442 {
1443 op->ms ().invalidate ();
1474 update_all_los (op->map, op->x, op->y); 1444 update_all_los (op->map, op->x, op->y);
1445 }
1475 1446
1476 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1447 /* updates flags (blocked, alive, no magic, etc) for this map space */
1477 update_object (op, UP_OBJ_INSERT); 1448 update_object (op, UP_OBJ_INSERT);
1478 1449
1479 INVOKE_OBJECT (INSERT, op); 1450 INVOKE_OBJECT (INSERT, op);
… …
1486 * blocked() and wall() work properly), and these flags are updated by 1457 * blocked() and wall() work properly), and these flags are updated by
1487 * update_object(). 1458 * update_object().
1488 */ 1459 */
1489 1460
1490 /* if this is not the head or flag has been passed, don't check walk on status */ 1461 /* if this is not the head or flag has been passed, don't check walk on status */
1491 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1462 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1492 { 1463 {
1493 if (check_move_on (op, originator)) 1464 if (check_move_on (op, originator))
1494 return 0; 1465 return 0;
1495 1466
1496 /* If we are a multi part object, lets work our way through the check 1467 /* If we are a multi part object, lets work our way through the check
… …
1507/* this function inserts an object in the map, but if it 1478/* this function inserts an object in the map, but if it
1508 * finds an object of its own type, it'll remove that one first. 1479 * finds an object of its own type, it'll remove that one first.
1509 * op is the object to insert it under: supplies x and the map. 1480 * op is the object to insert it under: supplies x and the map.
1510 */ 1481 */
1511void 1482void
1512replace_insert_ob_in_map (const char *arch_string, object *op) 1483replace_insert_ob_in_map (shstr_tmp archname, object *op)
1513{ 1484{
1514 /* first search for itself and remove any old instances */ 1485 /* first search for itself and remove any old instances */
1515 1486
1516 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1487 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1517 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1488 if (tmp->arch->archname == archname) /* same archetype */
1518 tmp->destroy (1); 1489 tmp->destroy ();
1519 1490
1520 object *tmp = arch_to_object (archetype::find (arch_string)); 1491 object *tmp = arch_to_object (archetype::find (archname));
1521 1492
1522 tmp->x = op->x; 1493 tmp->x = op->x;
1523 tmp->y = op->y; 1494 tmp->y = op->y;
1524 1495
1525 insert_ob_in_map (tmp, op->map, op, 0); 1496 insert_ob_in_map (tmp, op->map, op, 0);
… …
1530{ 1501{
1531 if (where->env) 1502 if (where->env)
1532 return where->env->insert (this); 1503 return where->env->insert (this);
1533 else 1504 else
1534 return where->map->insert (this, where->x, where->y, originator, flags); 1505 return where->map->insert (this, where->x, where->y, originator, flags);
1506}
1507
1508// check whether we can put this into the map, respect max_nrof, max_volume, max_items
1509bool
1510object::can_drop_at (maptile *m, int x, int y, object *originator)
1511{
1512 mapspace &ms = m->at (x, y);
1513
1514 int items = ms.items ();
1515
1516 if (!items // testing !items ensures we can drop at least one item
1517 || (items < m->max_items
1518 && ms.volume () < m->max_volume
1519 && nrof <= m->max_nrof))
1520 return true;
1521
1522 if (originator && originator->is_player ())
1523 originator->contr->failmsg (format (
1524 "No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1525 query_name ()
1526 ));
1527
1528 return false;
1535} 1529}
1536 1530
1537/* 1531/*
1538 * decrease(object, number) decreases a specified number from 1532 * decrease(object, number) decreases a specified number from
1539 * the amount of an object. If the amount reaches 0, the object 1533 * the amount of an object. If the amount reaches 0, the object
… …
1547 if (!nr) 1541 if (!nr)
1548 return true; 1542 return true;
1549 1543
1550 nr = min (nr, nrof); 1544 nr = min (nr, nrof);
1551 1545
1546 if (nrof > nr)
1547 {
1552 nrof -= nr; 1548 nrof -= nr;
1553
1554 if (nrof)
1555 {
1556 adjust_weight (env, -weight * nr); // carrying == 0 1549 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1557 1550
1558 if (object *pl = visible_to ()) 1551 if (object *pl = visible_to ())
1559 esrv_update_item (UPD_NROF, pl, this); 1552 esrv_update_item (UPD_NROF, pl, this);
1560 1553
1561 return true; 1554 return true;
1562 } 1555 }
1563 else 1556 else
1564 { 1557 {
1565 destroy (1); 1558 destroy ();
1566 return false; 1559 return false;
1567 } 1560 }
1568} 1561}
1569 1562
1570/* 1563/*
… …
1647 if (object *pl = tmp->visible_to ()) 1640 if (object *pl = tmp->visible_to ())
1648 esrv_update_item (UPD_NROF, pl, tmp); 1641 esrv_update_item (UPD_NROF, pl, tmp);
1649 1642
1650 adjust_weight (this, op->total_weight ()); 1643 adjust_weight (this, op->total_weight ());
1651 1644
1652 op->destroy (1); 1645 op->destroy ();
1653 op = tmp; 1646 op = tmp;
1654 goto inserted; 1647 goto inserted;
1655 } 1648 }
1656 1649
1657 op->owner = 0; // it's his/hers now. period. 1650 op->owner = 0; // it's his/hers now. period.
… …
1675 1668
1676 adjust_weight (this, op->total_weight ()); 1669 adjust_weight (this, op->total_weight ());
1677 1670
1678inserted: 1671inserted:
1679 /* reset the light list and los of the players on the map */ 1672 /* reset the light list and los of the players on the map */
1680 if (op->glow_radius && map && map->darkness) 1673 if (op->glow_radius && is_on_map ())
1674 {
1675 update_stats ();
1681 update_all_los (map, x, y); 1676 update_all_los (map, x, y);
1682 1677 }
1678 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1683 // if this is a player's inventory, update stats 1679 // if this is a player's inventory, update stats
1684 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1685 update_stats (); 1680 update_stats ();
1686 1681
1687 INVOKE_OBJECT (INSERT, this); 1682 INVOKE_OBJECT (INSERT, this);
1688 1683
1689 return op; 1684 return op;
… …
1710 * on top. 1705 * on top.
1711 */ 1706 */
1712int 1707int
1713check_move_on (object *op, object *originator) 1708check_move_on (object *op, object *originator)
1714{ 1709{
1710 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1711 return 0;
1712
1715 object *tmp; 1713 object *tmp;
1716 maptile *m = op->map; 1714 maptile *m = op->map;
1717 int x = op->x, y = op->y; 1715 int x = op->x, y = op->y;
1718 1716
1719 MoveType move_on, move_slow, move_block; 1717 mapspace &ms = m->at (x, y);
1720 1718
1721 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1719 ms.update ();
1722 return 0;
1723 1720
1724 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1721 MoveType move_on = ms.move_on;
1725 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1722 MoveType move_slow = ms.move_slow;
1726 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1723 MoveType move_block = ms.move_block;
1727 1724
1728 /* if nothing on this space will slow op down or be applied, 1725 /* if nothing on this space will slow op down or be applied,
1729 * no need to do checking below. have to make sure move_type 1726 * no need to do checking below. have to make sure move_type
1730 * is set, as lots of objects don't have it set - we treat that 1727 * is set, as lots of objects don't have it set - we treat that
1731 * as walking. 1728 * as walking.
… …
1742 return 0; 1739 return 0;
1743 1740
1744 /* The objects have to be checked from top to bottom. 1741 /* The objects have to be checked from top to bottom.
1745 * Hence, we first go to the top: 1742 * Hence, we first go to the top:
1746 */ 1743 */
1747 1744 for (object *next, *tmp = ms.top; tmp; tmp = next)
1748 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1749 {
1750 /* Trim the search when we find the first other spell effect
1751 * this helps performance so that if a space has 50 spell objects,
1752 * we don't need to check all of them.
1753 */
1754 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1755 break;
1756 } 1745 {
1746 next = tmp->below;
1757 1747
1758 for (; tmp; tmp = tmp->below)
1759 {
1760 if (tmp == op) 1748 if (tmp == op)
1761 continue; /* Can't apply yourself */ 1749 continue; /* Can't apply yourself */
1762 1750
1763 /* Check to see if one of the movement types should be slowed down. 1751 /* Check to see if one of the movement types should be slowed down.
1764 * Second check makes sure that the movement types not being slowed 1752 * Second check makes sure that the movement types not being slowed
… …
1769 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1757 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1770 { 1758 {
1771 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1759 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1772 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1760 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1773 { 1761 {
1774
1775 float
1776 diff = tmp->move_slow_penalty * fabs (op->speed); 1762 float diff = tmp->move_slow_penalty * fabs (op->speed);
1777 1763
1778 if (op->type == PLAYER) 1764 if (op->is_player ())
1779 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1765 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1780 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1766 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1781 diff /= 4.0; 1767 diff /= 4.0;
1782 1768
1783 op->speed_left -= diff; 1769 op->speed_left -= diff;
1784 } 1770 }
1785 } 1771 }
… …
1991 * head of the object should correspond for the entire object. 1977 * head of the object should correspond for the entire object.
1992 */ 1978 */
1993 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block)) 1979 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1994 continue; 1980 continue;
1995 1981
1996 if (ob->blocked (m, pos.x, pos.y)) 1982 if (ob->blocked (pos.m, pos.x, pos.y))
1997 continue; 1983 continue;
1998 1984
1999 altern [index++] = i; 1985 altern [index++] = i;
2000 } 1986 }
2001 1987
… …
2069 * there is capable of. 2055 * there is capable of.
2070 */ 2056 */
2071int 2057int
2072find_dir (maptile *m, int x, int y, object *exclude) 2058find_dir (maptile *m, int x, int y, object *exclude)
2073{ 2059{
2074 int i, max = SIZEOFFREE, mflags; 2060 int max = SIZEOFFREE, mflags;
2075
2076 sint16 nx, ny;
2077 object *tmp;
2078 maptile *mp;
2079
2080 MoveType blocked, move_type; 2061 MoveType move_type;
2081 2062
2082 if (exclude && exclude->head_ () != exclude) 2063 if (exclude && exclude->head_ () != exclude)
2083 { 2064 {
2084 exclude = exclude->head; 2065 exclude = exclude->head;
2085 move_type = exclude->move_type; 2066 move_type = exclude->move_type;
… …
2088 { 2069 {
2089 /* If we don't have anything, presume it can use all movement types. */ 2070 /* If we don't have anything, presume it can use all movement types. */
2090 move_type = MOVE_ALL; 2071 move_type = MOVE_ALL;
2091 } 2072 }
2092 2073
2093 for (i = 1; i < max; i++) 2074 for (int i = 1; i < max; i++)
2094 { 2075 {
2095 mp = m; 2076 mapxy pos (m, x, y);
2096 nx = x + freearr_x[i]; 2077 pos.move (i);
2097 ny = y + freearr_y[i];
2098 2078
2099 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2079 if (!pos.normalise ())
2100
2101 if (mflags & P_OUT_OF_MAP)
2102 max = maxfree[i]; 2080 max = maxfree[i];
2103 else 2081 else
2104 { 2082 {
2105 mapspace &ms = mp->at (nx, ny); 2083 mapspace &ms = *pos;
2106 2084
2107 blocked = ms.move_block;
2108
2109 if ((move_type & blocked) == move_type) 2085 if ((move_type & ms.move_block) == move_type)
2110 max = maxfree[i]; 2086 max = maxfree [i];
2111 else if (mflags & P_IS_ALIVE) 2087 else if (ms.flags () & P_IS_ALIVE)
2112 { 2088 {
2113 for (tmp = ms.bot; tmp; tmp = tmp->above) 2089 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2114 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2090 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2115 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2091 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2116 break;
2117
2118 if (tmp)
2119 return freedir[i]; 2092 return freedir [i];
2120 } 2093 }
2121 } 2094 }
2122 } 2095 }
2123 2096
2124 return 0; 2097 return 0;
… …
2199 * This basically means that if direction is 15, then it could either go 2172 * This basically means that if direction is 15, then it could either go
2200 * direction 4, 14, or 16 to get back to where we are. 2173 * direction 4, 14, or 16 to get back to where we are.
2201 * Moved from spell_util.c to object.c with the other related direction 2174 * Moved from spell_util.c to object.c with the other related direction
2202 * functions. 2175 * functions.
2203 */ 2176 */
2204int reduction_dir[SIZEOFFREE][3] = { 2177static const int reduction_dir[SIZEOFFREE][3] = {
2205 {0, 0, 0}, /* 0 */ 2178 {0, 0, 0}, /* 0 */
2206 {0, 0, 0}, /* 1 */ 2179 {0, 0, 0}, /* 1 */
2207 {0, 0, 0}, /* 2 */ 2180 {0, 0, 0}, /* 2 */
2208 {0, 0, 0}, /* 3 */ 2181 {0, 0, 0}, /* 3 */
2209 {0, 0, 0}, /* 4 */ 2182 {0, 0, 0}, /* 4 */
… …
2305int 2278int
2306can_pick (const object *who, const object *item) 2279can_pick (const object *who, const object *item)
2307{ 2280{
2308 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2281 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2309 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2282 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2310 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2283 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2311} 2284}
2312 2285
2313/* 2286/*
2314 * create clone from object to another 2287 * create clone from object to another
2315 */ 2288 */
… …
2347 return tmp; 2320 return tmp;
2348 2321
2349 return 0; 2322 return 0;
2350} 2323}
2351 2324
2352const shstr & 2325shstr_tmp
2353object::kv_get (const shstr &key) const 2326object::kv_get (shstr_tmp key) const
2354{ 2327{
2355 for (key_value *kv = key_values; kv; kv = kv->next) 2328 for (key_value *kv = key_values; kv; kv = kv->next)
2356 if (kv->key == key) 2329 if (kv->key == key)
2357 return kv->value; 2330 return kv->value;
2358 2331
2359 return shstr_null; 2332 return shstr ();
2360} 2333}
2361 2334
2362void 2335void
2363object::kv_set (const shstr &key, const shstr &value) 2336object::kv_set (shstr_tmp key, shstr_tmp value)
2364{ 2337{
2365 for (key_value *kv = key_values; kv; kv = kv->next) 2338 for (key_value *kv = key_values; kv; kv = kv->next)
2366 if (kv->key == key) 2339 if (kv->key == key)
2367 { 2340 {
2368 kv->value = value; 2341 kv->value = value;
… …
2377 2350
2378 key_values = kv; 2351 key_values = kv;
2379} 2352}
2380 2353
2381void 2354void
2382object::kv_del (const shstr &key) 2355object::kv_del (shstr_tmp key)
2383{ 2356{
2384 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2357 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2385 if ((*kvp)->key == key) 2358 if ((*kvp)->key == key)
2386 { 2359 {
2387 key_value *kv = *kvp; 2360 key_value *kv = *kvp;
… …
2446{ 2419{
2447 char flagdesc[512]; 2420 char flagdesc[512];
2448 char info2[256 * 4]; 2421 char info2[256 * 4];
2449 char *p = info; 2422 char *p = info;
2450 2423
2451 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}", 2424 p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2452 count, 2425 count,
2453 uuid.c_str (), 2426 uuid.c_str (),
2454 &name, 2427 &name,
2455 title ? "\",title:\"" : "", 2428 title ? ",title:\"" : "",
2456 title ? (const char *)title : "", 2429 title ? (const char *)title : "",
2430 title ? "\"" : "",
2457 flag_desc (flagdesc, 512), type); 2431 flag_desc (flagdesc, 512), type);
2458 2432
2459 if (!flag[FLAG_REMOVED] && env) 2433 if (!flag[FLAG_REMOVED] && env)
2460 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2434 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2461 2435
… …
2517 container = 0; 2491 container = 0;
2518 2492
2519 // client needs item update to make it work, client bug requires this to be separate 2493 // client needs item update to make it work, client bug requires this to be separate
2520 esrv_update_item (UPD_FLAGS, this, old_container); 2494 esrv_update_item (UPD_FLAGS, this, old_container);
2521 2495
2522 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2496 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2523 play_sound (sound_find ("chest_close")); 2497 play_sound (sound_find ("chest_close"));
2524 } 2498 }
2525 2499
2526 if (new_container) 2500 if (new_container)
2527 { 2501 {
… …
2537 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2511 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2538 new_container->insert (closer); 2512 new_container->insert (closer);
2539 } 2513 }
2540#endif 2514#endif
2541 2515
2542 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2516 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2543 2517
2544 // make sure the container is available, client bug requires this to be separate 2518 // make sure the container is available, client bug requires this to be separate
2545 esrv_send_item (this, new_container); 2519 esrv_send_item (this, new_container);
2546 2520
2547 new_container->flag [FLAG_APPLIED] = true; 2521 new_container->flag [FLAG_APPLIED] = true;
… …
2555// else if (!old_container->env && contr && contr->ns) 2529// else if (!old_container->env && contr && contr->ns)
2556// contr->ns->floorbox_reset (); 2530// contr->ns->floorbox_reset ();
2557} 2531}
2558 2532
2559object * 2533object *
2560object::force_find (const shstr name) 2534object::force_find (shstr_tmp name)
2561{ 2535{
2562 /* cycle through his inventory to look for the MARK we want to 2536 /* cycle through his inventory to look for the MARK we want to
2563 * place 2537 * place
2564 */ 2538 */
2565 for (object *tmp = inv; tmp; tmp = tmp->below) 2539 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2567 return splay (tmp); 2541 return splay (tmp);
2568 2542
2569 return 0; 2543 return 0;
2570} 2544}
2571 2545
2546//-GPL
2547
2572void 2548void
2549object::force_set_timer (int duration)
2550{
2551 this->duration = 1;
2552 this->speed_left = -1.f;
2553
2554 this->set_speed (duration ? 1.f / duration : 0.f);
2555}
2556
2557object *
2573object::force_add (const shstr name, int duration) 2558object::force_add (shstr_tmp name, int duration)
2574{ 2559{
2575 if (object *force = force_find (name)) 2560 if (object *force = force_find (name))
2576 force->destroy (); 2561 force->destroy ();
2577 2562
2578 object *force = get_archetype (FORCE_NAME); 2563 object *force = get_archetype (FORCE_NAME);
2579 2564
2580 force->slaying = name; 2565 force->slaying = name;
2581 force->stats.food = 1; 2566 force->force_set_timer (duration);
2582 force->speed_left = -1.f;
2583
2584 force->set_speed (duration ? 1.f / duration : 0.f);
2585 force->flag [FLAG_IS_USED_UP] = true;
2586 force->flag [FLAG_APPLIED] = true; 2567 force->flag [FLAG_APPLIED] = true;
2587 2568
2588 insert (force); 2569 return insert (force);
2589} 2570}
2590 2571
2591void 2572void
2592object::play_sound (faceidx sound) 2573object::play_sound (faceidx sound) const
2593{ 2574{
2594 if (!sound) 2575 if (!sound)
2595 return; 2576 return;
2596 2577
2597 if (flag [FLAG_REMOVED]) 2578 if (is_on_map ())
2579 map->play_sound (sound, x, y);
2580 else if (object *pl = in_player ())
2581 pl->contr->play_sound (sound);
2582}
2583
2584void
2585object::say_msg (const char *msg) const
2586{
2587 if (is_on_map ())
2588 map->say_msg (msg, x, y);
2589 else if (object *pl = in_player ())
2590 pl->contr->play_sound (sound);
2591}
2592
2593void
2594object::make_noise ()
2595{
2596 // we do not model noise in the map, so instead put
2597 // a temporary light into the noise source
2598 // could use the map instead, but that's less reliable for our
2599 // goal, which is to make invisibility a bit harder to exploit
2600
2601 // currently only works sensibly for players
2602 if (!is_player ())
2598 return; 2603 return;
2599 2604
2600 if (env) 2605 // find old force, or create new one
2601 { 2606 object *force = force_find (shstr_noise_force);
2602 if (object *pl = in_player ()) 2607
2603 pl->contr->play_sound (sound); 2608 if (force)
2604 } 2609 force->speed_left = -1.f; // patch old speed up
2605 else 2610 else
2606 map->play_sound (sound, x, y); 2611 {
2607} 2612 force = archetype::get (shstr_noise_force);
2608 2613
2614 force->slaying = shstr_noise_force;
2615 force->stats.food = 1;
2616 force->speed_left = -1.f;
2617
2618 force->set_speed (1.f / 4.f);
2619 force->flag [FLAG_IS_USED_UP] = true;
2620 force->flag [FLAG_APPLIED] = true;
2621
2622 insert (force);
2623 }
2624}
2625

Diff Legend

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