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.109 by root, Sun Jan 7 21:54:59 2007 UTC vs.
Revision 1.137 by root, Mon Apr 16 06:23:40 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) 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>
… …
357/* 357/*
358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump. 358 * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359 * Some error messages. 359 * Some error messages.
360 * 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.
361 */ 361 */
362
363char * 362char *
364dump_object (object *op) 363dump_object (object *op)
365{ 364{
366 if (!op) 365 if (!op)
367 return strdup ("[NULLOBJ]"); 366 return strdup ("[NULLOBJ]");
368 367
369 object_freezer freezer; 368 object_freezer freezer;
370 save_object (freezer, op, 1); 369 op->write (freezer);
371 return freezer.as_string (); 370 return freezer.as_string ();
372} 371}
373 372
374/* 373/*
375 * 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
… …
395 * 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.
396 */ 395 */
397object * 396object *
398find_object (tag_t i) 397find_object (tag_t i)
399{ 398{
400 return ((unsigned int)i) < objects.size () 399 for_all_objects (op)
401 ? objects [i] 400 if (op->count == i)
402 : 0; 401 return op;
402
403 return 0;
403} 404}
404 405
405/* 406/*
406 * 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.
407 * Used only by the patch command, but not all that useful. 408 * Used only by the patch command, but not all that useful.
… …
453 * refcounts and freeing the links. 454 * refcounts and freeing the links.
454 */ 455 */
455static void 456static void
456free_key_values (object *op) 457free_key_values (object *op)
457{ 458{
458 for (key_value *i = op->key_values; i != 0;) 459 for (key_value *i = op->key_values; i; )
459 { 460 {
460 key_value *next = i->next; 461 key_value *next = i->next;
461 delete i; 462 delete i;
462 463
463 i = next; 464 i = next;
464 } 465 }
465 466
466 op->key_values = 0; 467 op->key_values = 0;
467} 468}
468 469
469/* 470object &
470 * copy_to first frees everything allocated by the dst object, 471object::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{ 472{
480 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 473 bool is_freed = flag [FLAG_FREED];
481 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 474 bool is_removed = flag [FLAG_REMOVED];
482 475
483 *(object_copy *)dst = *this; 476 *(object_copy *)this = src;
484 477
485 if (is_freed) 478 flag [FLAG_FREED] = is_freed;
486 SET_FLAG (dst, FLAG_FREED); 479 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 480
494 /* Copy over key_values, if any. */ 481 /* Copy over key_values, if any. */
495 if (key_values) 482 if (src.key_values)
496 { 483 {
497 key_value *tail = 0; 484 key_value *tail = 0;
498 key_value *i;
499
500 dst->key_values = 0; 485 key_values = 0;
501 486
502 for (i = key_values; i; i = i->next) 487 for (key_value *i = src.key_values; i; i = i->next)
503 { 488 {
504 key_value *new_link = new key_value; 489 key_value *new_link = new key_value;
505 490
506 new_link->next = 0; 491 new_link->next = 0;
507 new_link->key = i->key; 492 new_link->key = i->key;
508 new_link->value = i->value; 493 new_link->value = i->value;
509 494
510 /* Try and be clever here, too. */ 495 /* Try and be clever here, too. */
511 if (!dst->key_values) 496 if (!key_values)
512 { 497 {
513 dst->key_values = new_link; 498 key_values = new_link;
514 tail = new_link; 499 tail = new_link;
515 } 500 }
516 else 501 else
517 { 502 {
518 tail->next = new_link; 503 tail->next = new_link;
519 tail = new_link; 504 tail = new_link;
520 } 505 }
521 } 506 }
522 } 507 }
508}
509
510/*
511 * copy_to first frees everything allocated by the dst object,
512 * and then copies the contents of itself into the second
513 * object, allocating what needs to be allocated. Basically, any
514 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
515 * if the first object is freed, the pointers in the new object
516 * will point at garbage.
517 */
518void
519object::copy_to (object *dst)
520{
521 *dst = *this;
522
523 if (speed < 0)
524 dst->speed_left = speed_left - rndm ();
523 525
524 dst->set_speed (dst->speed); 526 dst->set_speed (dst->speed);
527}
528
529void
530object::instantiate ()
531{
532 if (!uuid.seq) // HACK
533 uuid = gen_uuid ();
534
535 speed_left = -0.1f;
536 /* copy the body_info to the body_used - this is only really
537 * need for monsters, but doesn't hurt to do it for everything.
538 * by doing so, when a monster is created, it has good starting
539 * values for the body_used info, so when items are created
540 * for it, they can be properly equipped.
541 */
542 memcpy (body_used, body_info, sizeof (body_used));
543
544 attachable::instantiate ();
525} 545}
526 546
527object * 547object *
528object::clone () 548object::clone ()
529{ 549{
… …
587 * UP_OBJ_FACE: only the objects face has changed. 607 * UP_OBJ_FACE: only the objects face has changed.
588 */ 608 */
589void 609void
590update_object (object *op, int action) 610update_object (object *op, int action)
591{ 611{
592 MoveType move_on, move_off, move_block, move_slow;
593
594 if (op == NULL) 612 if (op == NULL)
595 { 613 {
596 /* this should never happen */ 614 /* this should never happen */
597 LOG (llevDebug, "update_object() called for NULL object.\n"); 615 LOG (llevDebug, "update_object() called for NULL object.\n");
598 return; 616 return;
… …
658 676
659 if (op->more) 677 if (op->more)
660 update_object (op->more, action); 678 update_object (op->more, action);
661} 679}
662 680
663object *object::first;
664
665object::object () 681object::object ()
666{ 682{
667 SET_FLAG (this, FLAG_REMOVED); 683 SET_FLAG (this, FLAG_REMOVED);
668 684
669 expmul = 1.0; 685 expmul = 1.0;
670 face = blank_face; 686 face = blank_face;
671} 687}
672 688
673object::~object () 689object::~object ()
674{ 690{
691 unlink ();
692
675 free_key_values (this); 693 free_key_values (this);
676} 694}
677 695
696static int object_count;
697
678void object::link () 698void object::link ()
679{ 699{
700 assert (!index);//D
680 uuid = gen_uuid (); 701 uuid = gen_uuid ();
702 count = ++object_count;
681 703
682 refcnt_inc (); 704 refcnt_inc ();
683 objects.insert (this); 705 objects.insert (this);
684} 706}
685 707
686void object::unlink () 708void object::unlink ()
687{ 709{
710 if (!index)
711 return;
712
688 objects.erase (this); 713 objects.erase (this);
689 refcnt_dec (); 714 refcnt_dec ();
690} 715}
691 716
692void 717void
… …
766 * drop on that space. 791 * drop on that space.
767 */ 792 */
768 if (!drop_to_ground 793 if (!drop_to_ground
769 || !map 794 || !map
770 || map->in_memory != MAP_IN_MEMORY 795 || map->in_memory != MAP_IN_MEMORY
796 || map->nodrop
771 || ms ().move_block == MOVE_ALL) 797 || ms ().move_block == MOVE_ALL)
772 { 798 {
773 while (inv) 799 while (inv)
774 { 800 {
775 inv->destroy_inv (drop_to_ground); 801 inv->destroy_inv (drop_to_ground);
… …
784 810
785 if (op->flag [FLAG_STARTEQUIP] 811 if (op->flag [FLAG_STARTEQUIP]
786 || op->flag [FLAG_NO_DROP] 812 || op->flag [FLAG_NO_DROP]
787 || op->type == RUNE 813 || op->type == RUNE
788 || op->type == TRAP 814 || op->type == TRAP
789 || op->flag [FLAG_IS_A_TEMPLATE]) 815 || op->flag [FLAG_IS_A_TEMPLATE]
816 || op->flag [FLAG_DESTROY_ON_DEATH])
790 op->destroy (); 817 op->destroy ();
791 else 818 else
792 map->insert (op, x, y); 819 map->insert (op, x, y);
793 } 820 }
794 } 821 }
… …
802} 829}
803 830
804void 831void
805object::do_destroy () 832object::do_destroy ()
806{ 833{
834 attachable::do_destroy ();
835
807 if (flag [FLAG_IS_LINKED]) 836 if (flag [FLAG_IS_LINKED])
808 remove_button_link (this); 837 remove_button_link (this);
809 838
810 if (flag [FLAG_FRIENDLY]) 839 if (flag [FLAG_FRIENDLY])
840 {
811 remove_friendly_object (this); 841 remove_friendly_object (this);
842
843 if (type == GOLEM
844 && owner
845 && owner->type == PLAYER
846 && owner->contr->ranges[range_golem] == this)
847 owner->contr->ranges[range_golem] = 0;
848 }
812 849
813 if (!flag [FLAG_REMOVED]) 850 if (!flag [FLAG_REMOVED])
814 remove (); 851 remove ();
815 852
816 if (flag [FLAG_FREED]) 853 destroy_inv (true);
817 return;
818 854
819 set_speed (0); 855 deactivate ();
856 unlink ();
820 857
821 flag [FLAG_FREED] = 1; 858 flag [FLAG_FREED] = 1;
822
823 attachable::do_destroy ();
824
825 destroy_inv (true);
826 unlink ();
827 859
828 // hack to ensure that freed objects still have a valid map 860 // hack to ensure that freed objects still have a valid map
829 { 861 {
830 static maptile *freed_map; // freed objects are moved here to avoid crashes 862 static maptile *freed_map; // freed objects are moved here to avoid crashes
831 863
… …
893 * This function removes the object op from the linked list of objects 925 * This function removes the object op from the linked list of objects
894 * which it is currently tied to. When this function is done, the 926 * which it is currently tied to. When this function is done, the
895 * object will have no environment. If the object previously had an 927 * object will have no environment. If the object previously had an
896 * environment, the x and y coordinates will be updated to 928 * environment, the x and y coordinates will be updated to
897 * the previous environment. 929 * the previous environment.
898 * Beware: This function is called from the editor as well!
899 */ 930 */
900void 931void
901object::remove () 932object::do_remove ()
902{ 933{
903 object *tmp, *last = 0; 934 object *tmp, *last = 0;
904 object *otmp; 935 object *otmp;
905 936
906 if (QUERY_FLAG (this, FLAG_REMOVED)) 937 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
949 } 980 }
950 else if (map) 981 else if (map)
951 { 982 {
952 if (type == PLAYER) 983 if (type == PLAYER)
953 { 984 {
985 // leaving a spot always closes any open container on the ground
986 if (container && !container->env)
987 // this causes spurious floorbox updates, but it ensures
988 // that the CLOSE event is being sent.
989 close_container ();
990
954 --map->players; 991 --map->players;
955 map->touch (); 992 map->touch ();
956 } 993 }
957 994
958 map->dirty = true; 995 map->dirty = true;
996 mapspace &ms = this->ms ();
959 997
960 /* link the object above us */ 998 /* link the object above us */
961 if (above) 999 if (above)
962 above->below = below; 1000 above->below = below;
963 else 1001 else
964 map->at (x, y).top = below; /* we were top, set new top */ 1002 ms.top = below; /* we were top, set new top */
965 1003
966 /* Relink the object below us, if there is one */ 1004 /* Relink the object below us, if there is one */
967 if (below) 1005 if (below)
968 below->above = above; 1006 below->above = above;
969 else 1007 else
… …
971 /* Nothing below, which means we need to relink map object for this space 1009 /* Nothing below, which means we need to relink map object for this space
972 * use translated coordinates in case some oddness with map tiling is 1010 * use translated coordinates in case some oddness with map tiling is
973 * evident 1011 * evident
974 */ 1012 */
975 if (GET_MAP_OB (map, x, y) != this) 1013 if (GET_MAP_OB (map, x, y) != this)
976 {
977 char *dump = dump_object (this);
978 LOG (llevError,
979 "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); 1014 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 ());
980 free (dump);
981 dump = dump_object (GET_MAP_OB (map, x, y));
982 LOG (llevError, "%s\n", dump);
983 free (dump);
984 }
985 1015
986 map->at (x, y).bot = above; /* goes on above it. */ 1016 ms.bot = above; /* goes on above it. */
987 } 1017 }
988 1018
989 above = 0; 1019 above = 0;
990 below = 0; 1020 below = 0;
991 1021
992 if (map->in_memory == MAP_SAVING) 1022 if (map->in_memory == MAP_SAVING)
993 return; 1023 return;
994 1024
995 int check_walk_off = !flag [FLAG_NO_APPLY]; 1025 int check_walk_off = !flag [FLAG_NO_APPLY];
996 1026
997 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1027 for (tmp = ms.bot; tmp; tmp = tmp->above)
998 { 1028 {
999 /* No point updating the players look faces if he is the object 1029 /* No point updating the players look faces if he is the object
1000 * being removed. 1030 * being removed.
1001 */ 1031 */
1002 1032
… …
1083 1113
1084 return 0; 1114 return 0;
1085} 1115}
1086 1116
1087/* 1117/*
1088 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1118 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1089 * job preparing multi-part monsters 1119 * job preparing multi-part monsters.
1090 */ 1120 */
1091object * 1121object *
1092insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1122insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1093{ 1123{
1094 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1124 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1122 */ 1152 */
1123object * 1153object *
1124insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1154insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1125{ 1155{
1126 object *tmp, *top, *floor = NULL; 1156 object *tmp, *top, *floor = NULL;
1127 sint16 x, y;
1128 1157
1129 if (QUERY_FLAG (op, FLAG_FREED)) 1158 if (QUERY_FLAG (op, FLAG_FREED))
1130 { 1159 {
1131 LOG (llevError, "Trying to insert freed object!\n"); 1160 LOG (llevError, "Trying to insert freed object!\n");
1132 return NULL; 1161 return NULL;
1133 } 1162 }
1163
1164 if (!QUERY_FLAG (op, FLAG_REMOVED))
1165 LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1166
1167 op->remove ();
1134 1168
1135 if (!m) 1169 if (!m)
1136 { 1170 {
1137 char *dump = dump_object (op); 1171 char *dump = dump_object (op);
1138 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1172 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
… …
1153#endif 1187#endif
1154 free (dump); 1188 free (dump);
1155 return op; 1189 return op;
1156 } 1190 }
1157 1191
1158 if (!QUERY_FLAG (op, FLAG_REMOVED))
1159 {
1160 char *dump = dump_object (op);
1161 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1162 free (dump);
1163 return op;
1164 }
1165
1166 if (op->more)
1167 {
1168 /* The part may be on a different map. */
1169
1170 object *more = op->more; 1192 if (object *more = op->more)
1171 1193 {
1172 /* We really need the caller to normalise coordinates - if
1173 * we set the map, that doesn't work if the location is within
1174 * a map and this is straddling an edge. So only if coordinate
1175 * is clear wrong do we normalise it.
1176 */
1177 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1178 more->map = get_map_from_coord (m, &more->x, &more->y);
1179 else if (!more->map)
1180 {
1181 /* For backwards compatibility - when not dealing with tiled maps,
1182 * more->map should always point to the parent.
1183 */
1184 more->map = m;
1185 }
1186
1187 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1194 if (!insert_ob_in_map (more, m, originator, flag))
1188 { 1195 {
1189 if (!op->head) 1196 if (!op->head)
1190 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1197 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1191 1198
1192 return 0; 1199 return 0;
… …
1197 1204
1198 /* Ideally, the caller figures this out. However, it complicates a lot 1205 /* Ideally, the caller figures this out. However, it complicates a lot
1199 * of areas of callers (eg, anything that uses find_free_spot would now 1206 * of areas of callers (eg, anything that uses find_free_spot would now
1200 * need extra work 1207 * need extra work
1201 */ 1208 */
1202 op->map = get_map_from_coord (m, &op->x, &op->y); 1209 if (!xy_normalise (m, op->x, op->y))
1203 x = op->x; 1210 return 0;
1204 y = op->y; 1211
1212 op->map = m;
1213 mapspace &ms = op->ms ();
1205 1214
1206 /* this has to be done after we translate the coordinates. 1215 /* this has to be done after we translate the coordinates.
1207 */ 1216 */
1208 if (op->nrof && !(flag & INS_NO_MERGE)) 1217 if (op->nrof && !(flag & INS_NO_MERGE))
1209 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1218 for (tmp = ms.bot; tmp; tmp = tmp->above)
1210 if (object::can_merge (op, tmp)) 1219 if (object::can_merge (op, tmp))
1211 { 1220 {
1212 op->nrof += tmp->nrof; 1221 op->nrof += tmp->nrof;
1213 tmp->destroy (); 1222 tmp->destroy ();
1214 } 1223 }
… …
1231 op->below = originator->below; 1240 op->below = originator->below;
1232 1241
1233 if (op->below) 1242 if (op->below)
1234 op->below->above = op; 1243 op->below->above = op;
1235 else 1244 else
1236 op->ms ().bot = op; 1245 ms.bot = op;
1237 1246
1238 /* since *below* originator, no need to update top */ 1247 /* since *below* originator, no need to update top */
1239 originator->below = op; 1248 originator->below = op;
1240 } 1249 }
1241 else 1250 else
1242 { 1251 {
1252 top = ms.bot;
1253
1243 /* If there are other objects, then */ 1254 /* If there are other objects, then */
1244 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1255 if ((!(flag & INS_MAP_LOAD)) && top)
1245 { 1256 {
1246 object *last = 0; 1257 object *last = 0;
1247 1258
1248 /* 1259 /*
1249 * If there are multiple objects on this space, we do some trickier handling. 1260 * If there are multiple objects on this space, we do some trickier handling.
… …
1255 * once we get to them. This reduces the need to traverse over all of 1266 * once we get to them. This reduces the need to traverse over all of
1256 * them when adding another one - this saves quite a bit of cpu time 1267 * them when adding another one - this saves quite a bit of cpu time
1257 * when lots of spells are cast in one area. Currently, it is presumed 1268 * when lots of spells are cast in one area. Currently, it is presumed
1258 * that flying non pickable objects are spell objects. 1269 * that flying non pickable objects are spell objects.
1259 */ 1270 */
1260 while (top) 1271 for (top = ms.bot; top; top = top->above)
1261 { 1272 {
1262 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1273 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1263 floor = top; 1274 floor = top;
1264 1275
1265 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1276 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1268 top = top->below; 1279 top = top->below;
1269 break; 1280 break;
1270 } 1281 }
1271 1282
1272 last = top; 1283 last = top;
1273 top = top->above;
1274 } 1284 }
1275 1285
1276 /* Don't want top to be NULL, so set it to the last valid object */ 1286 /* Don't want top to be NULL, so set it to the last valid object */
1277 top = last; 1287 top = last;
1278 1288
… …
1280 * looks like instead of lots of conditions here. 1290 * looks like instead of lots of conditions here.
1281 * makes things faster, and effectively the same result. 1291 * makes things faster, and effectively the same result.
1282 */ 1292 */
1283 1293
1284 /* Have object 'fall below' other objects that block view. 1294 /* Have object 'fall below' other objects that block view.
1285 * Unless those objects are exits, type 66 1295 * Unless those objects are exits.
1286 * If INS_ON_TOP is used, don't do this processing 1296 * If INS_ON_TOP is used, don't do this processing
1287 * Need to find the object that in fact blocks view, otherwise 1297 * Need to find the object that in fact blocks view, otherwise
1288 * stacking is a bit odd. 1298 * stacking is a bit odd.
1289 */ 1299 */
1290 if (!(flag & INS_ON_TOP) && 1300 if (!(flag & INS_ON_TOP)
1291 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1301 && ms.flags () & P_BLOCKSVIEW
1302 && (op->face && !faces [op->face].visibility))
1292 { 1303 {
1293 for (last = top; last != floor; last = last->below) 1304 for (last = top; last != floor; last = last->below)
1294 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1305 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1295 break; 1306 break;
1307
1296 /* Check to see if we found the object that blocks view, 1308 /* Check to see if we found the object that blocks view,
1297 * and make sure we have a below pointer for it so that 1309 * and make sure we have a below pointer for it so that
1298 * we can get inserted below this one, which requires we 1310 * we can get inserted below this one, which requires we
1299 * set top to the object below us. 1311 * set top to the object below us.
1300 */ 1312 */
… …
1302 top = last->below; 1314 top = last->below;
1303 } 1315 }
1304 } /* If objects on this space */ 1316 } /* If objects on this space */
1305 1317
1306 if (flag & INS_MAP_LOAD) 1318 if (flag & INS_MAP_LOAD)
1307 top = GET_MAP_TOP (op->map, op->x, op->y); 1319 top = ms.top;
1308 1320
1309 if (flag & INS_ABOVE_FLOOR_ONLY) 1321 if (flag & INS_ABOVE_FLOOR_ONLY)
1310 top = floor; 1322 top = floor;
1311 1323
1312 /* Top is the object that our object (op) is going to get inserted above. 1324 /* Top is the object that our object (op) is going to get inserted above.
1313 */ 1325 */
1314 1326
1315 /* First object on this space */ 1327 /* First object on this space */
1316 if (!top) 1328 if (!top)
1317 { 1329 {
1318 op->above = GET_MAP_OB (op->map, op->x, op->y); 1330 op->above = ms.bot;
1319 1331
1320 if (op->above) 1332 if (op->above)
1321 op->above->below = op; 1333 op->above->below = op;
1322 1334
1323 op->below = 0; 1335 op->below = 0;
1324 op->ms ().bot = op; 1336 ms.bot = op;
1325 } 1337 }
1326 else 1338 else
1327 { /* get inserted into the stack above top */ 1339 { /* get inserted into the stack above top */
1328 op->above = top->above; 1340 op->above = top->above;
1329 1341
… …
1333 op->below = top; 1345 op->below = top;
1334 top->above = op; 1346 top->above = op;
1335 } 1347 }
1336 1348
1337 if (!op->above) 1349 if (!op->above)
1338 op->ms ().top = op; 1350 ms.top = op;
1339 } /* else not INS_BELOW_ORIGINATOR */ 1351 } /* else not INS_BELOW_ORIGINATOR */
1340 1352
1341 if (op->type == PLAYER) 1353 if (op->type == PLAYER)
1342 { 1354 {
1343 op->contr->do_los = 1; 1355 op->contr->do_los = 1;
… …
1349 1361
1350 /* If we have a floor, we know the player, if any, will be above 1362 /* If we have a floor, we know the player, if any, will be above
1351 * it, so save a few ticks and start from there. 1363 * it, so save a few ticks and start from there.
1352 */ 1364 */
1353 if (!(flag & INS_MAP_LOAD)) 1365 if (!(flag & INS_MAP_LOAD))
1354 if (object *pl = op->ms ().player ()) 1366 if (object *pl = ms.player ())
1355 if (pl->contr->ns) 1367 if (pl->contr->ns)
1356 pl->contr->ns->floorbox_update (); 1368 pl->contr->ns->floorbox_update ();
1357 1369
1358 /* If this object glows, it may affect lighting conditions that are 1370 /* If this object glows, it may affect lighting conditions that are
1359 * visible to others on this map. But update_all_los is really 1371 * visible to others on this map. But update_all_los is really
… …
1418 tmp1->x = op->x; 1430 tmp1->x = op->x;
1419 tmp1->y = op->y; 1431 tmp1->y = op->y;
1420 insert_ob_in_map (tmp1, op->map, op, 0); 1432 insert_ob_in_map (tmp1, op->map, op, 0);
1421} 1433}
1422 1434
1435// XXX: function not returning object*
1423object * 1436object *
1424object::insert_at (object *where, object *originator, int flags) 1437object::insert_at (object *where, object *originator, int flags)
1425{ 1438{
1426 where->map->insert (this, where->x, where->y, originator, flags); 1439 where->map->insert (this, where->x, where->y, originator, flags);
1427} 1440}
… …
1768 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1781 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1769 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1782 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1770 { 1783 {
1771 1784
1772 float 1785 float
1773 diff = tmp->move_slow_penalty * FABS (op->speed); 1786 diff = tmp->move_slow_penalty * fabs (op->speed);
1774 1787
1775 if (op->type == PLAYER) 1788 if (op->type == PLAYER)
1776 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1789 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1777 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1790 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1778 diff /= 4.0; 1791 diff /= 4.0;
… …
1985 } 1998 }
1986 1999
1987 if (!index) 2000 if (!index)
1988 return -1; 2001 return -1;
1989 2002
1990 return altern[RANDOM () % index]; 2003 return altern [rndm (index)];
1991} 2004}
1992 2005
1993/* 2006/*
1994 * find_first_free_spot(archetype, maptile, x, y) works like 2007 * find_first_free_spot(archetype, maptile, x, y) works like
1995 * find_free_spot(), but it will search max number of squares. 2008 * find_free_spot(), but it will search max number of squares.
… …
2016{ 2029{
2017 arr += begin; 2030 arr += begin;
2018 end -= begin; 2031 end -= begin;
2019 2032
2020 while (--end) 2033 while (--end)
2021 swap (arr [end], arr [RANDOM () % (end + 1)]); 2034 swap (arr [end], arr [rndm (end + 1)]);
2022} 2035}
2023 2036
2024/* new function to make monster searching more efficient, and effective! 2037/* new function to make monster searching more efficient, and effective!
2025 * This basically returns a randomized array (in the passed pointer) of 2038 * This basically returns a randomized array (in the passed pointer) of
2026 * the spaces to find monsters. In this way, it won't always look for 2039 * the spaces to find monsters. In this way, it won't always look for
… …
2160 2173
2161 return 3; 2174 return 3;
2162} 2175}
2163 2176
2164/* 2177/*
2165 * absdir(int): Returns a number between 1 and 8, which represent
2166 * the "absolute" direction of a number (it actually takes care of
2167 * "overflow" in previous calculations of a direction).
2168 */
2169
2170int
2171absdir (int d)
2172{
2173 while (d < 1)
2174 d += 8;
2175
2176 while (d > 8)
2177 d -= 8;
2178
2179 return d;
2180}
2181
2182/*
2183 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2178 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2184 * between two directions (which are expected to be absolute (see absdir()) 2179 * between two directions (which are expected to be absolute (see absdir())
2185 */ 2180 */
2186
2187int 2181int
2188dirdiff (int dir1, int dir2) 2182dirdiff (int dir1, int dir2)
2189{ 2183{
2190 int d; 2184 int d;
2191 2185
… …
2357 insert_ob_in_ob (object_create_clone (item), dst); 2351 insert_ob_in_ob (object_create_clone (item), dst);
2358 2352
2359 return dst; 2353 return dst;
2360} 2354}
2361 2355
2362/* GROS - Creates an object using a string representing its content. */
2363/* Basically, we save the content of the string to a temp file, then call */
2364/* load_object on it. I admit it is a highly inefficient way to make things, */
2365/* but it was simple to make and allows reusing the load_object function. */
2366/* Remember not to use load_object_str in a time-critical situation. */
2367/* Also remember that multiparts objects are not supported for now. */
2368object *
2369load_object_str (const char *obstr)
2370{
2371 object *op;
2372 char filename[MAX_BUF];
2373
2374 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2375
2376 FILE *tempfile = fopen (filename, "w");
2377
2378 if (tempfile == NULL)
2379 {
2380 LOG (llevError, "Error - Unable to access load object temp file\n");
2381 return NULL;
2382 }
2383
2384 fprintf (tempfile, obstr);
2385 fclose (tempfile);
2386
2387 op = object::create ();
2388
2389 object_thawer thawer (filename);
2390
2391 if (thawer)
2392 load_object (thawer, op, 0);
2393
2394 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2395 CLEAR_FLAG (op, FLAG_REMOVED);
2396
2397 return op;
2398}
2399
2400/* This returns the first object in who's inventory that 2356/* This returns the first object in who's inventory that
2401 * has the same type and subtype match. 2357 * has the same type and subtype match.
2402 * returns NULL if no match. 2358 * returns NULL if no match.
2403 */ 2359 */
2404object * 2360object *
… …
2457 if (link->key == canonical_key) 2413 if (link->key == canonical_key)
2458 return link->value; 2414 return link->value;
2459 2415
2460 return 0; 2416 return 0;
2461} 2417}
2462
2463 2418
2464/* 2419/*
2465 * Updates the canonical_key in op to value. 2420 * Updates the canonical_key in op to value.
2466 * 2421 *
2467 * canonical_key is a shared string (value doesn't have to be). 2422 * canonical_key is a shared string (value doesn't have to be).
… …
2607{ 2562{
2608 char flagdesc[512]; 2563 char flagdesc[512];
2609 char info2[256 * 4]; 2564 char info2[256 * 4];
2610 char *p = info; 2565 char *p = info;
2611 2566
2612 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2567 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2613 count, uuid.seq, 2568 count, uuid.seq,
2614 &name, 2569 &name,
2615 title ? "\",title:" : "", 2570 title ? "\",title:\"" : "",
2616 title ? (const char *)title : "", 2571 title ? (const char *)title : "",
2617 flag_desc (flagdesc, 512), type); 2572 flag_desc (flagdesc, 512), type);
2618 2573
2619 if (env) 2574 if (env)
2620 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2575 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2630{ 2585{
2631 static char info[256 * 4]; 2586 static char info[256 * 4];
2632 return debug_desc (info); 2587 return debug_desc (info);
2633} 2588}
2634 2589
2590const char *
2591object::debug_desc2 () const
2592{
2593 static char info[256 * 4];
2594 return debug_desc (info);
2595}
2596
2597struct region *
2598object::region () const
2599{
2600 return map ? map->region (x, y)
2601 : region::default_region ();
2602}
2603
2604const materialtype_t *
2605object::dominant_material () const
2606{
2607 if (materialtype_t *mat = name_to_material (materialname))
2608 return mat;
2609
2610 // omfg this is slow, this has to be temporary :)
2611 shstr unknown ("unknown");
2612
2613 return name_to_material (unknown);
2614}
2615
2616void
2617object::open_container (object *new_container)
2618{
2619 if (container == new_container)
2620 return;
2621
2622 if (object *old_container = container)
2623 {
2624 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2625 return;
2626
2627#if 0
2628 // remove the "Close old_container" object.
2629 if (object *closer = old_container->inv)
2630 if (closer->type == CLOSE_CON)
2631 closer->destroy ();
2632#endif
2633
2634 old_container->flag [FLAG_APPLIED] = 0;
2635 container = 0;
2636
2637 esrv_update_item (UPD_FLAGS, this, old_container);
2638 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2639 }
2640
2641 if (new_container)
2642 {
2643 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2644 return;
2645
2646 // TODO: this does not seem to serve any purpose anymore?
2647#if 0
2648 // insert the "Close Container" object.
2649 if (archetype *closer = new_container->other_arch)
2650 {
2651 object *closer = arch_to_object (new_container->other_arch);
2652 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2653 new_container->insert (closer);
2654 }
2655#endif
2656
2657 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2658
2659 new_container->flag [FLAG_APPLIED] = 1;
2660 container = new_container;
2661
2662 esrv_update_item (UPD_FLAGS, this, new_container);
2663 esrv_send_inventory (this, new_container);
2664 }
2665}
2666
2667

Diff Legend

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