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.106 by root, Wed Jan 3 20:08:04 2007 UTC vs.
Revision 1.136 by root, Thu Mar 15 14:23:02 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 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
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 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>
22*/ 23 */
23 24
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 27 variable. */
27#include <global.h> 28#include <global.h>
36 37
37int nrofallocobjects = 0; 38int nrofallocobjects = 0;
38static UUID uuid; 39static UUID uuid;
39const uint64 UUID_SKIP = 1<<19; 40const uint64 UUID_SKIP = 1<<19;
40 41
41object *active_objects; /* List of active objects that need to be processed */ 42objectvec objects;
43activevec actives;
42 44
43short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 45short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 46 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45}; 47};
46short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 48short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
355/* 357/*
356 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
357 * Some error messages. 359 * Some error messages.
358 * The result of the dump is stored in the static global errmsg array. 360 * The result of the dump is stored in the static global errmsg array.
359 */ 361 */
360
361char * 362char *
362dump_object (object *op) 363dump_object (object *op)
363{ 364{
364 if (!op) 365 if (!op)
365 return strdup ("[NULLOBJ]"); 366 return strdup ("[NULLOBJ]");
366 367
367 object_freezer freezer; 368 object_freezer freezer;
368 save_object (freezer, op, 1); 369 op->write (freezer);
369 return freezer.as_string (); 370 return freezer.as_string ();
370} 371}
371 372
372/* 373/*
373 * get_nearest_part(multi-object, object 2) returns the part of the 374 * get_nearest_part(multi-object, object 2) returns the part of the
390} 391}
391 392
392/* 393/*
393 * Returns the object which has the count-variable equal to the argument. 394 * Returns the object which has the count-variable equal to the argument.
394 */ 395 */
395
396object * 396object *
397find_object (tag_t i) 397find_object (tag_t i)
398{ 398{
399 for (object *op = object::first; op; op = op->next) 399 for_all_objects (op)
400 if (op->count == i) 400 if (op->count == i)
401 return op; 401 return op;
402 402
403 return 0; 403 return 0;
404} 404}
405 405
406/* 406/*
407 * Returns the first object which has a name equal to the argument. 407 * Returns the first object which has a name equal to the argument.
408 * Used only by the patch command, but not all that useful. 408 * Used only by the patch command, but not all that useful.
409 * Enables features like "patch <name-of-other-player> food 999" 409 * Enables features like "patch <name-of-other-player> food 999"
410 */ 410 */
411
412object * 411object *
413find_object_name (const char *str) 412find_object_name (const char *str)
414{ 413{
415 shstr_cmp str_ (str); 414 shstr_cmp str_ (str);
416 object *op; 415 object *op;
417 416
418 for (op = object::first; op != NULL; op = op->next) 417 for_all_objects (op)
419 if (op->name == str_) 418 if (op->name == str_)
420 break; 419 break;
421 420
422 return op; 421 return op;
423} 422}
489 488
490 if (is_removed) 489 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED); 490 SET_FLAG (dst, FLAG_REMOVED);
492 491
493 if (speed < 0) 492 if (speed < 0)
494 dst->speed_left = speed_left - RANDOM () % 200 / 100.0; 493 dst->speed_left = speed_left - rndm ();
495 494
496 /* Copy over key_values, if any. */ 495 /* Copy over key_values, if any. */
497 if (key_values) 496 if (key_values)
498 { 497 {
499 key_value *tail = 0; 498 key_value *tail = 0;
522 } 521 }
523 } 522 }
524 } 523 }
525 524
526 dst->set_speed (dst->speed); 525 dst->set_speed (dst->speed);
526}
527
528void
529object::instantiate ()
530{
531 if (!uuid.seq) // HACK
532 uuid = gen_uuid ();
533
534 speed_left = -0.1f;
535 /* copy the body_info to the body_used - this is only really
536 * need for monsters, but doesn't hurt to do it for everything.
537 * by doing so, when a monster is created, it has good starting
538 * values for the body_used info, so when items are created
539 * for it, they can be properly equipped.
540 */
541 memcpy (body_used, body_info, sizeof (body_used));
542
543 attachable::instantiate ();
527} 544}
528 545
529object * 546object *
530object::clone () 547object::clone ()
531{ 548{
589 * UP_OBJ_FACE: only the objects face has changed. 606 * UP_OBJ_FACE: only the objects face has changed.
590 */ 607 */
591void 608void
592update_object (object *op, int action) 609update_object (object *op, int action)
593{ 610{
594 MoveType move_on, move_off, move_block, move_slow;
595
596 if (op == NULL) 611 if (op == NULL)
597 { 612 {
598 /* this should never happen */ 613 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 614 LOG (llevDebug, "update_object() called for NULL object.\n");
600 return; 615 return;
660 675
661 if (op->more) 676 if (op->more)
662 update_object (op->more, action); 677 update_object (op->more, action);
663} 678}
664 679
665object *object::first;
666
667object::object () 680object::object ()
668{ 681{
669 SET_FLAG (this, FLAG_REMOVED); 682 SET_FLAG (this, FLAG_REMOVED);
670 683
671 expmul = 1.0; 684 expmul = 1.0;
672 face = blank_face; 685 face = blank_face;
673} 686}
674 687
675object::~object () 688object::~object ()
676{ 689{
690 unlink ();
691
677 free_key_values (this); 692 free_key_values (this);
678} 693}
679 694
695static int object_count;
696
680void object::link () 697void object::link ()
681{ 698{
682 count = ++ob_count; 699 assert (!index);//D
683 uuid = gen_uuid (); 700 uuid = gen_uuid ();
701 count = ++object_count;
684 702
685 prev = 0; 703 refcnt_inc ();
686 next = object::first; 704 objects.insert (this);
687
688 if (object::first)
689 object::first->prev = this;
690
691 object::first = this;
692} 705}
693 706
694void object::unlink () 707void object::unlink ()
695{ 708{
696 if (this == object::first) 709 if (!index)
697 object::first = next; 710 return;
698 711
699 /* Remove this object from the list of used objects */ 712 objects.erase (this);
700 if (prev) prev->next = next; 713 refcnt_dec ();
701 if (next) next->prev = prev;
702
703 prev = 0;
704 next = 0;
705}
706
707bool
708object::active () const
709{
710 return active_next || active_prev || this == active_objects;
711} 714}
712 715
713void 716void
714object::activate () 717object::activate ()
715{ 718{
716 /* If already on active list, don't do anything */ 719 /* If already on active list, don't do anything */
717 if (active ()) 720 if (active)
718 return; 721 return;
719 722
720 if (has_active_speed ()) 723 if (has_active_speed ())
721 { 724 actives.insert (this);
722 /* process_events() expects us to insert the object at the beginning
723 * of the list. */
724 active_next = active_objects;
725
726 if (active_next)
727 active_next->active_prev = this;
728
729 active_objects = this;
730 }
731} 725}
732 726
733void 727void
734object::activate_recursive () 728object::activate_recursive ()
735{ 729{
749 */ 743 */
750void 744void
751object::deactivate () 745object::deactivate ()
752{ 746{
753 /* If not on the active list, nothing needs to be done */ 747 /* If not on the active list, nothing needs to be done */
754 if (!active ()) 748 if (!active)
755 return; 749 return;
756 750
757 if (active_prev == 0) 751 actives.erase (this);
758 {
759 active_objects = active_next;
760 if (active_next)
761 active_next->active_prev = 0;
762 }
763 else
764 {
765 active_prev->active_next = active_next;
766 if (active_next)
767 active_next->active_prev = active_prev;
768 }
769
770 active_next = 0;
771 active_prev = 0;
772} 752}
773 753
774void 754void
775object::deactivate_recursive () 755object::deactivate_recursive ()
776{ 756{
810 * drop on that space. 790 * drop on that space.
811 */ 791 */
812 if (!drop_to_ground 792 if (!drop_to_ground
813 || !map 793 || !map
814 || map->in_memory != MAP_IN_MEMORY 794 || map->in_memory != MAP_IN_MEMORY
795 || map->nodrop
815 || ms ().move_block == MOVE_ALL) 796 || ms ().move_block == MOVE_ALL)
816 { 797 {
817 while (inv) 798 while (inv)
818 { 799 {
819 inv->destroy_inv (drop_to_ground); 800 inv->destroy_inv (drop_to_ground);
828 809
829 if (op->flag [FLAG_STARTEQUIP] 810 if (op->flag [FLAG_STARTEQUIP]
830 || op->flag [FLAG_NO_DROP] 811 || op->flag [FLAG_NO_DROP]
831 || op->type == RUNE 812 || op->type == RUNE
832 || op->type == TRAP 813 || op->type == TRAP
833 || op->flag [FLAG_IS_A_TEMPLATE]) 814 || op->flag [FLAG_IS_A_TEMPLATE]
815 || op->flag [FLAG_DESTROY_ON_DEATH])
834 op->destroy (); 816 op->destroy ();
835 else 817 else
836 map->insert (op, x, y); 818 map->insert (op, x, y);
837 } 819 }
838 } 820 }
846} 828}
847 829
848void 830void
849object::do_destroy () 831object::do_destroy ()
850{ 832{
833 attachable::do_destroy ();
834
851 if (flag [FLAG_IS_LINKED]) 835 if (flag [FLAG_IS_LINKED])
852 remove_button_link (this); 836 remove_button_link (this);
853 837
854 if (flag [FLAG_FRIENDLY]) 838 if (flag [FLAG_FRIENDLY])
839 {
855 remove_friendly_object (this); 840 remove_friendly_object (this);
841
842 if (type == GOLEM
843 && owner
844 && owner->type == PLAYER
845 && owner->contr->ranges[range_golem] == this)
846 owner->contr->ranges[range_golem] = 0;
847 }
856 848
857 if (!flag [FLAG_REMOVED]) 849 if (!flag [FLAG_REMOVED])
858 remove (); 850 remove ();
859 851
860 if (flag [FLAG_FREED]) 852 destroy_inv (true);
861 return;
862 853
863 set_speed (0); 854 deactivate ();
855 unlink ();
864 856
865 flag [FLAG_FREED] = 1; 857 flag [FLAG_FREED] = 1;
866
867 attachable::do_destroy ();
868
869 destroy_inv (true);
870 unlink ();
871 858
872 // hack to ensure that freed objects still have a valid map 859 // hack to ensure that freed objects still have a valid map
873 { 860 {
874 static maptile *freed_map; // freed objects are moved here to avoid crashes 861 static maptile *freed_map; // freed objects are moved here to avoid crashes
875 862
900 887
901 // clear those pointers that likely might have circular references to us 888 // clear those pointers that likely might have circular references to us
902 owner = 0; 889 owner = 0;
903 enemy = 0; 890 enemy = 0;
904 attacked_by = 0; 891 attacked_by = 0;
905
906 // only relevant for players(?), but make sure of it anyways
907 contr = 0;
908} 892}
909 893
910void 894void
911object::destroy (bool destroy_inventory) 895object::destroy (bool destroy_inventory)
912{ 896{
940 * This function removes the object op from the linked list of objects 924 * This function removes the object op from the linked list of objects
941 * which it is currently tied to. When this function is done, the 925 * which it is currently tied to. When this function is done, the
942 * object will have no environment. If the object previously had an 926 * object will have no environment. If the object previously had an
943 * environment, the x and y coordinates will be updated to 927 * environment, the x and y coordinates will be updated to
944 * the previous environment. 928 * the previous environment.
945 * Beware: This function is called from the editor as well!
946 */ 929 */
947void 930void
948object::remove () 931object::do_remove ()
949{ 932{
950 object *tmp, *last = 0; 933 object *tmp, *last = 0;
951 object *otmp; 934 object *otmp;
952 935
953 if (QUERY_FLAG (this, FLAG_REMOVED)) 936 if (QUERY_FLAG (this, FLAG_REMOVED))
996 } 979 }
997 else if (map) 980 else if (map)
998 { 981 {
999 if (type == PLAYER) 982 if (type == PLAYER)
1000 { 983 {
984 // leaving a spot always closes any open container on the ground
985 if (container && !container->env)
986 // this causes spurious floorbox updates, but it ensures
987 // that the CLOSE event is being sent.
988 close_container ();
989
1001 --map->players; 990 --map->players;
1002 map->touch (); 991 map->touch ();
1003 } 992 }
1004 993
1005 map->dirty = true; 994 map->dirty = true;
995 mapspace &ms = this->ms ();
1006 996
1007 /* link the object above us */ 997 /* link the object above us */
1008 if (above) 998 if (above)
1009 above->below = below; 999 above->below = below;
1010 else 1000 else
1011 map->at (x, y).top = below; /* we were top, set new top */ 1001 ms.top = below; /* we were top, set new top */
1012 1002
1013 /* Relink the object below us, if there is one */ 1003 /* Relink the object below us, if there is one */
1014 if (below) 1004 if (below)
1015 below->above = above; 1005 below->above = above;
1016 else 1006 else
1018 /* Nothing below, which means we need to relink map object for this space 1008 /* Nothing below, which means we need to relink map object for this space
1019 * use translated coordinates in case some oddness with map tiling is 1009 * use translated coordinates in case some oddness with map tiling is
1020 * evident 1010 * evident
1021 */ 1011 */
1022 if (GET_MAP_OB (map, x, y) != this) 1012 if (GET_MAP_OB (map, x, y) != this)
1023 {
1024 char *dump = dump_object (this);
1025 LOG (llevError,
1026 "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); 1013 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 ());
1027 free (dump);
1028 dump = dump_object (GET_MAP_OB (map, x, y));
1029 LOG (llevError, "%s\n", dump);
1030 free (dump);
1031 }
1032 1014
1033 map->at (x, y).bot = above; /* goes on above it. */ 1015 ms.bot = above; /* goes on above it. */
1034 } 1016 }
1035 1017
1036 above = 0; 1018 above = 0;
1037 below = 0; 1019 below = 0;
1038 1020
1039 if (map->in_memory == MAP_SAVING) 1021 if (map->in_memory == MAP_SAVING)
1040 return; 1022 return;
1041 1023
1042 int check_walk_off = !flag [FLAG_NO_APPLY]; 1024 int check_walk_off = !flag [FLAG_NO_APPLY];
1043 1025
1044 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1026 for (tmp = ms.bot; tmp; tmp = tmp->above)
1045 { 1027 {
1046 /* No point updating the players look faces if he is the object 1028 /* No point updating the players look faces if he is the object
1047 * being removed. 1029 * being removed.
1048 */ 1030 */
1049 1031
1130 1112
1131 return 0; 1113 return 0;
1132} 1114}
1133 1115
1134/* 1116/*
1135 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1117 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1136 * job preparing multi-part monsters 1118 * job preparing multi-part monsters.
1137 */ 1119 */
1138object * 1120object *
1139insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1121insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1140{ 1122{
1141 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1123 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1169 */ 1151 */
1170object * 1152object *
1171insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1153insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1172{ 1154{
1173 object *tmp, *top, *floor = NULL; 1155 object *tmp, *top, *floor = NULL;
1174 sint16 x, y;
1175 1156
1176 if (QUERY_FLAG (op, FLAG_FREED)) 1157 if (QUERY_FLAG (op, FLAG_FREED))
1177 { 1158 {
1178 LOG (llevError, "Trying to insert freed object!\n"); 1159 LOG (llevError, "Trying to insert freed object!\n");
1179 return NULL; 1160 return NULL;
1180 } 1161 }
1162
1163 if (!QUERY_FLAG (op, FLAG_REMOVED))
1164 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1165
1166 op->remove ();
1181 1167
1182 if (!m) 1168 if (!m)
1183 { 1169 {
1184 char *dump = dump_object (op); 1170 char *dump = dump_object (op);
1185 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1171 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1200#endif 1186#endif
1201 free (dump); 1187 free (dump);
1202 return op; 1188 return op;
1203 } 1189 }
1204 1190
1205 if (!QUERY_FLAG (op, FLAG_REMOVED))
1206 {
1207 char *dump = dump_object (op);
1208 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1209 free (dump);
1210 return op;
1211 }
1212
1213 if (op->more)
1214 {
1215 /* The part may be on a different map. */
1216
1217 object *more = op->more; 1191 if (object *more = op->more)
1218 1192 {
1219 /* We really need the caller to normalise coordinates - if
1220 * we set the map, that doesn't work if the location is within
1221 * a map and this is straddling an edge. So only if coordinate
1222 * is clear wrong do we normalise it.
1223 */
1224 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1225 more->map = get_map_from_coord (m, &more->x, &more->y);
1226 else if (!more->map)
1227 {
1228 /* For backwards compatibility - when not dealing with tiled maps,
1229 * more->map should always point to the parent.
1230 */
1231 more->map = m;
1232 }
1233
1234 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1193 if (!insert_ob_in_map (more, m, originator, flag))
1235 { 1194 {
1236 if (!op->head) 1195 if (!op->head)
1237 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1196 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1238 1197
1239 return 0; 1198 return 0;
1244 1203
1245 /* Ideally, the caller figures this out. However, it complicates a lot 1204 /* Ideally, the caller figures this out. However, it complicates a lot
1246 * of areas of callers (eg, anything that uses find_free_spot would now 1205 * of areas of callers (eg, anything that uses find_free_spot would now
1247 * need extra work 1206 * need extra work
1248 */ 1207 */
1249 op->map = get_map_from_coord (m, &op->x, &op->y); 1208 if (!xy_normalise (m, op->x, op->y))
1250 x = op->x; 1209 return 0;
1251 y = op->y; 1210
1211 op->map = m;
1212 mapspace &ms = op->ms ();
1252 1213
1253 /* this has to be done after we translate the coordinates. 1214 /* this has to be done after we translate the coordinates.
1254 */ 1215 */
1255 if (op->nrof && !(flag & INS_NO_MERGE)) 1216 if (op->nrof && !(flag & INS_NO_MERGE))
1256 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1217 for (tmp = ms.bot; tmp; tmp = tmp->above)
1257 if (object::can_merge (op, tmp)) 1218 if (object::can_merge (op, tmp))
1258 { 1219 {
1259 op->nrof += tmp->nrof; 1220 op->nrof += tmp->nrof;
1260 tmp->destroy (); 1221 tmp->destroy ();
1261 } 1222 }
1278 op->below = originator->below; 1239 op->below = originator->below;
1279 1240
1280 if (op->below) 1241 if (op->below)
1281 op->below->above = op; 1242 op->below->above = op;
1282 else 1243 else
1283 op->ms ().bot = op; 1244 ms.bot = op;
1284 1245
1285 /* since *below* originator, no need to update top */ 1246 /* since *below* originator, no need to update top */
1286 originator->below = op; 1247 originator->below = op;
1287 } 1248 }
1288 else 1249 else
1289 { 1250 {
1251 top = ms.bot;
1252
1290 /* If there are other objects, then */ 1253 /* If there are other objects, then */
1291 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1254 if ((!(flag & INS_MAP_LOAD)) && top)
1292 { 1255 {
1293 object *last = 0; 1256 object *last = 0;
1294 1257
1295 /* 1258 /*
1296 * If there are multiple objects on this space, we do some trickier handling. 1259 * If there are multiple objects on this space, we do some trickier handling.
1302 * once we get to them. This reduces the need to traverse over all of 1265 * once we get to them. This reduces the need to traverse over all of
1303 * them when adding another one - this saves quite a bit of cpu time 1266 * them when adding another one - this saves quite a bit of cpu time
1304 * when lots of spells are cast in one area. Currently, it is presumed 1267 * when lots of spells are cast in one area. Currently, it is presumed
1305 * that flying non pickable objects are spell objects. 1268 * that flying non pickable objects are spell objects.
1306 */ 1269 */
1307 while (top) 1270 for (top = ms.bot; top; top = top->above)
1308 { 1271 {
1309 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1272 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1310 floor = top; 1273 floor = top;
1311 1274
1312 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1275 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1315 top = top->below; 1278 top = top->below;
1316 break; 1279 break;
1317 } 1280 }
1318 1281
1319 last = top; 1282 last = top;
1320 top = top->above;
1321 } 1283 }
1322 1284
1323 /* Don't want top to be NULL, so set it to the last valid object */ 1285 /* Don't want top to be NULL, so set it to the last valid object */
1324 top = last; 1286 top = last;
1325 1287
1327 * looks like instead of lots of conditions here. 1289 * looks like instead of lots of conditions here.
1328 * makes things faster, and effectively the same result. 1290 * makes things faster, and effectively the same result.
1329 */ 1291 */
1330 1292
1331 /* Have object 'fall below' other objects that block view. 1293 /* Have object 'fall below' other objects that block view.
1332 * Unless those objects are exits, type 66 1294 * Unless those objects are exits.
1333 * If INS_ON_TOP is used, don't do this processing 1295 * If INS_ON_TOP is used, don't do this processing
1334 * Need to find the object that in fact blocks view, otherwise 1296 * Need to find the object that in fact blocks view, otherwise
1335 * stacking is a bit odd. 1297 * stacking is a bit odd.
1336 */ 1298 */
1337 if (!(flag & INS_ON_TOP) && 1299 if (!(flag & INS_ON_TOP)
1338 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1300 && ms.flags () & P_BLOCKSVIEW
1301 && (op->face && !faces [op->face].visibility))
1339 { 1302 {
1340 for (last = top; last != floor; last = last->below) 1303 for (last = top; last != floor; last = last->below)
1341 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1304 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1342 break; 1305 break;
1306
1343 /* Check to see if we found the object that blocks view, 1307 /* Check to see if we found the object that blocks view,
1344 * and make sure we have a below pointer for it so that 1308 * and make sure we have a below pointer for it so that
1345 * we can get inserted below this one, which requires we 1309 * we can get inserted below this one, which requires we
1346 * set top to the object below us. 1310 * set top to the object below us.
1347 */ 1311 */
1349 top = last->below; 1313 top = last->below;
1350 } 1314 }
1351 } /* If objects on this space */ 1315 } /* If objects on this space */
1352 1316
1353 if (flag & INS_MAP_LOAD) 1317 if (flag & INS_MAP_LOAD)
1354 top = GET_MAP_TOP (op->map, op->x, op->y); 1318 top = ms.top;
1355 1319
1356 if (flag & INS_ABOVE_FLOOR_ONLY) 1320 if (flag & INS_ABOVE_FLOOR_ONLY)
1357 top = floor; 1321 top = floor;
1358 1322
1359 /* Top is the object that our object (op) is going to get inserted above. 1323 /* Top is the object that our object (op) is going to get inserted above.
1360 */ 1324 */
1361 1325
1362 /* First object on this space */ 1326 /* First object on this space */
1363 if (!top) 1327 if (!top)
1364 { 1328 {
1365 op->above = GET_MAP_OB (op->map, op->x, op->y); 1329 op->above = ms.bot;
1366 1330
1367 if (op->above) 1331 if (op->above)
1368 op->above->below = op; 1332 op->above->below = op;
1369 1333
1370 op->below = 0; 1334 op->below = 0;
1371 op->ms ().bot = op; 1335 ms.bot = op;
1372 } 1336 }
1373 else 1337 else
1374 { /* get inserted into the stack above top */ 1338 { /* get inserted into the stack above top */
1375 op->above = top->above; 1339 op->above = top->above;
1376 1340
1380 op->below = top; 1344 op->below = top;
1381 top->above = op; 1345 top->above = op;
1382 } 1346 }
1383 1347
1384 if (!op->above) 1348 if (!op->above)
1385 op->ms ().top = op; 1349 ms.top = op;
1386 } /* else not INS_BELOW_ORIGINATOR */ 1350 } /* else not INS_BELOW_ORIGINATOR */
1387 1351
1388 if (op->type == PLAYER) 1352 if (op->type == PLAYER)
1389 { 1353 {
1390 op->contr->do_los = 1; 1354 op->contr->do_los = 1;
1396 1360
1397 /* If we have a floor, we know the player, if any, will be above 1361 /* If we have a floor, we know the player, if any, will be above
1398 * it, so save a few ticks and start from there. 1362 * it, so save a few ticks and start from there.
1399 */ 1363 */
1400 if (!(flag & INS_MAP_LOAD)) 1364 if (!(flag & INS_MAP_LOAD))
1401 if (object *pl = op->ms ().player ()) 1365 if (object *pl = ms.player ())
1402 if (pl->contr->ns) 1366 if (pl->contr->ns)
1403 pl->contr->ns->floorbox_update (); 1367 pl->contr->ns->floorbox_update ();
1404 1368
1405 /* If this object glows, it may affect lighting conditions that are 1369 /* If this object glows, it may affect lighting conditions that are
1406 * visible to others on this map. But update_all_los is really 1370 * visible to others on this map. But update_all_los is really
1465 tmp1->x = op->x; 1429 tmp1->x = op->x;
1466 tmp1->y = op->y; 1430 tmp1->y = op->y;
1467 insert_ob_in_map (tmp1, op->map, op, 0); 1431 insert_ob_in_map (tmp1, op->map, op, 0);
1468} 1432}
1469 1433
1434// XXX: function not returning object*
1470object * 1435object *
1471object::insert_at (object *where, object *originator, int flags) 1436object::insert_at (object *where, object *originator, int flags)
1472{ 1437{
1473 where->map->insert (this, where->x, where->y, originator, flags); 1438 where->map->insert (this, where->x, where->y, originator, flags);
1474} 1439}
1815 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1780 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1816 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1781 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1817 { 1782 {
1818 1783
1819 float 1784 float
1820 diff = tmp->move_slow_penalty * FABS (op->speed); 1785 diff = tmp->move_slow_penalty * fabs (op->speed);
1821 1786
1822 if (op->type == PLAYER) 1787 if (op->type == PLAYER)
1823 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1788 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1824 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1789 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1825 diff /= 4.0; 1790 diff /= 4.0;
2032 } 1997 }
2033 1998
2034 if (!index) 1999 if (!index)
2035 return -1; 2000 return -1;
2036 2001
2037 return altern[RANDOM () % index]; 2002 return altern [rndm (index)];
2038} 2003}
2039 2004
2040/* 2005/*
2041 * find_first_free_spot(archetype, maptile, x, y) works like 2006 * find_first_free_spot(archetype, maptile, x, y) works like
2042 * find_free_spot(), but it will search max number of squares. 2007 * find_free_spot(), but it will search max number of squares.
2063{ 2028{
2064 arr += begin; 2029 arr += begin;
2065 end -= begin; 2030 end -= begin;
2066 2031
2067 while (--end) 2032 while (--end)
2068 swap (arr [end], arr [RANDOM () % (end + 1)]); 2033 swap (arr [end], arr [rndm (end + 1)]);
2069} 2034}
2070 2035
2071/* new function to make monster searching more efficient, and effective! 2036/* new function to make monster searching more efficient, and effective!
2072 * This basically returns a randomized array (in the passed pointer) of 2037 * This basically returns a randomized array (in the passed pointer) of
2073 * the spaces to find monsters. In this way, it won't always look for 2038 * the spaces to find monsters. In this way, it won't always look for
2207 2172
2208 return 3; 2173 return 3;
2209} 2174}
2210 2175
2211/* 2176/*
2212 * absdir(int): Returns a number between 1 and 8, which represent
2213 * the "absolute" direction of a number (it actually takes care of
2214 * "overflow" in previous calculations of a direction).
2215 */
2216
2217int
2218absdir (int d)
2219{
2220 while (d < 1)
2221 d += 8;
2222
2223 while (d > 8)
2224 d -= 8;
2225
2226 return d;
2227}
2228
2229/*
2230 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2177 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2231 * between two directions (which are expected to be absolute (see absdir()) 2178 * between two directions (which are expected to be absolute (see absdir())
2232 */ 2179 */
2233
2234int 2180int
2235dirdiff (int dir1, int dir2) 2181dirdiff (int dir1, int dir2)
2236{ 2182{
2237 int d; 2183 int d;
2238 2184
2404 insert_ob_in_ob (object_create_clone (item), dst); 2350 insert_ob_in_ob (object_create_clone (item), dst);
2405 2351
2406 return dst; 2352 return dst;
2407} 2353}
2408 2354
2409/* GROS - Creates an object using a string representing its content. */
2410/* Basically, we save the content of the string to a temp file, then call */
2411/* load_object on it. I admit it is a highly inefficient way to make things, */
2412/* but it was simple to make and allows reusing the load_object function. */
2413/* Remember not to use load_object_str in a time-critical situation. */
2414/* Also remember that multiparts objects are not supported for now. */
2415object *
2416load_object_str (const char *obstr)
2417{
2418 object *op;
2419 char filename[MAX_BUF];
2420
2421 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2422
2423 FILE *tempfile = fopen (filename, "w");
2424
2425 if (tempfile == NULL)
2426 {
2427 LOG (llevError, "Error - Unable to access load object temp file\n");
2428 return NULL;
2429 }
2430
2431 fprintf (tempfile, obstr);
2432 fclose (tempfile);
2433
2434 op = object::create ();
2435
2436 object_thawer thawer (filename);
2437
2438 if (thawer)
2439 load_object (thawer, op, 0);
2440
2441 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2442 CLEAR_FLAG (op, FLAG_REMOVED);
2443
2444 return op;
2445}
2446
2447/* This returns the first object in who's inventory that 2355/* This returns the first object in who's inventory that
2448 * has the same type and subtype match. 2356 * has the same type and subtype match.
2449 * returns NULL if no match. 2357 * returns NULL if no match.
2450 */ 2358 */
2451object * 2359object *
2504 if (link->key == canonical_key) 2412 if (link->key == canonical_key)
2505 return link->value; 2413 return link->value;
2506 2414
2507 return 0; 2415 return 0;
2508} 2416}
2509
2510 2417
2511/* 2418/*
2512 * Updates the canonical_key in op to value. 2419 * Updates the canonical_key in op to value.
2513 * 2420 *
2514 * canonical_key is a shared string (value doesn't have to be). 2421 * canonical_key is a shared string (value doesn't have to be).
2654{ 2561{
2655 char flagdesc[512]; 2562 char flagdesc[512];
2656 char info2[256 * 4]; 2563 char info2[256 * 4];
2657 char *p = info; 2564 char *p = info;
2658 2565
2659 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2566 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2660 count, uuid.seq, 2567 count, uuid.seq,
2661 &name, 2568 &name,
2662 title ? "\",title:" : "", 2569 title ? "\",title:\"" : "",
2663 title ? (const char *)title : "", 2570 title ? (const char *)title : "",
2664 flag_desc (flagdesc, 512), type); 2571 flag_desc (flagdesc, 512), type);
2665 2572
2666 if (env) 2573 if (env)
2667 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2574 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2677{ 2584{
2678 static char info[256 * 4]; 2585 static char info[256 * 4];
2679 return debug_desc (info); 2586 return debug_desc (info);
2680} 2587}
2681 2588
2589const char *
2590object::debug_desc2 () const
2591{
2592 static char info[256 * 4];
2593 return debug_desc (info);
2594}
2595
2596struct region *
2597object::region () const
2598{
2599 return map ? map->region (x, y)
2600 : region::default_region ();
2601}
2602
2603const materialtype_t *
2604object::dominant_material () const
2605{
2606 if (materialtype_t *mat = name_to_material (materialname))
2607 return mat;
2608
2609 // omfg this is slow, this has to be temporary :)
2610 shstr unknown ("unknown");
2611
2612 return name_to_material (unknown);
2613}
2614
2615void
2616object::open_container (object *new_container)
2617{
2618 if (container == new_container)
2619 return;
2620
2621 if (object *old_container = container)
2622 {
2623 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2624 return;
2625
2626#if 0
2627 // remove the "Close old_container" object.
2628 if (object *closer = old_container->inv)
2629 if (closer->type == CLOSE_CON)
2630 closer->destroy ();
2631#endif
2632
2633 old_container->flag [FLAG_APPLIED] = 0;
2634 container = 0;
2635
2636 esrv_update_item (UPD_FLAGS, this, old_container);
2637 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2638 }
2639
2640 if (new_container)
2641 {
2642 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2643 return;
2644
2645 // TODO: this does not seem to serve any purpose anymore?
2646#if 0
2647 // insert the "Close Container" object.
2648 if (archetype *closer = new_container->other_arch)
2649 {
2650 object *closer = arch_to_object (new_container->other_arch);
2651 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2652 new_container->insert (closer);
2653 }
2654#endif
2655
2656 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2657
2658 new_container->flag [FLAG_APPLIED] = 1;
2659 container = new_container;
2660
2661 esrv_update_item (UPD_FLAGS, this, new_container);
2662 esrv_send_inventory (this, new_container);
2663 }
2664}
2665
2666

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines