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.108 by root, Sun Jan 7 02:39:13 2007 UTC vs.
Revision 1.146 by root, Fri May 11 21:07:13 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your 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 GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 23 */
24 24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 27 variable. */
28#include <global.h> 28#include <global.h>
29#include <stdio.h> 29#include <stdio.h>
30#include <sys/types.h> 30#include <sys/types.h>
31#include <sys/uio.h> 31#include <sys/uio.h>
32#include <object.h> 32#include <object.h>
33#include <funcpoint.h> 33#include <funcpoint.h>
34#include <sproto.h>
34#include <loader.h> 35#include <loader.h>
35 36
36#include <bitset> 37#include <bitset>
37 38
38int nrofallocobjects = 0; 39int nrofallocobjects = 0;
… …
324sum_weight (object *op) 325sum_weight (object *op)
325{ 326{
326 long sum; 327 long sum;
327 object *inv; 328 object *inv;
328 329
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 330 for (sum = 0, inv = op->inv; inv; inv = inv->below)
330 { 331 {
331 if (inv->inv) 332 if (inv->inv)
332 sum_weight (inv); 333 sum_weight (inv);
334
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 335 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334 } 336 }
335 337
336 if (op->type == CONTAINER && op->stats.Str) 338 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100; 339 sum = (sum * (100 - op->stats.Str)) / 100;
… …
357/* 359/*
358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 360 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359 * Some error messages. 361 * Some error messages.
360 * The result of the dump is stored in the static global errmsg array. 362 * The result of the dump is stored in the static global errmsg array.
361 */ 363 */
362
363char * 364char *
364dump_object (object *op) 365dump_object (object *op)
365{ 366{
366 if (!op) 367 if (!op)
367 return strdup ("[NULLOBJ]"); 368 return strdup ("[NULLOBJ]");
368 369
369 object_freezer freezer; 370 object_freezer freezer;
370 save_object (freezer, op, 1); 371 op->write (freezer);
371 return freezer.as_string (); 372 return freezer.as_string ();
372} 373}
373 374
374/* 375/*
375 * get_nearest_part(multi-object, object 2) returns the part of the 376 * get_nearest_part(multi-object, object 2) returns the part of the
… …
395 * Returns the object which has the count-variable equal to the argument. 396 * Returns the object which has the count-variable equal to the argument.
396 */ 397 */
397object * 398object *
398find_object (tag_t i) 399find_object (tag_t i)
399{ 400{
400 return ((unsigned int)i) < objects.size () 401 for_all_objects (op)
401 ? objects [i] 402 if (op->count == i)
402 : 0; 403 return op;
404
405 return 0;
403} 406}
404 407
405/* 408/*
406 * Returns the first object which has a name equal to the argument. 409 * Returns the first object which has a name equal to the argument.
407 * Used only by the patch command, but not all that useful. 410 * Used only by the patch command, but not all that useful.
… …
447 owner = owner->owner; 450 owner = owner->owner;
448 451
449 this->owner = owner; 452 this->owner = owner;
450} 453}
451 454
455void
456object::set_weapon (object *ob)
457{
458 if (current_weapon == ob)
459 return;
460
461 new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
462
463 if (chosen_skill)
464 chosen_skill->flag [FLAG_APPLIED] = false;
465
466 current_weapon = ob;
467 chosen_skill = ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
468
469 if (chosen_skill)
470 chosen_skill->flag [FLAG_APPLIED] = true;
471
472 update_stats ();
473}
474
452/* Zero the key_values on op, decrementing the shared-string 475/* Zero the key_values on op, decrementing the shared-string
453 * refcounts and freeing the links. 476 * refcounts and freeing the links.
454 */ 477 */
455static void 478static void
456free_key_values (object *op) 479free_key_values (object *op)
457{ 480{
458 for (key_value *i = op->key_values; i != 0;) 481 for (key_value *i = op->key_values; i; )
459 { 482 {
460 key_value *next = i->next; 483 key_value *next = i->next;
461 delete i; 484 delete i;
462 485
463 i = next; 486 i = next;
464 } 487 }
465 488
466 op->key_values = 0; 489 op->key_values = 0;
467} 490}
468 491
469/* 492object &
470 * copy_to first frees everything allocated by the dst object, 493object::operator =(const object &src)
471 * and then copies the contents of itself into the second
472 * object, allocating what needs to be allocated. Basically, any
473 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
474 * if the first object is freed, the pointers in the new object
475 * will point at garbage.
476 */
477void
478object::copy_to (object *dst)
479{ 494{
480 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 495 bool is_freed = flag [FLAG_FREED];
481 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 496 bool is_removed = flag [FLAG_REMOVED];
482 497
483 *(object_copy *)dst = *this; 498 *(object_copy *)this = src;
484 499
485 if (is_freed) 500 flag [FLAG_FREED] = is_freed;
486 SET_FLAG (dst, FLAG_FREED); 501 flag [FLAG_REMOVED] = is_removed;
487
488 if (is_removed)
489 SET_FLAG (dst, FLAG_REMOVED);
490
491 if (speed < 0)
492 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
493 502
494 /* Copy over key_values, if any. */ 503 /* Copy over key_values, if any. */
495 if (key_values) 504 if (src.key_values)
496 { 505 {
497 key_value *tail = 0; 506 key_value *tail = 0;
498 key_value *i;
499
500 dst->key_values = 0; 507 key_values = 0;
501 508
502 for (i = key_values; i; i = i->next) 509 for (key_value *i = src.key_values; i; i = i->next)
503 { 510 {
504 key_value *new_link = new key_value; 511 key_value *new_link = new key_value;
505 512
506 new_link->next = 0; 513 new_link->next = 0;
507 new_link->key = i->key; 514 new_link->key = i->key;
508 new_link->value = i->value; 515 new_link->value = i->value;
509 516
510 /* Try and be clever here, too. */ 517 /* Try and be clever here, too. */
511 if (!dst->key_values) 518 if (!key_values)
512 { 519 {
513 dst->key_values = new_link; 520 key_values = new_link;
514 tail = new_link; 521 tail = new_link;
515 } 522 }
516 else 523 else
517 { 524 {
518 tail->next = new_link; 525 tail->next = new_link;
519 tail = new_link; 526 tail = new_link;
520 } 527 }
521 } 528 }
522 } 529 }
530}
531
532/*
533 * copy_to first frees everything allocated by the dst object,
534 * and then copies the contents of itself into the second
535 * object, allocating what needs to be allocated. Basically, any
536 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
537 * if the first object is freed, the pointers in the new object
538 * will point at garbage.
539 */
540void
541object::copy_to (object *dst)
542{
543 *dst = *this;
544
545 if (speed < 0)
546 dst->speed_left = speed_left - rndm ();
523 547
524 dst->set_speed (dst->speed); 548 dst->set_speed (dst->speed);
549}
550
551void
552object::instantiate ()
553{
554 if (!uuid.seq) // HACK
555 uuid = gen_uuid ();
556
557 speed_left = -0.1f;
558 /* copy the body_info to the body_used - this is only really
559 * need for monsters, but doesn't hurt to do it for everything.
560 * by doing so, when a monster is created, it has good starting
561 * values for the body_used info, so when items are created
562 * for it, they can be properly equipped.
563 */
564 for (int i = NUM_BODY_LOCATIONS; i--; )
565 slot[i].used = slot[i].info;
566
567 attachable::instantiate ();
525} 568}
526 569
527object * 570object *
528object::clone () 571object::clone ()
529{ 572{
… …
587 * UP_OBJ_FACE: only the objects face has changed. 630 * UP_OBJ_FACE: only the objects face has changed.
588 */ 631 */
589void 632void
590update_object (object *op, int action) 633update_object (object *op, int action)
591{ 634{
592 MoveType move_on, move_off, move_block, move_slow;
593
594 if (op == NULL) 635 if (op == NULL)
595 { 636 {
596 /* this should never happen */ 637 /* this should never happen */
597 LOG (llevDebug, "update_object() called for NULL object.\n"); 638 LOG (llevDebug, "update_object() called for NULL object.\n");
598 return; 639 return;
… …
658 699
659 if (op->more) 700 if (op->more)
660 update_object (op->more, action); 701 update_object (op->more, action);
661} 702}
662 703
663object *object::first;
664
665object::object () 704object::object ()
666{ 705{
667 SET_FLAG (this, FLAG_REMOVED); 706 SET_FLAG (this, FLAG_REMOVED);
668 707
669 expmul = 1.0; 708 expmul = 1.0;
670 face = blank_face; 709 face = blank_face;
671} 710}
672 711
673object::~object () 712object::~object ()
674{ 713{
714 unlink ();
715
675 free_key_values (this); 716 free_key_values (this);
676} 717}
677 718
719static int object_count;
720
678void object::link () 721void object::link ()
679{ 722{
723 assert (!index);//D
680 uuid = gen_uuid (); 724 uuid = gen_uuid ();
725 count = ++object_count;
681 726
727 refcnt_inc ();
682 objects.insert (this); 728 objects.insert (this);
683} 729}
684 730
685void object::unlink () 731void object::unlink ()
686{ 732{
733 if (!index)
734 return;
735
687 objects.erase (this); 736 objects.erase (this);
737 refcnt_dec ();
688} 738}
689 739
690void 740void
691object::activate () 741object::activate ()
692{ 742{
… …
764 * drop on that space. 814 * drop on that space.
765 */ 815 */
766 if (!drop_to_ground 816 if (!drop_to_ground
767 || !map 817 || !map
768 || map->in_memory != MAP_IN_MEMORY 818 || map->in_memory != MAP_IN_MEMORY
819 || map->nodrop
769 || ms ().move_block == MOVE_ALL) 820 || ms ().move_block == MOVE_ALL)
770 { 821 {
771 while (inv) 822 while (inv)
772 { 823 {
773 inv->destroy_inv (drop_to_ground); 824 inv->destroy_inv (drop_to_ground);
… …
782 833
783 if (op->flag [FLAG_STARTEQUIP] 834 if (op->flag [FLAG_STARTEQUIP]
784 || op->flag [FLAG_NO_DROP] 835 || op->flag [FLAG_NO_DROP]
785 || op->type == RUNE 836 || op->type == RUNE
786 || op->type == TRAP 837 || op->type == TRAP
787 || op->flag [FLAG_IS_A_TEMPLATE]) 838 || op->flag [FLAG_IS_A_TEMPLATE]
839 || op->flag [FLAG_DESTROY_ON_DEATH])
788 op->destroy (); 840 op->destroy ();
789 else 841 else
790 map->insert (op, x, y); 842 map->insert (op, x, y);
791 } 843 }
792 } 844 }
… …
800} 852}
801 853
802void 854void
803object::do_destroy () 855object::do_destroy ()
804{ 856{
857 attachable::do_destroy ();
858
805 if (flag [FLAG_IS_LINKED]) 859 if (flag [FLAG_IS_LINKED])
806 remove_button_link (this); 860 remove_button_link (this);
807 861
808 if (flag [FLAG_FRIENDLY]) 862 if (flag [FLAG_FRIENDLY])
809 remove_friendly_object (this); 863 remove_friendly_object (this);
810 864
811 if (!flag [FLAG_REMOVED]) 865 if (!flag [FLAG_REMOVED])
812 remove (); 866 remove ();
813 867
814 if (flag [FLAG_FREED]) 868 destroy_inv (true);
815 return;
816 869
817 set_speed (0); 870 deactivate ();
871 unlink ();
818 872
819 flag [FLAG_FREED] = 1; 873 flag [FLAG_FREED] = 1;
820
821 attachable::do_destroy ();
822
823 destroy_inv (true);
824 unlink ();
825 874
826 // hack to ensure that freed objects still have a valid map 875 // hack to ensure that freed objects still have a valid map
827 { 876 {
828 static maptile *freed_map; // freed objects are moved here to avoid crashes 877 static maptile *freed_map; // freed objects are moved here to avoid crashes
829 878
… …
891 * This function removes the object op from the linked list of objects 940 * This function removes the object op from the linked list of objects
892 * which it is currently tied to. When this function is done, the 941 * which it is currently tied to. When this function is done, the
893 * object will have no environment. If the object previously had an 942 * object will have no environment. If the object previously had an
894 * environment, the x and y coordinates will be updated to 943 * environment, the x and y coordinates will be updated to
895 * the previous environment. 944 * the previous environment.
896 * Beware: This function is called from the editor as well!
897 */ 945 */
898void 946void
899object::remove () 947object::do_remove ()
900{ 948{
901 object *tmp, *last = 0; 949 object *tmp, *last = 0;
902 object *otmp; 950 object *otmp;
903 951
904 if (QUERY_FLAG (this, FLAG_REMOVED)) 952 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
947 } 995 }
948 else if (map) 996 else if (map)
949 { 997 {
950 if (type == PLAYER) 998 if (type == PLAYER)
951 { 999 {
1000 // leaving a spot always closes any open container on the ground
1001 if (container && !container->env)
1002 // this causes spurious floorbox updates, but it ensures
1003 // that the CLOSE event is being sent.
1004 close_container ();
1005
952 --map->players; 1006 --map->players;
953 map->touch (); 1007 map->touch ();
954 } 1008 }
955 1009
956 map->dirty = true; 1010 map->dirty = true;
1011 mapspace &ms = this->ms ();
957 1012
958 /* link the object above us */ 1013 /* link the object above us */
959 if (above) 1014 if (above)
960 above->below = below; 1015 above->below = below;
961 else 1016 else
962 map->at (x, y).top = below; /* we were top, set new top */ 1017 ms.top = below; /* we were top, set new top */
963 1018
964 /* Relink the object below us, if there is one */ 1019 /* Relink the object below us, if there is one */
965 if (below) 1020 if (below)
966 below->above = above; 1021 below->above = above;
967 else 1022 else
… …
969 /* Nothing below, which means we need to relink map object for this space 1024 /* Nothing below, which means we need to relink map object for this space
970 * use translated coordinates in case some oddness with map tiling is 1025 * use translated coordinates in case some oddness with map tiling is
971 * evident 1026 * evident
972 */ 1027 */
973 if (GET_MAP_OB (map, x, y) != this) 1028 if (GET_MAP_OB (map, x, y) != this)
974 {
975 char *dump = dump_object (this);
976 LOG (llevError,
977 "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump); 1029 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 ());
978 free (dump);
979 dump = dump_object (GET_MAP_OB (map, x, y));
980 LOG (llevError, "%s\n", dump);
981 free (dump);
982 }
983 1030
984 map->at (x, y).bot = above; /* goes on above it. */ 1031 ms.bot = above; /* goes on above it. */
985 } 1032 }
986 1033
987 above = 0; 1034 above = 0;
988 below = 0; 1035 below = 0;
989 1036
990 if (map->in_memory == MAP_SAVING) 1037 if (map->in_memory == MAP_SAVING)
991 return; 1038 return;
992 1039
993 int check_walk_off = !flag [FLAG_NO_APPLY]; 1040 int check_walk_off = !flag [FLAG_NO_APPLY];
994 1041
995 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1042 for (tmp = ms.bot; tmp; tmp = tmp->above)
996 { 1043 {
997 /* No point updating the players look faces if he is the object 1044 /* No point updating the players look faces if he is the object
998 * being removed. 1045 * being removed.
999 */ 1046 */
1000 1047
… …
1080 } 1127 }
1081 1128
1082 return 0; 1129 return 0;
1083} 1130}
1084 1131
1132void
1133object::expand_tail ()
1134{
1135 if (more)
1136 return;
1137
1138 object *prev = this;
1139
1140 for (archetype *at = arch->more; at; at = at->more)
1141 {
1142 object *op = arch_to_object (at);
1143
1144 op->name = name;
1145 op->name_pl = name_pl;
1146 op->title = title;
1147
1148 op->head = this;
1149 prev->more = op;
1150
1151 prev = op;
1152 }
1153}
1154
1085/* 1155/*
1086 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1156 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1087 * job preparing multi-part monsters 1157 * job preparing multi-part monsters.
1088 */ 1158 */
1089object * 1159object *
1090insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1160insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1091{ 1161{
1092 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1162 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1119 * just 'op' otherwise 1189 * just 'op' otherwise
1120 */ 1190 */
1121object * 1191object *
1122insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1192insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1123{ 1193{
1194 assert (!op->flag [FLAG_FREED]);
1195
1124 object *tmp, *top, *floor = NULL; 1196 object *tmp, *top, *floor = NULL;
1125 sint16 x, y;
1126 1197
1127 if (QUERY_FLAG (op, FLAG_FREED)) 1198 op->remove ();
1128 {
1129 LOG (llevError, "Trying to insert freed object!\n");
1130 return NULL;
1131 }
1132 1199
1133 if (!m) 1200#if 0
1134 { 1201 if (!m->active != !op->active)
1135 char *dump = dump_object (op); 1202 if (m->active)
1136 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1203 op->activate_recursive ();
1137 free (dump); 1204 else
1138 return op; 1205 op->deactivate_recursive ();
1139 } 1206#endif
1140 1207
1141 if (out_of_map (m, op->x, op->y)) 1208 if (out_of_map (m, op->x, op->y))
1142 { 1209 {
1143 char *dump = dump_object (op);
1144 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1210 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1145#ifdef MANY_CORES 1211#ifdef MANY_CORES
1146 /* Better to catch this here, as otherwise the next use of this object 1212 /* Better to catch this here, as otherwise the next use of this object
1147 * is likely to cause a crash. Better to find out where it is getting 1213 * is likely to cause a crash. Better to find out where it is getting
1148 * improperly inserted. 1214 * improperly inserted.
1149 */ 1215 */
1150 abort (); 1216 abort ();
1151#endif 1217#endif
1152 free (dump);
1153 return op; 1218 return op;
1154 } 1219 }
1155 1220
1156 if (!QUERY_FLAG (op, FLAG_REMOVED))
1157 {
1158 char *dump = dump_object (op);
1159 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1160 free (dump);
1161 return op;
1162 }
1163
1164 if (op->more)
1165 {
1166 /* The part may be on a different map. */
1167
1168 object *more = op->more; 1221 if (object *more = op->more)
1169 1222 {
1170 /* We really need the caller to normalise coordinates - if
1171 * we set the map, that doesn't work if the location is within
1172 * a map and this is straddling an edge. So only if coordinate
1173 * is clear wrong do we normalise it.
1174 */
1175 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1176 more->map = get_map_from_coord (m, &more->x, &more->y);
1177 else if (!more->map)
1178 {
1179 /* For backwards compatibility - when not dealing with tiled maps,
1180 * more->map should always point to the parent.
1181 */
1182 more->map = m;
1183 }
1184
1185 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1223 if (!insert_ob_in_map (more, m, originator, flag))
1186 { 1224 {
1187 if (!op->head) 1225 if (!op->head)
1188 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1226 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1189 1227
1190 return 0; 1228 return 0;
… …
1195 1233
1196 /* Ideally, the caller figures this out. However, it complicates a lot 1234 /* Ideally, the caller figures this out. However, it complicates a lot
1197 * of areas of callers (eg, anything that uses find_free_spot would now 1235 * of areas of callers (eg, anything that uses find_free_spot would now
1198 * need extra work 1236 * need extra work
1199 */ 1237 */
1200 op->map = get_map_from_coord (m, &op->x, &op->y); 1238 if (!xy_normalise (m, op->x, op->y))
1201 x = op->x; 1239 return 0;
1202 y = op->y; 1240
1241 op->map = m;
1242 mapspace &ms = op->ms ();
1203 1243
1204 /* this has to be done after we translate the coordinates. 1244 /* this has to be done after we translate the coordinates.
1205 */ 1245 */
1206 if (op->nrof && !(flag & INS_NO_MERGE)) 1246 if (op->nrof && !(flag & INS_NO_MERGE))
1207 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1247 for (tmp = ms.bot; tmp; tmp = tmp->above)
1208 if (object::can_merge (op, tmp)) 1248 if (object::can_merge (op, tmp))
1209 { 1249 {
1210 op->nrof += tmp->nrof; 1250 op->nrof += tmp->nrof;
1211 tmp->destroy (); 1251 tmp->destroy ();
1212 } 1252 }
… …
1229 op->below = originator->below; 1269 op->below = originator->below;
1230 1270
1231 if (op->below) 1271 if (op->below)
1232 op->below->above = op; 1272 op->below->above = op;
1233 else 1273 else
1234 op->ms ().bot = op; 1274 ms.bot = op;
1235 1275
1236 /* since *below* originator, no need to update top */ 1276 /* since *below* originator, no need to update top */
1237 originator->below = op; 1277 originator->below = op;
1238 } 1278 }
1239 else 1279 else
1240 { 1280 {
1281 top = ms.bot;
1282
1241 /* If there are other objects, then */ 1283 /* If there are other objects, then */
1242 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1284 if ((!(flag & INS_MAP_LOAD)) && top)
1243 { 1285 {
1244 object *last = 0; 1286 object *last = 0;
1245 1287
1246 /* 1288 /*
1247 * If there are multiple objects on this space, we do some trickier handling. 1289 * If there are multiple objects on this space, we do some trickier handling.
… …
1253 * once we get to them. This reduces the need to traverse over all of 1295 * once we get to them. This reduces the need to traverse over all of
1254 * them when adding another one - this saves quite a bit of cpu time 1296 * them when adding another one - this saves quite a bit of cpu time
1255 * when lots of spells are cast in one area. Currently, it is presumed 1297 * when lots of spells are cast in one area. Currently, it is presumed
1256 * that flying non pickable objects are spell objects. 1298 * that flying non pickable objects are spell objects.
1257 */ 1299 */
1258 while (top) 1300 for (top = ms.bot; top; top = top->above)
1259 { 1301 {
1260 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1302 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1261 floor = top; 1303 floor = top;
1262 1304
1263 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1305 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1266 top = top->below; 1308 top = top->below;
1267 break; 1309 break;
1268 } 1310 }
1269 1311
1270 last = top; 1312 last = top;
1271 top = top->above;
1272 } 1313 }
1273 1314
1274 /* Don't want top to be NULL, so set it to the last valid object */ 1315 /* Don't want top to be NULL, so set it to the last valid object */
1275 top = last; 1316 top = last;
1276 1317
… …
1278 * looks like instead of lots of conditions here. 1319 * looks like instead of lots of conditions here.
1279 * makes things faster, and effectively the same result. 1320 * makes things faster, and effectively the same result.
1280 */ 1321 */
1281 1322
1282 /* Have object 'fall below' other objects that block view. 1323 /* Have object 'fall below' other objects that block view.
1283 * Unless those objects are exits, type 66 1324 * Unless those objects are exits.
1284 * If INS_ON_TOP is used, don't do this processing 1325 * If INS_ON_TOP is used, don't do this processing
1285 * Need to find the object that in fact blocks view, otherwise 1326 * Need to find the object that in fact blocks view, otherwise
1286 * stacking is a bit odd. 1327 * stacking is a bit odd.
1287 */ 1328 */
1288 if (!(flag & INS_ON_TOP) && 1329 if (!(flag & INS_ON_TOP)
1289 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1330 && ms.flags () & P_BLOCKSVIEW
1331 && (op->face && !faces [op->face].visibility))
1290 { 1332 {
1291 for (last = top; last != floor; last = last->below) 1333 for (last = top; last != floor; last = last->below)
1292 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1334 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1293 break; 1335 break;
1336
1294 /* Check to see if we found the object that blocks view, 1337 /* Check to see if we found the object that blocks view,
1295 * and make sure we have a below pointer for it so that 1338 * and make sure we have a below pointer for it so that
1296 * we can get inserted below this one, which requires we 1339 * we can get inserted below this one, which requires we
1297 * set top to the object below us. 1340 * set top to the object below us.
1298 */ 1341 */
… …
1300 top = last->below; 1343 top = last->below;
1301 } 1344 }
1302 } /* If objects on this space */ 1345 } /* If objects on this space */
1303 1346
1304 if (flag & INS_MAP_LOAD) 1347 if (flag & INS_MAP_LOAD)
1305 top = GET_MAP_TOP (op->map, op->x, op->y); 1348 top = ms.top;
1306 1349
1307 if (flag & INS_ABOVE_FLOOR_ONLY) 1350 if (flag & INS_ABOVE_FLOOR_ONLY)
1308 top = floor; 1351 top = floor;
1309 1352
1310 /* Top is the object that our object (op) is going to get inserted above. 1353 /* Top is the object that our object (op) is going to get inserted above.
1311 */ 1354 */
1312 1355
1313 /* First object on this space */ 1356 /* First object on this space */
1314 if (!top) 1357 if (!top)
1315 { 1358 {
1316 op->above = GET_MAP_OB (op->map, op->x, op->y); 1359 op->above = ms.bot;
1317 1360
1318 if (op->above) 1361 if (op->above)
1319 op->above->below = op; 1362 op->above->below = op;
1320 1363
1321 op->below = 0; 1364 op->below = 0;
1322 op->ms ().bot = op; 1365 ms.bot = op;
1323 } 1366 }
1324 else 1367 else
1325 { /* get inserted into the stack above top */ 1368 { /* get inserted into the stack above top */
1326 op->above = top->above; 1369 op->above = top->above;
1327 1370
… …
1331 op->below = top; 1374 op->below = top;
1332 top->above = op; 1375 top->above = op;
1333 } 1376 }
1334 1377
1335 if (!op->above) 1378 if (!op->above)
1336 op->ms ().top = op; 1379 ms.top = op;
1337 } /* else not INS_BELOW_ORIGINATOR */ 1380 } /* else not INS_BELOW_ORIGINATOR */
1338 1381
1339 if (op->type == PLAYER) 1382 if (op->type == PLAYER)
1340 { 1383 {
1341 op->contr->do_los = 1; 1384 op->contr->do_los = 1;
… …
1347 1390
1348 /* If we have a floor, we know the player, if any, will be above 1391 /* If we have a floor, we know the player, if any, will be above
1349 * it, so save a few ticks and start from there. 1392 * it, so save a few ticks and start from there.
1350 */ 1393 */
1351 if (!(flag & INS_MAP_LOAD)) 1394 if (!(flag & INS_MAP_LOAD))
1352 if (object *pl = op->ms ().player ()) 1395 if (object *pl = ms.player ())
1353 if (pl->contr->ns) 1396 if (pl->contr->ns)
1354 pl->contr->ns->floorbox_update (); 1397 pl->contr->ns->floorbox_update ();
1355 1398
1356 /* If this object glows, it may affect lighting conditions that are 1399 /* If this object glows, it may affect lighting conditions that are
1357 * visible to others on this map. But update_all_los is really 1400 * visible to others on this map. But update_all_los is really
… …
1419} 1462}
1420 1463
1421object * 1464object *
1422object::insert_at (object *where, object *originator, int flags) 1465object::insert_at (object *where, object *originator, int flags)
1423{ 1466{
1424 where->map->insert (this, where->x, where->y, originator, flags); 1467 return where->map->insert (this, where->x, where->y, originator, flags);
1425} 1468}
1426 1469
1427/* 1470/*
1428 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1471 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1429 * is returned contains nr objects, and the remaining parts contains 1472 * is returned contains nr objects, and the remaining parts contains
… …
1469 * the amount of an object. If the amount reaches 0, the object 1512 * the amount of an object. If the amount reaches 0, the object
1470 * is subsequently removed and freed. 1513 * is subsequently removed and freed.
1471 * 1514 *
1472 * Return value: 'op' if something is left, NULL if the amount reached 0 1515 * Return value: 'op' if something is left, NULL if the amount reached 0
1473 */ 1516 */
1474
1475object * 1517object *
1476decrease_ob_nr (object *op, uint32 i) 1518decrease_ob_nr (object *op, uint32 i)
1477{ 1519{
1478 object *tmp; 1520 object *tmp;
1479 1521
… …
1554 1596
1555/* 1597/*
1556 * add_weight(object, weight) adds the specified weight to an object, 1598 * add_weight(object, weight) adds the specified weight to an object,
1557 * and also updates how much the environment(s) is/are carrying. 1599 * and also updates how much the environment(s) is/are carrying.
1558 */ 1600 */
1559
1560void 1601void
1561add_weight (object *op, signed long weight) 1602add_weight (object *op, signed long weight)
1562{ 1603{
1563 while (op != NULL) 1604 while (op != NULL)
1564 { 1605 {
… …
1596 * inside the object environment. 1637 * inside the object environment.
1597 * 1638 *
1598 * The function returns now pointer to inserted item, and return value can 1639 * The function returns now pointer to inserted item, and return value can
1599 * be != op, if items are merged. -Tero 1640 * be != op, if items are merged. -Tero
1600 */ 1641 */
1601
1602object * 1642object *
1603object::insert (object *op) 1643object::insert (object *op)
1604{ 1644{
1605 object *tmp, *otmp; 1645 object *tmp, *otmp;
1606 1646
… …
1766 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1806 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1767 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1807 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1768 { 1808 {
1769 1809
1770 float 1810 float
1771 diff = tmp->move_slow_penalty * FABS (op->speed); 1811 diff = tmp->move_slow_penalty * fabs (op->speed);
1772 1812
1773 if (op->type == PLAYER) 1813 if (op->type == PLAYER)
1774 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1814 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1775 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1815 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1776 diff /= 4.0; 1816 diff /= 4.0;
… …
1983 } 2023 }
1984 2024
1985 if (!index) 2025 if (!index)
1986 return -1; 2026 return -1;
1987 2027
1988 return altern[RANDOM () % index]; 2028 return altern [rndm (index)];
1989} 2029}
1990 2030
1991/* 2031/*
1992 * find_first_free_spot(archetype, maptile, x, y) works like 2032 * find_first_free_spot(archetype, maptile, x, y) works like
1993 * find_free_spot(), but it will search max number of squares. 2033 * find_free_spot(), but it will search max number of squares.
… …
2014{ 2054{
2015 arr += begin; 2055 arr += begin;
2016 end -= begin; 2056 end -= begin;
2017 2057
2018 while (--end) 2058 while (--end)
2019 swap (arr [end], arr [RANDOM () % (end + 1)]); 2059 swap (arr [end], arr [rndm (end + 1)]);
2020} 2060}
2021 2061
2022/* new function to make monster searching more efficient, and effective! 2062/* new function to make monster searching more efficient, and effective!
2023 * This basically returns a randomized array (in the passed pointer) of 2063 * This basically returns a randomized array (in the passed pointer) of
2024 * the spaces to find monsters. In this way, it won't always look for 2064 * the spaces to find monsters. In this way, it won't always look for
… …
2158 2198
2159 return 3; 2199 return 3;
2160} 2200}
2161 2201
2162/* 2202/*
2163 * absdir(int): Returns a number between 1 and 8, which represent
2164 * the "absolute" direction of a number (it actually takes care of
2165 * "overflow" in previous calculations of a direction).
2166 */
2167
2168int
2169absdir (int d)
2170{
2171 while (d < 1)
2172 d += 8;
2173
2174 while (d > 8)
2175 d -= 8;
2176
2177 return d;
2178}
2179
2180/*
2181 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2203 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2182 * between two directions (which are expected to be absolute (see absdir()) 2204 * between two directions (which are expected to be absolute (see absdir())
2183 */ 2205 */
2184
2185int 2206int
2186dirdiff (int dir1, int dir2) 2207dirdiff (int dir1, int dir2)
2187{ 2208{
2188 int d; 2209 int d;
2189 2210
… …
2355 insert_ob_in_ob (object_create_clone (item), dst); 2376 insert_ob_in_ob (object_create_clone (item), dst);
2356 2377
2357 return dst; 2378 return dst;
2358} 2379}
2359 2380
2360/* GROS - Creates an object using a string representing its content. */
2361/* Basically, we save the content of the string to a temp file, then call */
2362/* load_object on it. I admit it is a highly inefficient way to make things, */
2363/* but it was simple to make and allows reusing the load_object function. */
2364/* Remember not to use load_object_str in a time-critical situation. */
2365/* Also remember that multiparts objects are not supported for now. */
2366object *
2367load_object_str (const char *obstr)
2368{
2369 object *op;
2370 char filename[MAX_BUF];
2371
2372 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2373
2374 FILE *tempfile = fopen (filename, "w");
2375
2376 if (tempfile == NULL)
2377 {
2378 LOG (llevError, "Error - Unable to access load object temp file\n");
2379 return NULL;
2380 }
2381
2382 fprintf (tempfile, obstr);
2383 fclose (tempfile);
2384
2385 op = object::create ();
2386
2387 object_thawer thawer (filename);
2388
2389 if (thawer)
2390 load_object (thawer, op, 0);
2391
2392 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2393 CLEAR_FLAG (op, FLAG_REMOVED);
2394
2395 return op;
2396}
2397
2398/* This returns the first object in who's inventory that 2381/* This returns the first object in who's inventory that
2399 * has the same type and subtype match. 2382 * has the same type and subtype match.
2400 * returns NULL if no match. 2383 * returns NULL if no match.
2401 */ 2384 */
2402object * 2385object *
… …
2455 if (link->key == canonical_key) 2438 if (link->key == canonical_key)
2456 return link->value; 2439 return link->value;
2457 2440
2458 return 0; 2441 return 0;
2459} 2442}
2460
2461 2443
2462/* 2444/*
2463 * Updates the canonical_key in op to value. 2445 * Updates the canonical_key in op to value.
2464 * 2446 *
2465 * canonical_key is a shared string (value doesn't have to be). 2447 * canonical_key is a shared string (value doesn't have to be).
… …
2605{ 2587{
2606 char flagdesc[512]; 2588 char flagdesc[512];
2607 char info2[256 * 4]; 2589 char info2[256 * 4];
2608 char *p = info; 2590 char *p = info;
2609 2591
2610 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2592 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2611 count, uuid.seq, 2593 count, uuid.seq,
2612 &name, 2594 &name,
2613 title ? "\",title:" : "", 2595 title ? "\",title:\"" : "",
2614 title ? (const char *)title : "", 2596 title ? (const char *)title : "",
2615 flag_desc (flagdesc, 512), type); 2597 flag_desc (flagdesc, 512), type);
2616 2598
2617 if (env) 2599 if (env)
2618 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2600 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2624} 2606}
2625 2607
2626const char * 2608const char *
2627object::debug_desc () const 2609object::debug_desc () const
2628{ 2610{
2629 static char info[256 * 4]; 2611 static char info[3][256 * 4];
2612 static int info_idx;
2613
2630 return debug_desc (info); 2614 return debug_desc (info [++info_idx % 3]);
2631} 2615}
2632 2616
2617struct region *
2618object::region () const
2619{
2620 return map ? map->region (x, y)
2621 : region::default_region ();
2622}
2623
2624const materialtype_t *
2625object::dominant_material () const
2626{
2627 if (materialtype_t *mat = name_to_material (materialname))
2628 return mat;
2629
2630 // omfg this is slow, this has to be temporary :)
2631 shstr unknown ("unknown");
2632
2633 return name_to_material (unknown);
2634}
2635
2636void
2637object::open_container (object *new_container)
2638{
2639 if (container == new_container)
2640 return;
2641
2642 if (object *old_container = container)
2643 {
2644 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2645 return;
2646
2647#if 0
2648 // remove the "Close old_container" object.
2649 if (object *closer = old_container->inv)
2650 if (closer->type == CLOSE_CON)
2651 closer->destroy ();
2652#endif
2653
2654 old_container->flag [FLAG_APPLIED] = 0;
2655 container = 0;
2656
2657 esrv_update_item (UPD_FLAGS, this, old_container);
2658 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2659 }
2660
2661 if (new_container)
2662 {
2663 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2664 return;
2665
2666 // TODO: this does not seem to serve any purpose anymore?
2667#if 0
2668 // insert the "Close Container" object.
2669 if (archetype *closer = new_container->other_arch)
2670 {
2671 object *closer = arch_to_object (new_container->other_arch);
2672 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2673 new_container->insert (closer);
2674 }
2675#endif
2676
2677 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2678
2679 new_container->flag [FLAG_APPLIED] = 1;
2680 container = new_container;
2681
2682 esrv_update_item (UPD_FLAGS, this, new_container);
2683 esrv_send_inventory (this, new_container);
2684 }
2685}
2686
2687

Diff Legend

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