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.112 by root, Mon Jan 8 14:11:04 2007 UTC vs.
Revision 1.148 by root, Mon May 14 19:08:25 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
… …
449 owner = owner->owner; 450 owner = owner->owner;
450 451
451 this->owner = owner; 452 this->owner = owner;
452} 453}
453 454
455int
456object::slottype () const
457{
458 if (type == SKILL)
459 {
460 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
461 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
462 }
463 else
464 {
465 if (slot [body_combat].info) return slot_combat;
466 if (slot [body_range ].info) return slot_ranged;
467 }
468
469 return slot_none;
470}
471
472bool
473object::change_weapon (object *ob)
474{
475 if (current_weapon == ob)
476 return true;
477
478 if (chosen_skill)
479 chosen_skill->flag [FLAG_APPLIED] = false;
480
481 current_weapon = ob;
482 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
483
484 if (chosen_skill)
485 chosen_skill->flag [FLAG_APPLIED] = true;
486
487 update_stats ();
488
489 if (ob)
490 {
491 // now check wether any body locations became invalid, in which case
492 // we cannot apply the weapon at the moment.
493 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
494 if (slot[i].used < 0)
495 {
496 current_weapon = chosen_skill = 0;
497 update_stats ();
498
499 new_draw_info_format (NDI_UNIQUE, 0, this,
500 "You try to balance your applied items all at once, but the %s is too much. "
501 "You need to unapply some items first.", &ob->name);
502 return false;
503 }
504
505 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
506 }
507 else
508 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
509
510 return true;
511}
512
454/* Zero the key_values on op, decrementing the shared-string 513/* Zero the key_values on op, decrementing the shared-string
455 * refcounts and freeing the links. 514 * refcounts and freeing the links.
456 */ 515 */
457static void 516static void
458free_key_values (object *op) 517free_key_values (object *op)
459{ 518{
460 for (key_value *i = op->key_values; i != 0;) 519 for (key_value *i = op->key_values; i; )
461 { 520 {
462 key_value *next = i->next; 521 key_value *next = i->next;
463 delete i; 522 delete i;
464 523
465 i = next; 524 i = next;
466 } 525 }
467 526
468 op->key_values = 0; 527 op->key_values = 0;
469} 528}
470 529
471/* 530object &
472 * copy_to first frees everything allocated by the dst object, 531object::operator =(const object &src)
473 * and then copies the contents of itself into the second
474 * object, allocating what needs to be allocated. Basically, any
475 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
476 * if the first object is freed, the pointers in the new object
477 * will point at garbage.
478 */
479void
480object::copy_to (object *dst)
481{ 532{
482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 533 bool is_freed = flag [FLAG_FREED];
483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 534 bool is_removed = flag [FLAG_REMOVED];
484 535
485 *(object_copy *)dst = *this; 536 *(object_copy *)this = src;
486 537
487 if (is_freed) 538 flag [FLAG_FREED] = is_freed;
488 SET_FLAG (dst, FLAG_FREED); 539 flag [FLAG_REMOVED] = is_removed;
489
490 if (is_removed)
491 SET_FLAG (dst, FLAG_REMOVED);
492
493 if (speed < 0)
494 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
495 540
496 /* Copy over key_values, if any. */ 541 /* Copy over key_values, if any. */
497 if (key_values) 542 if (src.key_values)
498 { 543 {
499 key_value *tail = 0; 544 key_value *tail = 0;
500 key_value *i;
501
502 dst->key_values = 0; 545 key_values = 0;
503 546
504 for (i = key_values; i; i = i->next) 547 for (key_value *i = src.key_values; i; i = i->next)
505 { 548 {
506 key_value *new_link = new key_value; 549 key_value *new_link = new key_value;
507 550
508 new_link->next = 0; 551 new_link->next = 0;
509 new_link->key = i->key; 552 new_link->key = i->key;
510 new_link->value = i->value; 553 new_link->value = i->value;
511 554
512 /* Try and be clever here, too. */ 555 /* Try and be clever here, too. */
513 if (!dst->key_values) 556 if (!key_values)
514 { 557 {
515 dst->key_values = new_link; 558 key_values = new_link;
516 tail = new_link; 559 tail = new_link;
517 } 560 }
518 else 561 else
519 { 562 {
520 tail->next = new_link; 563 tail->next = new_link;
521 tail = new_link; 564 tail = new_link;
522 } 565 }
523 } 566 }
524 } 567 }
568}
569
570/*
571 * copy_to first frees everything allocated by the dst object,
572 * and then copies the contents of itself into the second
573 * object, allocating what needs to be allocated. Basically, any
574 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
575 * if the first object is freed, the pointers in the new object
576 * will point at garbage.
577 */
578void
579object::copy_to (object *dst)
580{
581 *dst = *this;
582
583 if (speed < 0)
584 dst->speed_left = speed_left - rndm ();
525 585
526 dst->set_speed (dst->speed); 586 dst->set_speed (dst->speed);
587}
588
589void
590object::instantiate ()
591{
592 if (!uuid.seq) // HACK
593 uuid = gen_uuid ();
594
595 speed_left = -0.1f;
596 /* copy the body_info to the body_used - this is only really
597 * need for monsters, but doesn't hurt to do it for everything.
598 * by doing so, when a monster is created, it has good starting
599 * values for the body_used info, so when items are created
600 * for it, they can be properly equipped.
601 */
602 for (int i = NUM_BODY_LOCATIONS; i--; )
603 slot[i].used = slot[i].info;
604
605 attachable::instantiate ();
527} 606}
528 607
529object * 608object *
530object::clone () 609object::clone ()
531{ 610{
… …
589 * UP_OBJ_FACE: only the objects face has changed. 668 * UP_OBJ_FACE: only the objects face has changed.
590 */ 669 */
591void 670void
592update_object (object *op, int action) 671update_object (object *op, int action)
593{ 672{
594 MoveType move_on, move_off, move_block, move_slow;
595
596 if (op == NULL) 673 if (op == NULL)
597 { 674 {
598 /* this should never happen */ 675 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 676 LOG (llevDebug, "update_object() called for NULL object.\n");
600 return; 677 return;
… …
660 737
661 if (op->more) 738 if (op->more)
662 update_object (op->more, action); 739 update_object (op->more, action);
663} 740}
664 741
665object *object::first;
666
667object::object () 742object::object ()
668{ 743{
669 SET_FLAG (this, FLAG_REMOVED); 744 SET_FLAG (this, FLAG_REMOVED);
670 745
671 expmul = 1.0; 746 expmul = 1.0;
672 face = blank_face; 747 face = blank_face;
673} 748}
674 749
675object::~object () 750object::~object ()
676{ 751{
752 unlink ();
753
677 free_key_values (this); 754 free_key_values (this);
678} 755}
679 756
680static int object_count; 757static int object_count;
681 758
… …
689 objects.insert (this); 766 objects.insert (this);
690} 767}
691 768
692void object::unlink () 769void object::unlink ()
693{ 770{
694 assert (index);//D 771 if (!index)
772 return;
773
695 objects.erase (this); 774 objects.erase (this);
696 refcnt_dec (); 775 refcnt_dec ();
697} 776}
698 777
699void 778void
… …
773 * drop on that space. 852 * drop on that space.
774 */ 853 */
775 if (!drop_to_ground 854 if (!drop_to_ground
776 || !map 855 || !map
777 || map->in_memory != MAP_IN_MEMORY 856 || map->in_memory != MAP_IN_MEMORY
857 || map->nodrop
778 || ms ().move_block == MOVE_ALL) 858 || ms ().move_block == MOVE_ALL)
779 { 859 {
780 while (inv) 860 while (inv)
781 { 861 {
782 inv->destroy_inv (drop_to_ground); 862 inv->destroy_inv (drop_to_ground);
… …
898 * This function removes the object op from the linked list of objects 978 * This function removes the object op from the linked list of objects
899 * which it is currently tied to. When this function is done, the 979 * which it is currently tied to. When this function is done, the
900 * object will have no environment. If the object previously had an 980 * object will have no environment. If the object previously had an
901 * environment, the x and y coordinates will be updated to 981 * environment, the x and y coordinates will be updated to
902 * the previous environment. 982 * the previous environment.
903 * Beware: This function is called from the editor as well!
904 */ 983 */
905void 984void
906object::remove () 985object::do_remove ()
907{ 986{
908 object *tmp, *last = 0; 987 object *tmp, *last = 0;
909 object *otmp; 988 object *otmp;
910 989
911 if (QUERY_FLAG (this, FLAG_REMOVED)) 990 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
954 } 1033 }
955 else if (map) 1034 else if (map)
956 { 1035 {
957 if (type == PLAYER) 1036 if (type == PLAYER)
958 { 1037 {
1038 // leaving a spot always closes any open container on the ground
1039 if (container && !container->env)
1040 // this causes spurious floorbox updates, but it ensures
1041 // that the CLOSE event is being sent.
1042 close_container ();
1043
959 --map->players; 1044 --map->players;
960 map->touch (); 1045 map->touch ();
961 } 1046 }
962 1047
963 map->dirty = true; 1048 map->dirty = true;
1049 mapspace &ms = this->ms ();
964 1050
965 /* link the object above us */ 1051 /* link the object above us */
966 if (above) 1052 if (above)
967 above->below = below; 1053 above->below = below;
968 else 1054 else
969 map->at (x, y).top = below; /* we were top, set new top */ 1055 ms.top = below; /* we were top, set new top */
970 1056
971 /* Relink the object below us, if there is one */ 1057 /* Relink the object below us, if there is one */
972 if (below) 1058 if (below)
973 below->above = above; 1059 below->above = above;
974 else 1060 else
… …
976 /* Nothing below, which means we need to relink map object for this space 1062 /* Nothing below, which means we need to relink map object for this space
977 * use translated coordinates in case some oddness with map tiling is 1063 * use translated coordinates in case some oddness with map tiling is
978 * evident 1064 * evident
979 */ 1065 */
980 if (GET_MAP_OB (map, x, y) != this) 1066 if (GET_MAP_OB (map, x, y) != this)
981 {
982 char *dump = dump_object (this);
983 LOG (llevError,
984 "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); 1067 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 ());
985 free (dump);
986 dump = dump_object (GET_MAP_OB (map, x, y));
987 LOG (llevError, "%s\n", dump);
988 free (dump);
989 }
990 1068
991 map->at (x, y).bot = above; /* goes on above it. */ 1069 ms.bot = above; /* goes on above it. */
992 } 1070 }
993 1071
994 above = 0; 1072 above = 0;
995 below = 0; 1073 below = 0;
996 1074
997 if (map->in_memory == MAP_SAVING) 1075 if (map->in_memory == MAP_SAVING)
998 return; 1076 return;
999 1077
1000 int check_walk_off = !flag [FLAG_NO_APPLY]; 1078 int check_walk_off = !flag [FLAG_NO_APPLY];
1001 1079
1002 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1080 for (tmp = ms.bot; tmp; tmp = tmp->above)
1003 { 1081 {
1004 /* No point updating the players look faces if he is the object 1082 /* No point updating the players look faces if he is the object
1005 * being removed. 1083 * being removed.
1006 */ 1084 */
1007 1085
… …
1087 } 1165 }
1088 1166
1089 return 0; 1167 return 0;
1090} 1168}
1091 1169
1170void
1171object::expand_tail ()
1172{
1173 if (more)
1174 return;
1175
1176 object *prev = this;
1177
1178 for (archetype *at = arch->more; at; at = at->more)
1179 {
1180 object *op = arch_to_object (at);
1181
1182 op->name = name;
1183 op->name_pl = name_pl;
1184 op->title = title;
1185
1186 op->head = this;
1187 prev->more = op;
1188
1189 prev = op;
1190 }
1191}
1192
1092/* 1193/*
1093 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1194 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1094 * job preparing multi-part monsters 1195 * job preparing multi-part monsters.
1095 */ 1196 */
1096object * 1197object *
1097insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1198insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1098{ 1199{
1099 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1200 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1126 * just 'op' otherwise 1227 * just 'op' otherwise
1127 */ 1228 */
1128object * 1229object *
1129insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1230insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1130{ 1231{
1232 assert (!op->flag [FLAG_FREED]);
1233
1131 object *tmp, *top, *floor = NULL; 1234 object *tmp, *top, *floor = NULL;
1132 sint16 x, y;
1133 1235
1134 if (QUERY_FLAG (op, FLAG_FREED)) 1236 op->remove ();
1135 {
1136 LOG (llevError, "Trying to insert freed object!\n");
1137 return NULL;
1138 }
1139 1237
1140 if (!m) 1238#if 0
1141 { 1239 if (!m->active != !op->active)
1142 char *dump = dump_object (op); 1240 if (m->active)
1143 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1241 op->activate_recursive ();
1144 free (dump); 1242 else
1145 return op; 1243 op->deactivate_recursive ();
1146 } 1244#endif
1147 1245
1148 if (out_of_map (m, op->x, op->y)) 1246 if (out_of_map (m, op->x, op->y))
1149 { 1247 {
1150 char *dump = dump_object (op);
1151 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1248 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1152#ifdef MANY_CORES 1249#ifdef MANY_CORES
1153 /* Better to catch this here, as otherwise the next use of this object 1250 /* Better to catch this here, as otherwise the next use of this object
1154 * is likely to cause a crash. Better to find out where it is getting 1251 * is likely to cause a crash. Better to find out where it is getting
1155 * improperly inserted. 1252 * improperly inserted.
1156 */ 1253 */
1157 abort (); 1254 abort ();
1158#endif 1255#endif
1159 free (dump);
1160 return op; 1256 return op;
1161 } 1257 }
1162 1258
1163 if (!QUERY_FLAG (op, FLAG_REMOVED))
1164 {
1165 char *dump = dump_object (op);
1166 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1167 free (dump);
1168 return op;
1169 }
1170
1171 if (op->more)
1172 {
1173 /* The part may be on a different map. */
1174
1175 object *more = op->more; 1259 if (object *more = op->more)
1176 1260 {
1177 /* We really need the caller to normalise coordinates - if
1178 * we set the map, that doesn't work if the location is within
1179 * a map and this is straddling an edge. So only if coordinate
1180 * is clear wrong do we normalise it.
1181 */
1182 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1183 more->map = get_map_from_coord (m, &more->x, &more->y);
1184 else if (!more->map)
1185 {
1186 /* For backwards compatibility - when not dealing with tiled maps,
1187 * more->map should always point to the parent.
1188 */
1189 more->map = m;
1190 }
1191
1192 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1261 if (!insert_ob_in_map (more, m, originator, flag))
1193 { 1262 {
1194 if (!op->head) 1263 if (!op->head)
1195 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1264 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1196 1265
1197 return 0; 1266 return 0;
… …
1202 1271
1203 /* Ideally, the caller figures this out. However, it complicates a lot 1272 /* Ideally, the caller figures this out. However, it complicates a lot
1204 * of areas of callers (eg, anything that uses find_free_spot would now 1273 * of areas of callers (eg, anything that uses find_free_spot would now
1205 * need extra work 1274 * need extra work
1206 */ 1275 */
1207 op->map = get_map_from_coord (m, &op->x, &op->y); 1276 if (!xy_normalise (m, op->x, op->y))
1208 x = op->x; 1277 return 0;
1209 y = op->y; 1278
1279 op->map = m;
1280 mapspace &ms = op->ms ();
1210 1281
1211 /* this has to be done after we translate the coordinates. 1282 /* this has to be done after we translate the coordinates.
1212 */ 1283 */
1213 if (op->nrof && !(flag & INS_NO_MERGE)) 1284 if (op->nrof && !(flag & INS_NO_MERGE))
1214 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1285 for (tmp = ms.bot; tmp; tmp = tmp->above)
1215 if (object::can_merge (op, tmp)) 1286 if (object::can_merge (op, tmp))
1216 { 1287 {
1217 op->nrof += tmp->nrof; 1288 op->nrof += tmp->nrof;
1218 tmp->destroy (); 1289 tmp->destroy ();
1219 } 1290 }
… …
1236 op->below = originator->below; 1307 op->below = originator->below;
1237 1308
1238 if (op->below) 1309 if (op->below)
1239 op->below->above = op; 1310 op->below->above = op;
1240 else 1311 else
1241 op->ms ().bot = op; 1312 ms.bot = op;
1242 1313
1243 /* since *below* originator, no need to update top */ 1314 /* since *below* originator, no need to update top */
1244 originator->below = op; 1315 originator->below = op;
1245 } 1316 }
1246 else 1317 else
1247 { 1318 {
1319 top = ms.bot;
1320
1248 /* If there are other objects, then */ 1321 /* If there are other objects, then */
1249 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1322 if ((!(flag & INS_MAP_LOAD)) && top)
1250 { 1323 {
1251 object *last = 0; 1324 object *last = 0;
1252 1325
1253 /* 1326 /*
1254 * If there are multiple objects on this space, we do some trickier handling. 1327 * If there are multiple objects on this space, we do some trickier handling.
… …
1260 * once we get to them. This reduces the need to traverse over all of 1333 * once we get to them. This reduces the need to traverse over all of
1261 * them when adding another one - this saves quite a bit of cpu time 1334 * them when adding another one - this saves quite a bit of cpu time
1262 * when lots of spells are cast in one area. Currently, it is presumed 1335 * when lots of spells are cast in one area. Currently, it is presumed
1263 * that flying non pickable objects are spell objects. 1336 * that flying non pickable objects are spell objects.
1264 */ 1337 */
1265 while (top) 1338 for (top = ms.bot; top; top = top->above)
1266 { 1339 {
1267 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1340 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1268 floor = top; 1341 floor = top;
1269 1342
1270 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1343 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1273 top = top->below; 1346 top = top->below;
1274 break; 1347 break;
1275 } 1348 }
1276 1349
1277 last = top; 1350 last = top;
1278 top = top->above;
1279 } 1351 }
1280 1352
1281 /* Don't want top to be NULL, so set it to the last valid object */ 1353 /* Don't want top to be NULL, so set it to the last valid object */
1282 top = last; 1354 top = last;
1283 1355
… …
1285 * looks like instead of lots of conditions here. 1357 * looks like instead of lots of conditions here.
1286 * makes things faster, and effectively the same result. 1358 * makes things faster, and effectively the same result.
1287 */ 1359 */
1288 1360
1289 /* Have object 'fall below' other objects that block view. 1361 /* Have object 'fall below' other objects that block view.
1290 * Unless those objects are exits, type 66 1362 * Unless those objects are exits.
1291 * If INS_ON_TOP is used, don't do this processing 1363 * If INS_ON_TOP is used, don't do this processing
1292 * Need to find the object that in fact blocks view, otherwise 1364 * Need to find the object that in fact blocks view, otherwise
1293 * stacking is a bit odd. 1365 * stacking is a bit odd.
1294 */ 1366 */
1295 if (!(flag & INS_ON_TOP) && 1367 if (!(flag & INS_ON_TOP)
1296 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1368 && ms.flags () & P_BLOCKSVIEW
1369 && (op->face && !faces [op->face].visibility))
1297 { 1370 {
1298 for (last = top; last != floor; last = last->below) 1371 for (last = top; last != floor; last = last->below)
1299 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1372 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1300 break; 1373 break;
1374
1301 /* Check to see if we found the object that blocks view, 1375 /* Check to see if we found the object that blocks view,
1302 * and make sure we have a below pointer for it so that 1376 * and make sure we have a below pointer for it so that
1303 * we can get inserted below this one, which requires we 1377 * we can get inserted below this one, which requires we
1304 * set top to the object below us. 1378 * set top to the object below us.
1305 */ 1379 */
… …
1307 top = last->below; 1381 top = last->below;
1308 } 1382 }
1309 } /* If objects on this space */ 1383 } /* If objects on this space */
1310 1384
1311 if (flag & INS_MAP_LOAD) 1385 if (flag & INS_MAP_LOAD)
1312 top = GET_MAP_TOP (op->map, op->x, op->y); 1386 top = ms.top;
1313 1387
1314 if (flag & INS_ABOVE_FLOOR_ONLY) 1388 if (flag & INS_ABOVE_FLOOR_ONLY)
1315 top = floor; 1389 top = floor;
1316 1390
1317 /* Top is the object that our object (op) is going to get inserted above. 1391 /* Top is the object that our object (op) is going to get inserted above.
1318 */ 1392 */
1319 1393
1320 /* First object on this space */ 1394 /* First object on this space */
1321 if (!top) 1395 if (!top)
1322 { 1396 {
1323 op->above = GET_MAP_OB (op->map, op->x, op->y); 1397 op->above = ms.bot;
1324 1398
1325 if (op->above) 1399 if (op->above)
1326 op->above->below = op; 1400 op->above->below = op;
1327 1401
1328 op->below = 0; 1402 op->below = 0;
1329 op->ms ().bot = op; 1403 ms.bot = op;
1330 } 1404 }
1331 else 1405 else
1332 { /* get inserted into the stack above top */ 1406 { /* get inserted into the stack above top */
1333 op->above = top->above; 1407 op->above = top->above;
1334 1408
… …
1338 op->below = top; 1412 op->below = top;
1339 top->above = op; 1413 top->above = op;
1340 } 1414 }
1341 1415
1342 if (!op->above) 1416 if (!op->above)
1343 op->ms ().top = op; 1417 ms.top = op;
1344 } /* else not INS_BELOW_ORIGINATOR */ 1418 } /* else not INS_BELOW_ORIGINATOR */
1345 1419
1346 if (op->type == PLAYER) 1420 if (op->type == PLAYER)
1347 { 1421 {
1348 op->contr->do_los = 1; 1422 op->contr->do_los = 1;
… …
1354 1428
1355 /* If we have a floor, we know the player, if any, will be above 1429 /* If we have a floor, we know the player, if any, will be above
1356 * it, so save a few ticks and start from there. 1430 * it, so save a few ticks and start from there.
1357 */ 1431 */
1358 if (!(flag & INS_MAP_LOAD)) 1432 if (!(flag & INS_MAP_LOAD))
1359 if (object *pl = op->ms ().player ()) 1433 if (object *pl = ms.player ())
1360 if (pl->contr->ns) 1434 if (pl->contr->ns)
1361 pl->contr->ns->floorbox_update (); 1435 pl->contr->ns->floorbox_update ();
1362 1436
1363 /* If this object glows, it may affect lighting conditions that are 1437 /* If this object glows, it may affect lighting conditions that are
1364 * visible to others on this map. But update_all_los is really 1438 * visible to others on this map. But update_all_los is really
… …
1426} 1500}
1427 1501
1428object * 1502object *
1429object::insert_at (object *where, object *originator, int flags) 1503object::insert_at (object *where, object *originator, int flags)
1430{ 1504{
1431 where->map->insert (this, where->x, where->y, originator, flags); 1505 return where->map->insert (this, where->x, where->y, originator, flags);
1432} 1506}
1433 1507
1434/* 1508/*
1435 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1509 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1436 * is returned contains nr objects, and the remaining parts contains 1510 * is returned contains nr objects, and the remaining parts contains
… …
1476 * the amount of an object. If the amount reaches 0, the object 1550 * the amount of an object. If the amount reaches 0, the object
1477 * is subsequently removed and freed. 1551 * is subsequently removed and freed.
1478 * 1552 *
1479 * Return value: 'op' if something is left, NULL if the amount reached 0 1553 * Return value: 'op' if something is left, NULL if the amount reached 0
1480 */ 1554 */
1481
1482object * 1555object *
1483decrease_ob_nr (object *op, uint32 i) 1556decrease_ob_nr (object *op, uint32 i)
1484{ 1557{
1485 object *tmp; 1558 object *tmp;
1486 1559
… …
1561 1634
1562/* 1635/*
1563 * add_weight(object, weight) adds the specified weight to an object, 1636 * add_weight(object, weight) adds the specified weight to an object,
1564 * and also updates how much the environment(s) is/are carrying. 1637 * and also updates how much the environment(s) is/are carrying.
1565 */ 1638 */
1566
1567void 1639void
1568add_weight (object *op, signed long weight) 1640add_weight (object *op, signed long weight)
1569{ 1641{
1570 while (op != NULL) 1642 while (op != NULL)
1571 { 1643 {
… …
1603 * inside the object environment. 1675 * inside the object environment.
1604 * 1676 *
1605 * The function returns now pointer to inserted item, and return value can 1677 * The function returns now pointer to inserted item, and return value can
1606 * be != op, if items are merged. -Tero 1678 * be != op, if items are merged. -Tero
1607 */ 1679 */
1608
1609object * 1680object *
1610object::insert (object *op) 1681object::insert (object *op)
1611{ 1682{
1612 object *tmp, *otmp; 1683 object *tmp, *otmp;
1613 1684
… …
1773 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1844 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1774 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1845 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1775 { 1846 {
1776 1847
1777 float 1848 float
1778 diff = tmp->move_slow_penalty * FABS (op->speed); 1849 diff = tmp->move_slow_penalty * fabs (op->speed);
1779 1850
1780 if (op->type == PLAYER) 1851 if (op->type == PLAYER)
1781 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1852 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1782 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1853 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1783 diff /= 4.0; 1854 diff /= 4.0;
… …
1990 } 2061 }
1991 2062
1992 if (!index) 2063 if (!index)
1993 return -1; 2064 return -1;
1994 2065
1995 return altern[RANDOM () % index]; 2066 return altern [rndm (index)];
1996} 2067}
1997 2068
1998/* 2069/*
1999 * find_first_free_spot(archetype, maptile, x, y) works like 2070 * find_first_free_spot(archetype, maptile, x, y) works like
2000 * find_free_spot(), but it will search max number of squares. 2071 * find_free_spot(), but it will search max number of squares.
… …
2021{ 2092{
2022 arr += begin; 2093 arr += begin;
2023 end -= begin; 2094 end -= begin;
2024 2095
2025 while (--end) 2096 while (--end)
2026 swap (arr [end], arr [RANDOM () % (end + 1)]); 2097 swap (arr [end], arr [rndm (end + 1)]);
2027} 2098}
2028 2099
2029/* new function to make monster searching more efficient, and effective! 2100/* new function to make monster searching more efficient, and effective!
2030 * This basically returns a randomized array (in the passed pointer) of 2101 * This basically returns a randomized array (in the passed pointer) of
2031 * the spaces to find monsters. In this way, it won't always look for 2102 * the spaces to find monsters. In this way, it won't always look for
… …
2165 2236
2166 return 3; 2237 return 3;
2167} 2238}
2168 2239
2169/* 2240/*
2170 * absdir(int): Returns a number between 1 and 8, which represent
2171 * the "absolute" direction of a number (it actually takes care of
2172 * "overflow" in previous calculations of a direction).
2173 */
2174
2175int
2176absdir (int d)
2177{
2178 while (d < 1)
2179 d += 8;
2180
2181 while (d > 8)
2182 d -= 8;
2183
2184 return d;
2185}
2186
2187/*
2188 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is 2241 * dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2189 * between two directions (which are expected to be absolute (see absdir()) 2242 * between two directions (which are expected to be absolute (see absdir())
2190 */ 2243 */
2191
2192int 2244int
2193dirdiff (int dir1, int dir2) 2245dirdiff (int dir1, int dir2)
2194{ 2246{
2195 int d; 2247 int d;
2196 2248
… …
2362 insert_ob_in_ob (object_create_clone (item), dst); 2414 insert_ob_in_ob (object_create_clone (item), dst);
2363 2415
2364 return dst; 2416 return dst;
2365} 2417}
2366 2418
2367/* GROS - Creates an object using a string representing its content. */
2368/* Basically, we save the content of the string to a temp file, then call */
2369/* load_object on it. I admit it is a highly inefficient way to make things, */
2370/* but it was simple to make and allows reusing the load_object function. */
2371/* Remember not to use load_object_str in a time-critical situation. */
2372/* Also remember that multiparts objects are not supported for now. */
2373object *
2374load_object_str (const char *obstr)
2375{
2376 object *op;
2377 char filename[MAX_BUF];
2378
2379 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2380
2381 FILE *tempfile = fopen (filename, "w");
2382
2383 if (tempfile == NULL)
2384 {
2385 LOG (llevError, "Error - Unable to access load object temp file\n");
2386 return NULL;
2387 }
2388
2389 fprintf (tempfile, obstr);
2390 fclose (tempfile);
2391
2392 op = object::create ();
2393
2394 object_thawer thawer (filename);
2395
2396 if (thawer)
2397 load_object (thawer, op, 0);
2398
2399 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2400 CLEAR_FLAG (op, FLAG_REMOVED);
2401
2402 return op;
2403}
2404
2405/* This returns the first object in who's inventory that 2419/* This returns the first object in who's inventory that
2406 * has the same type and subtype match. 2420 * has the same type and subtype match.
2407 * returns NULL if no match. 2421 * returns NULL if no match.
2408 */ 2422 */
2409object * 2423object *
… …
2462 if (link->key == canonical_key) 2476 if (link->key == canonical_key)
2463 return link->value; 2477 return link->value;
2464 2478
2465 return 0; 2479 return 0;
2466} 2480}
2467
2468 2481
2469/* 2482/*
2470 * Updates the canonical_key in op to value. 2483 * Updates the canonical_key in op to value.
2471 * 2484 *
2472 * canonical_key is a shared string (value doesn't have to be). 2485 * canonical_key is a shared string (value doesn't have to be).
… …
2612{ 2625{
2613 char flagdesc[512]; 2626 char flagdesc[512];
2614 char info2[256 * 4]; 2627 char info2[256 * 4];
2615 char *p = info; 2628 char *p = info;
2616 2629
2617 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2630 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2618 count, uuid.seq, 2631 count, uuid.seq,
2619 &name, 2632 &name,
2620 title ? "\",title:" : "", 2633 title ? "\",title:\"" : "",
2621 title ? (const char *)title : "", 2634 title ? (const char *)title : "",
2622 flag_desc (flagdesc, 512), type); 2635 flag_desc (flagdesc, 512), type);
2623 2636
2624 if (env) 2637 if (env)
2625 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2638 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2631} 2644}
2632 2645
2633const char * 2646const char *
2634object::debug_desc () const 2647object::debug_desc () const
2635{ 2648{
2636 static char info[256 * 4]; 2649 static char info[3][256 * 4];
2650 static int info_idx;
2651
2637 return debug_desc (info); 2652 return debug_desc (info [++info_idx % 3]);
2638} 2653}
2639 2654
2655struct region *
2656object::region () const
2657{
2658 return map ? map->region (x, y)
2659 : region::default_region ();
2660}
2661
2662const materialtype_t *
2663object::dominant_material () const
2664{
2665 if (materialtype_t *mat = name_to_material (materialname))
2666 return mat;
2667
2668 // omfg this is slow, this has to be temporary :)
2669 shstr unknown ("unknown");
2670
2671 return name_to_material (unknown);
2672}
2673
2674void
2675object::open_container (object *new_container)
2676{
2677 if (container == new_container)
2678 return;
2679
2680 if (object *old_container = container)
2681 {
2682 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2683 return;
2684
2685#if 0
2686 // remove the "Close old_container" object.
2687 if (object *closer = old_container->inv)
2688 if (closer->type == CLOSE_CON)
2689 closer->destroy ();
2690#endif
2691
2692 old_container->flag [FLAG_APPLIED] = 0;
2693 container = 0;
2694
2695 esrv_update_item (UPD_FLAGS, this, old_container);
2696 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2697 }
2698
2699 if (new_container)
2700 {
2701 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2702 return;
2703
2704 // TODO: this does not seem to serve any purpose anymore?
2705#if 0
2706 // insert the "Close Container" object.
2707 if (archetype *closer = new_container->other_arch)
2708 {
2709 object *closer = arch_to_object (new_container->other_arch);
2710 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2711 new_container->insert (closer);
2712 }
2713#endif
2714
2715 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2716
2717 new_container->flag [FLAG_APPLIED] = 1;
2718 container = new_container;
2719
2720 esrv_update_item (UPD_FLAGS, this, new_container);
2721 esrv_send_inventory (this, new_container);
2722 }
2723}
2724
2725

Diff Legend

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