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.116 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.149 by root, Mon May 14 19:56:45 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 *
… …
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 current_weapon = ob;
479 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
480
481 update_stats ();
482
483 if (ob)
484 {
485 // now check wether any body locations became invalid, in which case
486 // we cannot apply the weapon at the moment.
487 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
488 if (slot[i].used < 0)
489 {
490 current_weapon = chosen_skill = 0;
491 update_stats ();
492
493 new_draw_info_format (NDI_UNIQUE, 0, this,
494 "You try to balance your applied items all at once, but the %s is too much. "
495 "You need to unapply some items first.", &ob->name);
496 return false;
497 }
498
499 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
500 }
501 else
502 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
503
504 return true;
505}
506
454/* Zero the key_values on op, decrementing the shared-string 507/* Zero the key_values on op, decrementing the shared-string
455 * refcounts and freeing the links. 508 * refcounts and freeing the links.
456 */ 509 */
457static void 510static void
458free_key_values (object *op) 511free_key_values (object *op)
459{ 512{
460 for (key_value *i = op->key_values; i != 0;) 513 for (key_value *i = op->key_values; i; )
461 { 514 {
462 key_value *next = i->next; 515 key_value *next = i->next;
463 delete i; 516 delete i;
464 517
465 i = next; 518 i = next;
466 } 519 }
467 520
468 op->key_values = 0; 521 op->key_values = 0;
469} 522}
470 523
471/* 524object &
472 * copy_to first frees everything allocated by the dst object, 525object::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{ 526{
482 bool is_freed = QUERY_FLAG (dst, FLAG_FREED); 527 bool is_freed = flag [FLAG_FREED];
483 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED); 528 bool is_removed = flag [FLAG_REMOVED];
484 529
485 *(object_copy *)dst = *this; 530 *(object_copy *)this = src;
486 531
487 if (is_freed) 532 flag [FLAG_FREED] = is_freed;
488 SET_FLAG (dst, FLAG_FREED); 533 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 534
496 /* Copy over key_values, if any. */ 535 /* Copy over key_values, if any. */
497 if (key_values) 536 if (src.key_values)
498 { 537 {
499 key_value *tail = 0; 538 key_value *tail = 0;
500 key_value *i;
501
502 dst->key_values = 0; 539 key_values = 0;
503 540
504 for (i = key_values; i; i = i->next) 541 for (key_value *i = src.key_values; i; i = i->next)
505 { 542 {
506 key_value *new_link = new key_value; 543 key_value *new_link = new key_value;
507 544
508 new_link->next = 0; 545 new_link->next = 0;
509 new_link->key = i->key; 546 new_link->key = i->key;
510 new_link->value = i->value; 547 new_link->value = i->value;
511 548
512 /* Try and be clever here, too. */ 549 /* Try and be clever here, too. */
513 if (!dst->key_values) 550 if (!key_values)
514 { 551 {
515 dst->key_values = new_link; 552 key_values = new_link;
516 tail = new_link; 553 tail = new_link;
517 } 554 }
518 else 555 else
519 { 556 {
520 tail->next = new_link; 557 tail->next = new_link;
521 tail = new_link; 558 tail = new_link;
522 } 559 }
523 } 560 }
524 } 561 }
562}
563
564/*
565 * copy_to first frees everything allocated by the dst object,
566 * and then copies the contents of itself into the second
567 * object, allocating what needs to be allocated. Basically, any
568 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
569 * if the first object is freed, the pointers in the new object
570 * will point at garbage.
571 */
572void
573object::copy_to (object *dst)
574{
575 *dst = *this;
576
577 if (speed < 0)
578 dst->speed_left = speed_left - rndm ();
525 579
526 dst->set_speed (dst->speed); 580 dst->set_speed (dst->speed);
581}
582
583void
584object::instantiate ()
585{
586 if (!uuid.seq) // HACK
587 uuid = gen_uuid ();
588
589 speed_left = -0.1f;
590 /* copy the body_info to the body_used - this is only really
591 * need for monsters, but doesn't hurt to do it for everything.
592 * by doing so, when a monster is created, it has good starting
593 * values for the body_used info, so when items are created
594 * for it, they can be properly equipped.
595 */
596 for (int i = NUM_BODY_LOCATIONS; i--; )
597 slot[i].used = slot[i].info;
598
599 attachable::instantiate ();
527} 600}
528 601
529object * 602object *
530object::clone () 603object::clone ()
531{ 604{
… …
589 * UP_OBJ_FACE: only the objects face has changed. 662 * UP_OBJ_FACE: only the objects face has changed.
590 */ 663 */
591void 664void
592update_object (object *op, int action) 665update_object (object *op, int action)
593{ 666{
594 MoveType move_on, move_off, move_block, move_slow;
595
596 if (op == NULL) 667 if (op == NULL)
597 { 668 {
598 /* this should never happen */ 669 /* this should never happen */
599 LOG (llevDebug, "update_object() called for NULL object.\n"); 670 LOG (llevDebug, "update_object() called for NULL object.\n");
600 return; 671 return;
… …
670 face = blank_face; 741 face = blank_face;
671} 742}
672 743
673object::~object () 744object::~object ()
674{ 745{
746 unlink ();
747
675 free_key_values (this); 748 free_key_values (this);
676} 749}
677 750
678static int object_count; 751static int object_count;
679 752
… …
687 objects.insert (this); 760 objects.insert (this);
688} 761}
689 762
690void object::unlink () 763void object::unlink ()
691{ 764{
692 assert (index);//D 765 if (!index)
766 return;
767
693 objects.erase (this); 768 objects.erase (this);
694 refcnt_dec (); 769 refcnt_dec ();
695} 770}
696 771
697void 772void
… …
771 * drop on that space. 846 * drop on that space.
772 */ 847 */
773 if (!drop_to_ground 848 if (!drop_to_ground
774 || !map 849 || !map
775 || map->in_memory != MAP_IN_MEMORY 850 || map->in_memory != MAP_IN_MEMORY
851 || map->nodrop
776 || ms ().move_block == MOVE_ALL) 852 || ms ().move_block == MOVE_ALL)
777 { 853 {
778 while (inv) 854 while (inv)
779 { 855 {
780 inv->destroy_inv (drop_to_ground); 856 inv->destroy_inv (drop_to_ground);
… …
896 * This function removes the object op from the linked list of objects 972 * This function removes the object op from the linked list of objects
897 * which it is currently tied to. When this function is done, the 973 * which it is currently tied to. When this function is done, the
898 * object will have no environment. If the object previously had an 974 * object will have no environment. If the object previously had an
899 * environment, the x and y coordinates will be updated to 975 * environment, the x and y coordinates will be updated to
900 * the previous environment. 976 * the previous environment.
901 * Beware: This function is called from the editor as well!
902 */ 977 */
903void 978void
904object::remove () 979object::do_remove ()
905{ 980{
906 object *tmp, *last = 0; 981 object *tmp, *last = 0;
907 object *otmp; 982 object *otmp;
908 983
909 if (QUERY_FLAG (this, FLAG_REMOVED)) 984 if (QUERY_FLAG (this, FLAG_REMOVED))
… …
952 } 1027 }
953 else if (map) 1028 else if (map)
954 { 1029 {
955 if (type == PLAYER) 1030 if (type == PLAYER)
956 { 1031 {
1032 // leaving a spot always closes any open container on the ground
1033 if (container && !container->env)
1034 // this causes spurious floorbox updates, but it ensures
1035 // that the CLOSE event is being sent.
1036 close_container ();
1037
957 --map->players; 1038 --map->players;
958 map->touch (); 1039 map->touch ();
959 } 1040 }
960 1041
961 map->dirty = true; 1042 map->dirty = true;
1043 mapspace &ms = this->ms ();
962 1044
963 /* link the object above us */ 1045 /* link the object above us */
964 if (above) 1046 if (above)
965 above->below = below; 1047 above->below = below;
966 else 1048 else
967 map->at (x, y).top = below; /* we were top, set new top */ 1049 ms.top = below; /* we were top, set new top */
968 1050
969 /* Relink the object below us, if there is one */ 1051 /* Relink the object below us, if there is one */
970 if (below) 1052 if (below)
971 below->above = above; 1053 below->above = above;
972 else 1054 else
… …
974 /* Nothing below, which means we need to relink map object for this space 1056 /* Nothing below, which means we need to relink map object for this space
975 * use translated coordinates in case some oddness with map tiling is 1057 * use translated coordinates in case some oddness with map tiling is
976 * evident 1058 * evident
977 */ 1059 */
978 if (GET_MAP_OB (map, x, y) != this) 1060 if (GET_MAP_OB (map, x, y) != this)
979 {
980 char *dump = dump_object (this);
981 LOG (llevError,
982 "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); 1061 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 ());
983 free (dump);
984 dump = dump_object (GET_MAP_OB (map, x, y));
985 LOG (llevError, "%s\n", dump);
986 free (dump);
987 }
988 1062
989 map->at (x, y).bot = above; /* goes on above it. */ 1063 ms.bot = above; /* goes on above it. */
990 } 1064 }
991 1065
992 above = 0; 1066 above = 0;
993 below = 0; 1067 below = 0;
994 1068
995 if (map->in_memory == MAP_SAVING) 1069 if (map->in_memory == MAP_SAVING)
996 return; 1070 return;
997 1071
998 int check_walk_off = !flag [FLAG_NO_APPLY]; 1072 int check_walk_off = !flag [FLAG_NO_APPLY];
999 1073
1000 for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above) 1074 for (tmp = ms.bot; tmp; tmp = tmp->above)
1001 { 1075 {
1002 /* No point updating the players look faces if he is the object 1076 /* No point updating the players look faces if he is the object
1003 * being removed. 1077 * being removed.
1004 */ 1078 */
1005 1079
… …
1085 } 1159 }
1086 1160
1087 return 0; 1161 return 0;
1088} 1162}
1089 1163
1164void
1165object::expand_tail ()
1166{
1167 if (more)
1168 return;
1169
1170 object *prev = this;
1171
1172 for (archetype *at = arch->more; at; at = at->more)
1173 {
1174 object *op = arch_to_object (at);
1175
1176 op->name = name;
1177 op->name_pl = name_pl;
1178 op->title = title;
1179
1180 op->head = this;
1181 prev->more = op;
1182
1183 prev = op;
1184 }
1185}
1186
1090/* 1187/*
1091 * same as insert_ob_in_map except it handle separate coordinates and do a clean 1188 * same as insert_ob_in_map except it handles separate coordinates and does a clean
1092 * job preparing multi-part monsters 1189 * job preparing multi-part monsters.
1093 */ 1190 */
1094object * 1191object *
1095insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1192insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1096{ 1193{
1097 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1194 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
… …
1124 * just 'op' otherwise 1221 * just 'op' otherwise
1125 */ 1222 */
1126object * 1223object *
1127insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1224insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1128{ 1225{
1226 assert (!op->flag [FLAG_FREED]);
1227
1129 object *tmp, *top, *floor = NULL; 1228 object *tmp, *top, *floor = NULL;
1130 sint16 x, y;
1131 1229
1132 if (QUERY_FLAG (op, FLAG_FREED)) 1230 op->remove ();
1133 {
1134 LOG (llevError, "Trying to insert freed object!\n");
1135 return NULL;
1136 }
1137 1231
1138 if (!m) 1232#if 0
1139 { 1233 if (!m->active != !op->active)
1140 char *dump = dump_object (op); 1234 if (m->active)
1141 LOG (llevError, "Trying to insert in null-map!\n%s\n", dump); 1235 op->activate_recursive ();
1142 free (dump); 1236 else
1143 return op; 1237 op->deactivate_recursive ();
1144 } 1238#endif
1145 1239
1146 if (out_of_map (m, op->x, op->y)) 1240 if (out_of_map (m, op->x, op->y))
1147 { 1241 {
1148 char *dump = dump_object (op);
1149 LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump); 1242 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1150#ifdef MANY_CORES 1243#ifdef MANY_CORES
1151 /* Better to catch this here, as otherwise the next use of this object 1244 /* Better to catch this here, as otherwise the next use of this object
1152 * is likely to cause a crash. Better to find out where it is getting 1245 * is likely to cause a crash. Better to find out where it is getting
1153 * improperly inserted. 1246 * improperly inserted.
1154 */ 1247 */
1155 abort (); 1248 abort ();
1156#endif 1249#endif
1157 free (dump);
1158 return op; 1250 return op;
1159 } 1251 }
1160 1252
1161 if (!QUERY_FLAG (op, FLAG_REMOVED))
1162 {
1163 char *dump = dump_object (op);
1164 LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1165 free (dump);
1166 return op;
1167 }
1168
1169 if (op->more)
1170 {
1171 /* The part may be on a different map. */
1172
1173 object *more = op->more; 1253 if (object *more = op->more)
1174 1254 {
1175 /* We really need the caller to normalise coordinates - if
1176 * we set the map, that doesn't work if the location is within
1177 * a map and this is straddling an edge. So only if coordinate
1178 * is clear wrong do we normalise it.
1179 */
1180 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1181 more->map = get_map_from_coord (m, &more->x, &more->y);
1182 else if (!more->map)
1183 {
1184 /* For backwards compatibility - when not dealing with tiled maps,
1185 * more->map should always point to the parent.
1186 */
1187 more->map = m;
1188 }
1189
1190 if (insert_ob_in_map (more, more->map, originator, flag) == NULL) 1255 if (!insert_ob_in_map (more, m, originator, flag))
1191 { 1256 {
1192 if (!op->head) 1257 if (!op->head)
1193 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n"); 1258 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1194 1259
1195 return 0; 1260 return 0;
… …
1200 1265
1201 /* Ideally, the caller figures this out. However, it complicates a lot 1266 /* Ideally, the caller figures this out. However, it complicates a lot
1202 * of areas of callers (eg, anything that uses find_free_spot would now 1267 * of areas of callers (eg, anything that uses find_free_spot would now
1203 * need extra work 1268 * need extra work
1204 */ 1269 */
1205 op->map = get_map_from_coord (m, &op->x, &op->y); 1270 if (!xy_normalise (m, op->x, op->y))
1206 x = op->x; 1271 return 0;
1207 y = op->y; 1272
1273 op->map = m;
1274 mapspace &ms = op->ms ();
1208 1275
1209 /* this has to be done after we translate the coordinates. 1276 /* this has to be done after we translate the coordinates.
1210 */ 1277 */
1211 if (op->nrof && !(flag & INS_NO_MERGE)) 1278 if (op->nrof && !(flag & INS_NO_MERGE))
1212 for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above) 1279 for (tmp = ms.bot; tmp; tmp = tmp->above)
1213 if (object::can_merge (op, tmp)) 1280 if (object::can_merge (op, tmp))
1214 { 1281 {
1215 op->nrof += tmp->nrof; 1282 op->nrof += tmp->nrof;
1216 tmp->destroy (); 1283 tmp->destroy ();
1217 } 1284 }
… …
1234 op->below = originator->below; 1301 op->below = originator->below;
1235 1302
1236 if (op->below) 1303 if (op->below)
1237 op->below->above = op; 1304 op->below->above = op;
1238 else 1305 else
1239 op->ms ().bot = op; 1306 ms.bot = op;
1240 1307
1241 /* since *below* originator, no need to update top */ 1308 /* since *below* originator, no need to update top */
1242 originator->below = op; 1309 originator->below = op;
1243 } 1310 }
1244 else 1311 else
1245 { 1312 {
1313 top = ms.bot;
1314
1246 /* If there are other objects, then */ 1315 /* If there are other objects, then */
1247 if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL)) 1316 if ((!(flag & INS_MAP_LOAD)) && top)
1248 { 1317 {
1249 object *last = 0; 1318 object *last = 0;
1250 1319
1251 /* 1320 /*
1252 * If there are multiple objects on this space, we do some trickier handling. 1321 * If there are multiple objects on this space, we do some trickier handling.
… …
1258 * once we get to them. This reduces the need to traverse over all of 1327 * once we get to them. This reduces the need to traverse over all of
1259 * them when adding another one - this saves quite a bit of cpu time 1328 * them when adding another one - this saves quite a bit of cpu time
1260 * when lots of spells are cast in one area. Currently, it is presumed 1329 * when lots of spells are cast in one area. Currently, it is presumed
1261 * that flying non pickable objects are spell objects. 1330 * that flying non pickable objects are spell objects.
1262 */ 1331 */
1263 while (top) 1332 for (top = ms.bot; top; top = top->above)
1264 { 1333 {
1265 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR)) 1334 if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1266 floor = top; 1335 floor = top;
1267 1336
1268 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR)) 1337 if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
… …
1271 top = top->below; 1340 top = top->below;
1272 break; 1341 break;
1273 } 1342 }
1274 1343
1275 last = top; 1344 last = top;
1276 top = top->above;
1277 } 1345 }
1278 1346
1279 /* Don't want top to be NULL, so set it to the last valid object */ 1347 /* Don't want top to be NULL, so set it to the last valid object */
1280 top = last; 1348 top = last;
1281 1349
… …
1283 * looks like instead of lots of conditions here. 1351 * looks like instead of lots of conditions here.
1284 * makes things faster, and effectively the same result. 1352 * makes things faster, and effectively the same result.
1285 */ 1353 */
1286 1354
1287 /* Have object 'fall below' other objects that block view. 1355 /* Have object 'fall below' other objects that block view.
1288 * Unless those objects are exits, type 66 1356 * Unless those objects are exits.
1289 * If INS_ON_TOP is used, don't do this processing 1357 * If INS_ON_TOP is used, don't do this processing
1290 * Need to find the object that in fact blocks view, otherwise 1358 * Need to find the object that in fact blocks view, otherwise
1291 * stacking is a bit odd. 1359 * stacking is a bit odd.
1292 */ 1360 */
1293 if (!(flag & INS_ON_TOP) && 1361 if (!(flag & INS_ON_TOP)
1294 (get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility)) 1362 && ms.flags () & P_BLOCKSVIEW
1363 && (op->face && !faces [op->face].visibility))
1295 { 1364 {
1296 for (last = top; last != floor; last = last->below) 1365 for (last = top; last != floor; last = last->below)
1297 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT)) 1366 if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1298 break; 1367 break;
1368
1299 /* Check to see if we found the object that blocks view, 1369 /* Check to see if we found the object that blocks view,
1300 * and make sure we have a below pointer for it so that 1370 * and make sure we have a below pointer for it so that
1301 * we can get inserted below this one, which requires we 1371 * we can get inserted below this one, which requires we
1302 * set top to the object below us. 1372 * set top to the object below us.
1303 */ 1373 */
… …
1305 top = last->below; 1375 top = last->below;
1306 } 1376 }
1307 } /* If objects on this space */ 1377 } /* If objects on this space */
1308 1378
1309 if (flag & INS_MAP_LOAD) 1379 if (flag & INS_MAP_LOAD)
1310 top = GET_MAP_TOP (op->map, op->x, op->y); 1380 top = ms.top;
1311 1381
1312 if (flag & INS_ABOVE_FLOOR_ONLY) 1382 if (flag & INS_ABOVE_FLOOR_ONLY)
1313 top = floor; 1383 top = floor;
1314 1384
1315 /* Top is the object that our object (op) is going to get inserted above. 1385 /* Top is the object that our object (op) is going to get inserted above.
1316 */ 1386 */
1317 1387
1318 /* First object on this space */ 1388 /* First object on this space */
1319 if (!top) 1389 if (!top)
1320 { 1390 {
1321 op->above = GET_MAP_OB (op->map, op->x, op->y); 1391 op->above = ms.bot;
1322 1392
1323 if (op->above) 1393 if (op->above)
1324 op->above->below = op; 1394 op->above->below = op;
1325 1395
1326 op->below = 0; 1396 op->below = 0;
1327 op->ms ().bot = op; 1397 ms.bot = op;
1328 } 1398 }
1329 else 1399 else
1330 { /* get inserted into the stack above top */ 1400 { /* get inserted into the stack above top */
1331 op->above = top->above; 1401 op->above = top->above;
1332 1402
… …
1336 op->below = top; 1406 op->below = top;
1337 top->above = op; 1407 top->above = op;
1338 } 1408 }
1339 1409
1340 if (!op->above) 1410 if (!op->above)
1341 op->ms ().top = op; 1411 ms.top = op;
1342 } /* else not INS_BELOW_ORIGINATOR */ 1412 } /* else not INS_BELOW_ORIGINATOR */
1343 1413
1344 if (op->type == PLAYER) 1414 if (op->type == PLAYER)
1345 { 1415 {
1346 op->contr->do_los = 1; 1416 op->contr->do_los = 1;
… …
1352 1422
1353 /* If we have a floor, we know the player, if any, will be above 1423 /* If we have a floor, we know the player, if any, will be above
1354 * it, so save a few ticks and start from there. 1424 * it, so save a few ticks and start from there.
1355 */ 1425 */
1356 if (!(flag & INS_MAP_LOAD)) 1426 if (!(flag & INS_MAP_LOAD))
1357 if (object *pl = op->ms ().player ()) 1427 if (object *pl = ms.player ())
1358 if (pl->contr->ns) 1428 if (pl->contr->ns)
1359 pl->contr->ns->floorbox_update (); 1429 pl->contr->ns->floorbox_update ();
1360 1430
1361 /* If this object glows, it may affect lighting conditions that are 1431 /* If this object glows, it may affect lighting conditions that are
1362 * visible to others on this map. But update_all_los is really 1432 * visible to others on this map. But update_all_los is really
… …
1424} 1494}
1425 1495
1426object * 1496object *
1427object::insert_at (object *where, object *originator, int flags) 1497object::insert_at (object *where, object *originator, int flags)
1428{ 1498{
1429 where->map->insert (this, where->x, where->y, originator, flags); 1499 return where->map->insert (this, where->x, where->y, originator, flags);
1430} 1500}
1431 1501
1432/* 1502/*
1433 * get_split_ob(ob,nr) splits up ob into two parts. The part which 1503 * get_split_ob(ob,nr) splits up ob into two parts. The part which
1434 * is returned contains nr objects, and the remaining parts contains 1504 * is returned contains nr objects, and the remaining parts contains
… …
1474 * the amount of an object. If the amount reaches 0, the object 1544 * the amount of an object. If the amount reaches 0, the object
1475 * is subsequently removed and freed. 1545 * is subsequently removed and freed.
1476 * 1546 *
1477 * Return value: 'op' if something is left, NULL if the amount reached 0 1547 * Return value: 'op' if something is left, NULL if the amount reached 0
1478 */ 1548 */
1479
1480object * 1549object *
1481decrease_ob_nr (object *op, uint32 i) 1550decrease_ob_nr (object *op, uint32 i)
1482{ 1551{
1483 object *tmp; 1552 object *tmp;
1484 1553
… …
1559 1628
1560/* 1629/*
1561 * add_weight(object, weight) adds the specified weight to an object, 1630 * add_weight(object, weight) adds the specified weight to an object,
1562 * and also updates how much the environment(s) is/are carrying. 1631 * and also updates how much the environment(s) is/are carrying.
1563 */ 1632 */
1564
1565void 1633void
1566add_weight (object *op, signed long weight) 1634add_weight (object *op, signed long weight)
1567{ 1635{
1568 while (op != NULL) 1636 while (op != NULL)
1569 { 1637 {
… …
1601 * inside the object environment. 1669 * inside the object environment.
1602 * 1670 *
1603 * The function returns now pointer to inserted item, and return value can 1671 * The function returns now pointer to inserted item, and return value can
1604 * be != op, if items are merged. -Tero 1672 * be != op, if items are merged. -Tero
1605 */ 1673 */
1606
1607object * 1674object *
1608object::insert (object *op) 1675object::insert (object *op)
1609{ 1676{
1610 object *tmp, *otmp; 1677 object *tmp, *otmp;
1611 1678
… …
1771 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1838 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1772 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1839 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1773 { 1840 {
1774 1841
1775 float 1842 float
1776 diff = tmp->move_slow_penalty * FABS (op->speed); 1843 diff = tmp->move_slow_penalty * fabs (op->speed);
1777 1844
1778 if (op->type == PLAYER) 1845 if (op->type == PLAYER)
1779 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1846 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1780 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1847 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1781 diff /= 4.0; 1848 diff /= 4.0;
… …
1988 } 2055 }
1989 2056
1990 if (!index) 2057 if (!index)
1991 return -1; 2058 return -1;
1992 2059
1993 return altern[RANDOM () % index]; 2060 return altern [rndm (index)];
1994} 2061}
1995 2062
1996/* 2063/*
1997 * find_first_free_spot(archetype, maptile, x, y) works like 2064 * find_first_free_spot(archetype, maptile, x, y) works like
1998 * find_free_spot(), but it will search max number of squares. 2065 * find_free_spot(), but it will search max number of squares.
… …
2019{ 2086{
2020 arr += begin; 2087 arr += begin;
2021 end -= begin; 2088 end -= begin;
2022 2089
2023 while (--end) 2090 while (--end)
2024 swap (arr [end], arr [RANDOM () % (end + 1)]); 2091 swap (arr [end], arr [rndm (end + 1)]);
2025} 2092}
2026 2093
2027/* new function to make monster searching more efficient, and effective! 2094/* new function to make monster searching more efficient, and effective!
2028 * This basically returns a randomized array (in the passed pointer) of 2095 * This basically returns a randomized array (in the passed pointer) of
2029 * the spaces to find monsters. In this way, it won't always look for 2096 * the spaces to find monsters. In this way, it won't always look for
… …
2341 insert_ob_in_ob (object_create_clone (item), dst); 2408 insert_ob_in_ob (object_create_clone (item), dst);
2342 2409
2343 return dst; 2410 return dst;
2344} 2411}
2345 2412
2346/* GROS - Creates an object using a string representing its content. */
2347/* Basically, we save the content of the string to a temp file, then call */
2348/* load_object on it. I admit it is a highly inefficient way to make things, */
2349/* but it was simple to make and allows reusing the load_object function. */
2350/* Remember not to use load_object_str in a time-critical situation. */
2351/* Also remember that multiparts objects are not supported for now. */
2352object *
2353load_object_str (const char *obstr)
2354{
2355 object *op;
2356 char filename[MAX_BUF];
2357
2358 sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2359
2360 FILE *tempfile = fopen (filename, "w");
2361
2362 if (tempfile == NULL)
2363 {
2364 LOG (llevError, "Error - Unable to access load object temp file\n");
2365 return NULL;
2366 }
2367
2368 fprintf (tempfile, obstr);
2369 fclose (tempfile);
2370
2371 op = object::create ();
2372
2373 object_thawer thawer (filename);
2374
2375 if (thawer)
2376 load_object (thawer, op, 0);
2377
2378 LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2379 CLEAR_FLAG (op, FLAG_REMOVED);
2380
2381 return op;
2382}
2383
2384/* This returns the first object in who's inventory that 2413/* This returns the first object in who's inventory that
2385 * has the same type and subtype match. 2414 * has the same type and subtype match.
2386 * returns NULL if no match. 2415 * returns NULL if no match.
2387 */ 2416 */
2388object * 2417object *
… …
2441 if (link->key == canonical_key) 2470 if (link->key == canonical_key)
2442 return link->value; 2471 return link->value;
2443 2472
2444 return 0; 2473 return 0;
2445} 2474}
2446
2447 2475
2448/* 2476/*
2449 * Updates the canonical_key in op to value. 2477 * Updates the canonical_key in op to value.
2450 * 2478 *
2451 * canonical_key is a shared string (value doesn't have to be). 2479 * canonical_key is a shared string (value doesn't have to be).
… …
2591{ 2619{
2592 char flagdesc[512]; 2620 char flagdesc[512];
2593 char info2[256 * 4]; 2621 char info2[256 * 4];
2594 char *p = info; 2622 char *p = info;
2595 2623
2596 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}", 2624 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2597 count, uuid.seq, 2625 count, uuid.seq,
2598 &name, 2626 &name,
2599 title ? "\",title:" : "", 2627 title ? "\",title:\"" : "",
2600 title ? (const char *)title : "", 2628 title ? (const char *)title : "",
2601 flag_desc (flagdesc, 512), type); 2629 flag_desc (flagdesc, 512), type);
2602 2630
2603 if (env) 2631 if (env)
2604 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2632 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
… …
2610} 2638}
2611 2639
2612const char * 2640const char *
2613object::debug_desc () const 2641object::debug_desc () const
2614{ 2642{
2615 static char info[256 * 4]; 2643 static char info[3][256 * 4];
2644 static int info_idx;
2645
2616 return debug_desc (info); 2646 return debug_desc (info [++info_idx % 3]);
2617} 2647}
2618 2648
2619const char * 2649struct region *
2620object::debug_desc2 () const 2650object::region () const
2621{ 2651{
2622 static char info[256 * 4]; 2652 return map ? map->region (x, y)
2623 return debug_desc (info); 2653 : region::default_region ();
2624} 2654}
2625 2655
2656const materialtype_t *
2657object::dominant_material () const
2658{
2659 if (materialtype_t *mat = name_to_material (materialname))
2660 return mat;
2661
2662 // omfg this is slow, this has to be temporary :)
2663 shstr unknown ("unknown");
2664
2665 return name_to_material (unknown);
2666}
2667
2668void
2669object::open_container (object *new_container)
2670{
2671 if (container == new_container)
2672 return;
2673
2674 if (object *old_container = container)
2675 {
2676 if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2677 return;
2678
2679#if 0
2680 // remove the "Close old_container" object.
2681 if (object *closer = old_container->inv)
2682 if (closer->type == CLOSE_CON)
2683 closer->destroy ();
2684#endif
2685
2686 old_container->flag [FLAG_APPLIED] = 0;
2687 container = 0;
2688
2689 esrv_update_item (UPD_FLAGS, this, old_container);
2690 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2691 }
2692
2693 if (new_container)
2694 {
2695 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
2696 return;
2697
2698 // TODO: this does not seem to serve any purpose anymore?
2699#if 0
2700 // insert the "Close Container" object.
2701 if (archetype *closer = new_container->other_arch)
2702 {
2703 object *closer = arch_to_object (new_container->other_arch);
2704 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2705 new_container->insert (closer);
2706 }
2707#endif
2708
2709 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2710
2711 new_container->flag [FLAG_APPLIED] = 1;
2712 container = new_container;
2713
2714 esrv_update_item (UPD_FLAGS, this, new_container);
2715 esrv_send_inventory (this, new_container);
2716 }
2717}
2718
2719

Diff Legend

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