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.149 by root, Mon May 14 19:56:45 2007 UTC vs.
Revision 1.190 by root, Sat Sep 15 15:58:06 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT 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 3 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, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 25 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 26 variable. */
… …
300 return 0; 299 return 0;
301 else if (!compare_ob_value_lists (ob1, ob2)) 300 else if (!compare_ob_value_lists (ob1, ob2))
302 return 0; 301 return 0;
303 } 302 }
304 303
305 //TODO: generate an event or call into perl for additional checks
306 if (ob1->self || ob2->self) 304 if (ob1->self || ob2->self)
307 { 305 {
308 ob1->optimise (); 306 ob1->optimise ();
309 ob2->optimise (); 307 ob2->optimise ();
310 308
311 if (ob1->self || ob2->self) 309 if (ob1->self || ob2->self)
310 if (!cfperl_can_merge (ob1, ob2))
312 return 0; 311 return 0;
313 } 312 }
314 313
315 /* Everything passes, must be OK. */ 314 /* Everything passes, must be OK. */
316 return 1; 315 return 1;
317} 316}
… …
375/* 374/*
376 * get_nearest_part(multi-object, object 2) returns the part of the 375 * get_nearest_part(multi-object, object 2) returns the part of the
377 * multi-object 1 which is closest to the second object. 376 * multi-object 1 which is closest to the second object.
378 * If it's not a multi-object, it is returned. 377 * If it's not a multi-object, it is returned.
379 */ 378 */
380
381object * 379object *
382get_nearest_part (object *op, const object *pl) 380get_nearest_part (object *op, const object *pl)
383{ 381{
384 object *tmp, *closest; 382 object *tmp, *closest;
385 int last_dist, i; 383 int last_dist, i;
… …
430} 428}
431 429
432/* 430/*
433 * Sets the owner and sets the skill and exp pointers to owner's current 431 * Sets the owner and sets the skill and exp pointers to owner's current
434 * skill and experience objects. 432 * skill and experience objects.
433 * ACTUALLY NO! investigate! TODO
435 */ 434 */
436void 435void
437object::set_owner (object *owner) 436object::set_owner (object *owner)
438{ 437{
438 // allow objects which own objects
439 if (!owner) 439 if (owner)
440 return;
441
442 /* next line added to allow objects which own objects */
443 /* Add a check for ownercounts in here, as I got into an endless loop
444 * with the fireball owning a poison cloud which then owned the
445 * fireball. I believe that was caused by one of the objects getting
446 * freed and then another object replacing it. Since the ownercounts
447 * didn't match, this check is valid and I believe that cause is valid.
448 */
449 while (owner->owner) 440 while (owner->owner)
450 owner = owner->owner; 441 owner = owner->owner;
451 442
452 this->owner = owner; 443 this->owner = owner;
453} 444}
454 445
455int 446int
… …
473object::change_weapon (object *ob) 464object::change_weapon (object *ob)
474{ 465{
475 if (current_weapon == ob) 466 if (current_weapon == ob)
476 return true; 467 return true;
477 468
469 if (chosen_skill)
470 chosen_skill->flag [FLAG_APPLIED] = false;
471
478 current_weapon = ob; 472 current_weapon = ob;
479 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill); 473 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
474
475 if (chosen_skill)
476 chosen_skill->flag [FLAG_APPLIED] = true;
480 477
481 update_stats (); 478 update_stats ();
482 479
483 if (ob) 480 if (ob)
484 { 481 {
… …
489 { 486 {
490 current_weapon = chosen_skill = 0; 487 current_weapon = chosen_skill = 0;
491 update_stats (); 488 update_stats ();
492 489
493 new_draw_info_format (NDI_UNIQUE, 0, this, 490 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. " 491 "You try to balance all your items at once, "
492 "but the %s is just too much for your body. "
495 "You need to unapply some items first.", &ob->name); 493 "[You need to unapply some items first.]", &ob->name);
496 return false; 494 return false;
497 } 495 }
498 496
499 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 497 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
500 } 498 }
501 else 499 else
502 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons."); 500 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
501
502 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
503 {
504 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
505 &name, ob->debug_desc ());
506 return false;
507 }
503 508
504 return true; 509 return true;
505} 510}
506 511
507/* Zero the key_values on op, decrementing the shared-string 512/* Zero the key_values on op, decrementing the shared-string
… …
573object::copy_to (object *dst) 578object::copy_to (object *dst)
574{ 579{
575 *dst = *this; 580 *dst = *this;
576 581
577 if (speed < 0) 582 if (speed < 0)
578 dst->speed_left = speed_left - rndm (); 583 dst->speed_left -= rndm ();
579 584
580 dst->set_speed (dst->speed); 585 dst->set_speed (dst->speed);
581} 586}
582 587
583void 588void
… …
910 915
911 if (!freed_map) 916 if (!freed_map)
912 { 917 {
913 freed_map = new maptile; 918 freed_map = new maptile;
914 919
920 freed_map->path = "<freed objects map>";
915 freed_map->name = "/internal/freed_objects_map"; 921 freed_map->name = "/internal/freed_objects_map";
916 freed_map->width = 3; 922 freed_map->width = 3;
917 freed_map->height = 3; 923 freed_map->height = 3;
918 924
919 freed_map->alloc (); 925 freed_map->alloc ();
… …
923 map = freed_map; 929 map = freed_map;
924 x = 1; 930 x = 1;
925 y = 1; 931 y = 1;
926 } 932 }
927 933
928 head = 0;
929
930 if (more) 934 if (more)
931 { 935 {
932 more->destroy (); 936 more->destroy ();
933 more = 0; 937 more = 0;
934 } 938 }
935 939
940 head = 0;
941
936 // clear those pointers that likely might have circular references to us 942 // clear those pointers that likely might cause circular references
937 owner = 0; 943 owner = 0;
938 enemy = 0; 944 enemy = 0;
939 attacked_by = 0; 945 attacked_by = 0;
946 current_weapon = 0;
940} 947}
941 948
942void 949void
943object::destroy (bool destroy_inventory) 950object::destroy (bool destroy_inventory)
944{ 951{
945 if (destroyed ()) 952 if (destroyed ())
946 return; 953 return;
947 954
948 if (destroy_inventory) 955 if (destroy_inventory)
949 destroy_inv (false); 956 destroy_inv (false);
957
958 if (is_head ())
959 if (sound_destroy)
960 play_sound (sound_destroy);
961 else if (flag [FLAG_MONSTER])
962 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
950 963
951 attachable::destroy (); 964 attachable::destroy ();
952} 965}
953 966
954/* 967/*
… …
1069 if (map->in_memory == MAP_SAVING) 1082 if (map->in_memory == MAP_SAVING)
1070 return; 1083 return;
1071 1084
1072 int check_walk_off = !flag [FLAG_NO_APPLY]; 1085 int check_walk_off = !flag [FLAG_NO_APPLY];
1073 1086
1087 if (object *pl = ms.player ())
1088 {
1089 if (pl->container == this)
1090 /* If a container that the player is currently using somehow gets
1091 * removed (most likely destroyed), update the player view
1092 * appropriately.
1093 */
1094 pl->close_container ();
1095
1096 pl->contr->ns->floorbox_update ();
1097 }
1098
1074 for (tmp = ms.bot; tmp; tmp = tmp->above) 1099 for (tmp = ms.bot; tmp; tmp = tmp->above)
1075 { 1100 {
1076 /* No point updating the players look faces if he is the object 1101 /* No point updating the players look faces if he is the object
1077 * being removed. 1102 * being removed.
1078 */ 1103 */
1079
1080 if (tmp->type == PLAYER && tmp != this)
1081 {
1082 /* If a container that the player is currently using somehow gets
1083 * removed (most likely destroyed), update the player view
1084 * appropriately.
1085 */
1086 if (tmp->container == this)
1087 {
1088 flag [FLAG_APPLIED] = 0;
1089 tmp->container = 0;
1090 }
1091
1092 if (tmp->contr->ns)
1093 tmp->contr->ns->floorbox_update ();
1094 }
1095 1104
1096 /* See if object moving off should effect something */ 1105 /* See if object moving off should effect something */
1097 if (check_walk_off 1106 if (check_walk_off
1098 && ((move_type & tmp->move_off) 1107 && ((move_type & tmp->move_off)
1099 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1108 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1102 1111
1103 if (destroyed ()) 1112 if (destroyed ())
1104 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1113 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1105 } 1114 }
1106 1115
1107 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1108 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1109 if (tmp->above == tmp)
1110 tmp->above = 0;
1111
1112 last = tmp; 1116 last = tmp;
1113 } 1117 }
1114 1118
1115 /* last == NULL if there are no objects on this space */ 1119 /* last == NULL if there are no objects on this space */
1116 //TODO: this makes little sense, why only update the topmost object? 1120 //TODO: this makes little sense, why only update the topmost object?
… …
1167 if (more) 1171 if (more)
1168 return; 1172 return;
1169 1173
1170 object *prev = this; 1174 object *prev = this;
1171 1175
1172 for (archetype *at = arch->more; at; at = at->more) 1176 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1173 { 1177 {
1174 object *op = arch_to_object (at); 1178 object *op = arch_to_object (at);
1175 1179
1176 op->name = name; 1180 op->name = name;
1177 op->name_pl = name_pl; 1181 op->name_pl = name_pl;
… …
1191object * 1195object *
1192insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1196insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1193{ 1197{
1194 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1198 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1195 { 1199 {
1196 tmp->x = x + tmp->arch->clone.x; 1200 tmp->x = x + tmp->arch->x;
1197 tmp->y = y + tmp->arch->clone.y; 1201 tmp->y = y + tmp->arch->y;
1198 } 1202 }
1199 1203
1200 return insert_ob_in_map (op, m, originator, flag); 1204 return insert_ob_in_map (op, m, originator, flag);
1201} 1205}
1202 1206
… …
1223object * 1227object *
1224insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1228insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1225{ 1229{
1226 assert (!op->flag [FLAG_FREED]); 1230 assert (!op->flag [FLAG_FREED]);
1227 1231
1228 object *tmp, *top, *floor = NULL; 1232 object *top, *floor = NULL;
1229 1233
1230 op->remove (); 1234 op->remove ();
1231
1232#if 0
1233 if (!m->active != !op->active)
1234 if (m->active)
1235 op->activate_recursive ();
1236 else
1237 op->deactivate_recursive ();
1238#endif
1239
1240 if (out_of_map (m, op->x, op->y))
1241 {
1242 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1243#ifdef MANY_CORES
1244 /* Better to catch this here, as otherwise the next use of this object
1245 * is likely to cause a crash. Better to find out where it is getting
1246 * improperly inserted.
1247 */
1248 abort ();
1249#endif
1250 return op;
1251 }
1252
1253 if (object *more = op->more)
1254 {
1255 if (!insert_ob_in_map (more, m, originator, flag))
1256 {
1257 if (!op->head)
1258 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1259
1260 return 0;
1261 }
1262 }
1263
1264 CLEAR_FLAG (op, FLAG_REMOVED);
1265 1235
1266 /* Ideally, the caller figures this out. However, it complicates a lot 1236 /* Ideally, the caller figures this out. However, it complicates a lot
1267 * of areas of callers (eg, anything that uses find_free_spot would now 1237 * of areas of callers (eg, anything that uses find_free_spot would now
1268 * need extra work 1238 * need extra work
1269 */ 1239 */
1270 if (!xy_normalise (m, op->x, op->y)) 1240 if (!xy_normalise (m, op->x, op->y))
1241 {
1242 op->destroy ();
1271 return 0; 1243 return 0;
1244 }
1245
1246 if (object *more = op->more)
1247 if (!insert_ob_in_map (more, m, originator, flag))
1248 return 0;
1249
1250 CLEAR_FLAG (op, FLAG_REMOVED);
1272 1251
1273 op->map = m; 1252 op->map = m;
1274 mapspace &ms = op->ms (); 1253 mapspace &ms = op->ms ();
1275 1254
1276 /* this has to be done after we translate the coordinates. 1255 /* this has to be done after we translate the coordinates.
1277 */ 1256 */
1278 if (op->nrof && !(flag & INS_NO_MERGE)) 1257 if (op->nrof && !(flag & INS_NO_MERGE))
1279 for (tmp = ms.bot; tmp; tmp = tmp->above) 1258 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1280 if (object::can_merge (op, tmp)) 1259 if (object::can_merge (op, tmp))
1281 { 1260 {
1282 op->nrof += tmp->nrof; 1261 op->nrof += tmp->nrof;
1283 tmp->destroy (); 1262 tmp->destroy ();
1284 } 1263 }
… …
1373 */ 1352 */
1374 if (last && last->below && last != floor) 1353 if (last && last->below && last != floor)
1375 top = last->below; 1354 top = last->below;
1376 } 1355 }
1377 } /* If objects on this space */ 1356 } /* If objects on this space */
1378
1379 if (flag & INS_MAP_LOAD) 1357 if (flag & INS_MAP_LOAD)
1380 top = ms.top; 1358 top = ms.top;
1381 1359
1382 if (flag & INS_ABOVE_FLOOR_ONLY) 1360 if (flag & INS_ABOVE_FLOOR_ONLY)
1383 top = floor; 1361 top = floor;
… …
1418 op->map->touch (); 1396 op->map->touch ();
1419 } 1397 }
1420 1398
1421 op->map->dirty = true; 1399 op->map->dirty = true;
1422 1400
1423 /* If we have a floor, we know the player, if any, will be above
1424 * it, so save a few ticks and start from there.
1425 */
1426 if (!(flag & INS_MAP_LOAD)) 1401 if (!(flag & INS_MAP_LOAD))
1427 if (object *pl = ms.player ()) 1402 if (object *pl = ms.player ())
1428 if (pl->contr->ns)
1429 pl->contr->ns->floorbox_update (); 1403 pl->contr->ns->floorbox_update ();
1430 1404
1431 /* If this object glows, it may affect lighting conditions that are 1405 /* If this object glows, it may affect lighting conditions that are
1432 * visible to others on this map. But update_all_los is really 1406 * visible to others on this map. But update_all_los is really
1433 * an inefficient way to do this, as it means los for all players 1407 * an inefficient way to do this, as it means los for all players
1434 * on the map will get recalculated. The players could very well 1408 * on the map will get recalculated. The players could very well
… …
1453 * blocked() and wall() work properly), and these flags are updated by 1427 * blocked() and wall() work properly), and these flags are updated by
1454 * update_object(). 1428 * update_object().
1455 */ 1429 */
1456 1430
1457 /* if this is not the head or flag has been passed, don't check walk on status */ 1431 /* if this is not the head or flag has been passed, don't check walk on status */
1458 if (!(flag & INS_NO_WALK_ON) && !op->head) 1432 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1459 { 1433 {
1460 if (check_move_on (op, originator)) 1434 if (check_move_on (op, originator))
1461 return 0; 1435 return 0;
1462 1436
1463 /* If we are a multi part object, lets work our way through the check 1437 /* If we are a multi part object, lets work our way through the check
1464 * walk on's. 1438 * walk on's.
1465 */ 1439 */
1466 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1440 for (object *tmp = op->more; tmp; tmp = tmp->more)
1467 if (check_move_on (tmp, originator)) 1441 if (check_move_on (tmp, originator))
1468 return 0; 1442 return 0;
1469 } 1443 }
1470 1444
1471 return op; 1445 return op;
… …
1481 object *tmp, *tmp1; 1455 object *tmp, *tmp1;
1482 1456
1483 /* first search for itself and remove any old instances */ 1457 /* first search for itself and remove any old instances */
1484 1458
1485 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1459 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1486 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1460 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1487 tmp->destroy (); 1461 tmp->destroy ();
1488 1462
1489 tmp1 = arch_to_object (archetype::find (arch_string)); 1463 tmp1 = arch_to_object (archetype::find (arch_string));
1490 1464
1491 tmp1->x = op->x; 1465 tmp1->x = op->x;
… …
1652 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1626 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1653 free (dump); 1627 free (dump);
1654 return op; 1628 return op;
1655 } 1629 }
1656 1630
1657 if (where->head) 1631 if (where->head_ () != where)
1658 { 1632 {
1659 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1633 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1660 where = where->head; 1634 where = where->head;
1661 } 1635 }
1662 1636
1663 return where->insert (op); 1637 return where->insert (op);
1664} 1638}
… …
1672 * be != op, if items are merged. -Tero 1646 * be != op, if items are merged. -Tero
1673 */ 1647 */
1674object * 1648object *
1675object::insert (object *op) 1649object::insert (object *op)
1676{ 1650{
1677 object *tmp, *otmp;
1678
1679 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1651 if (!QUERY_FLAG (op, FLAG_REMOVED))
1680 op->remove (); 1652 op->remove ();
1681 1653
1682 if (op->more) 1654 if (op->more)
1683 { 1655 {
… …
1685 return op; 1657 return op;
1686 } 1658 }
1687 1659
1688 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1660 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1689 CLEAR_FLAG (op, FLAG_REMOVED); 1661 CLEAR_FLAG (op, FLAG_REMOVED);
1662
1690 if (op->nrof) 1663 if (op->nrof)
1691 { 1664 {
1692 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1665 for (object *tmp = inv; tmp; tmp = tmp->below)
1693 if (object::can_merge (tmp, op)) 1666 if (object::can_merge (tmp, op))
1694 { 1667 {
1695 /* return the original object and remove inserted object 1668 /* return the original object and remove inserted object
1696 (client needs the original object) */ 1669 (client needs the original object) */
1697 tmp->nrof += op->nrof; 1670 tmp->nrof += op->nrof;
… …
1716 add_weight (this, op->weight * op->nrof); 1689 add_weight (this, op->weight * op->nrof);
1717 } 1690 }
1718 else 1691 else
1719 add_weight (this, (op->weight + op->carrying)); 1692 add_weight (this, (op->weight + op->carrying));
1720 1693
1721 otmp = this->in_player (); 1694 if (object *otmp = this->in_player ())
1722 if (otmp && otmp->contr)
1723 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1695 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1724 otmp->update_stats (); 1696 otmp->update_stats ();
1725 1697
1698 op->owner = 0; // its his/hers now. period.
1726 op->map = 0; 1699 op->map = 0;
1727 op->env = this; 1700 op->env = this;
1728 op->above = 0; 1701 op->above = 0;
1729 op->below = 0; 1702 op->below = 0;
1730 op->x = 0, op->y = 0; 1703 op->x = op->y = 0;
1731 1704
1732 /* reset the light list and los of the players on the map */ 1705 /* reset the light list and los of the players on the map */
1733 if ((op->glow_radius != 0) && map) 1706 if (op->glow_radius && map)
1734 { 1707 {
1735#ifdef DEBUG_LIGHTS 1708#ifdef DEBUG_LIGHTS
1736 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1709 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1737#endif /* DEBUG_LIGHTS */ 1710#endif /* DEBUG_LIGHTS */
1738 if (map->darkness) 1711 if (map->darkness)
… …
1992 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1965 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1993 { 1966 {
1994 CLEAR_FLAG (tmp, flag); 1967 CLEAR_FLAG (tmp, flag);
1995 unflag_inv (tmp, flag); 1968 unflag_inv (tmp, flag);
1996 } 1969 }
1997}
1998
1999/*
2000 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2001 * all it's inventory (recursively).
2002 * If checksums are used, a player will get set_cheat called for
2003 * him/her-self and all object carried by a call to this function.
2004 */
2005void
2006set_cheat (object *op)
2007{
2008 SET_FLAG (op, FLAG_WAS_WIZ);
2009 flag_inv (op, FLAG_WAS_WIZ);
2010} 1970}
2011 1971
2012/* 1972/*
2013 * find_free_spot(object, map, x, y, start, stop) will search for 1973 * find_free_spot(object, map, x, y, start, stop) will search for
2014 * a spot at the given map and coordinates which will be able to contain 1974 * a spot at the given map and coordinates which will be able to contain
… …
2031 * customized, changed states, etc. 1991 * customized, changed states, etc.
2032 */ 1992 */
2033int 1993int
2034find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1994find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2035{ 1995{
1996 int altern[SIZEOFFREE];
2036 int index = 0, flag; 1997 int index = 0, flag;
2037 int altern[SIZEOFFREE];
2038 1998
2039 for (int i = start; i < stop; i++) 1999 for (int i = start; i < stop; i++)
2040 { 2000 {
2041 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2001 mapxy pos (m, x, y); pos.move (i);
2042 if (!flag) 2002
2003 if (!pos.normalise ())
2004 continue;
2005
2006 mapspace &ms = *pos;
2007
2008 if (ms.flags () & P_IS_ALIVE)
2009 continue;
2010
2011 /* However, often
2012 * ob doesn't have any move type (when used to place exits)
2013 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2014 */
2015 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2016 {
2043 altern [index++] = i; 2017 altern [index++] = i;
2018 continue;
2019 }
2044 2020
2045 /* Basically, if we find a wall on a space, we cut down the search size. 2021 /* Basically, if we find a wall on a space, we cut down the search size.
2046 * In this way, we won't return spaces that are on another side of a wall. 2022 * In this way, we won't return spaces that are on another side of a wall.
2047 * This mostly work, but it cuts down the search size in all directions - 2023 * This mostly work, but it cuts down the search size in all directions -
2048 * if the space being examined only has a wall to the north and empty 2024 * if the space being examined only has a wall to the north and empty
2049 * spaces in all the other directions, this will reduce the search space 2025 * spaces in all the other directions, this will reduce the search space
2050 * to only the spaces immediately surrounding the target area, and 2026 * to only the spaces immediately surrounding the target area, and
2051 * won't look 2 spaces south of the target space. 2027 * won't look 2 spaces south of the target space.
2052 */ 2028 */
2053 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2029 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2030 {
2054 stop = maxfree[i]; 2031 stop = maxfree[i];
2032 continue;
2033 }
2034
2035 /* Note it is intentional that we check ob - the movement type of the
2036 * head of the object should correspond for the entire object.
2037 */
2038 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2039 continue;
2040
2041 altern [index++] = i;
2055 } 2042 }
2056 2043
2057 if (!index) 2044 if (!index)
2058 return -1; 2045 return -1;
2059 2046
… …
2068 */ 2055 */
2069int 2056int
2070find_first_free_spot (const object *ob, maptile *m, int x, int y) 2057find_first_free_spot (const object *ob, maptile *m, int x, int y)
2071{ 2058{
2072 for (int i = 0; i < SIZEOFFREE; i++) 2059 for (int i = 0; i < SIZEOFFREE; i++)
2073 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2060 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2074 return i; 2061 return i;
2075 2062
2076 return -1; 2063 return -1;
2077} 2064}
2078 2065
… …
2132 object *tmp; 2119 object *tmp;
2133 maptile *mp; 2120 maptile *mp;
2134 2121
2135 MoveType blocked, move_type; 2122 MoveType blocked, move_type;
2136 2123
2137 if (exclude && exclude->head) 2124 if (exclude && exclude->head_ () != exclude)
2138 { 2125 {
2139 exclude = exclude->head; 2126 exclude = exclude->head;
2140 move_type = exclude->move_type; 2127 move_type = exclude->move_type;
2141 } 2128 }
2142 else 2129 else
… …
2165 max = maxfree[i]; 2152 max = maxfree[i];
2166 else if (mflags & P_IS_ALIVE) 2153 else if (mflags & P_IS_ALIVE)
2167 { 2154 {
2168 for (tmp = ms.bot; tmp; tmp = tmp->above) 2155 for (tmp = ms.bot; tmp; tmp = tmp->above)
2169 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2156 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2170 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2157 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2171 break; 2158 break;
2172 2159
2173 if (tmp) 2160 if (tmp)
2174 return freedir[i]; 2161 return freedir[i];
2175 } 2162 }
… …
2355 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2342 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2356 * core dumps if they do. 2343 * core dumps if they do.
2357 * 2344 *
2358 * Add a check so we can't pick up invisible objects (0.93.8) 2345 * Add a check so we can't pick up invisible objects (0.93.8)
2359 */ 2346 */
2360
2361int 2347int
2362can_pick (const object *who, const object *item) 2348can_pick (const object *who, const object *item)
2363{ 2349{
2364 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2350 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2365 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2351 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2370 * create clone from object to another 2356 * create clone from object to another
2371 */ 2357 */
2372object * 2358object *
2373object_create_clone (object *asrc) 2359object_create_clone (object *asrc)
2374{ 2360{
2375 object *dst = 0, *tmp, *src, *part, *prev, *item; 2361 object *dst = 0, *tmp, *src, *prev, *item;
2376 2362
2377 if (!asrc) 2363 if (!asrc)
2378 return 0; 2364 return 0;
2379 2365
2380 src = asrc;
2381 if (src->head)
2382 src = src->head; 2366 src = asrc->head_ ();
2383 2367
2384 prev = 0; 2368 prev = 0;
2385 for (part = src; part; part = part->more) 2369 for (object *part = src; part; part = part->more)
2386 { 2370 {
2387 tmp = part->clone (); 2371 tmp = part->clone ();
2388 tmp->x -= src->x; 2372 tmp->x -= src->x;
2389 tmp->y -= src->y; 2373 tmp->y -= src->y;
2390 2374
… …
2503 /* Basically, if the archetype has this key set, 2487 /* Basically, if the archetype has this key set,
2504 * we need to store the null value so when we save 2488 * we need to store the null value so when we save
2505 * it, we save the empty value so that when we load, 2489 * it, we save the empty value so that when we load,
2506 * we get this value back again. 2490 * we get this value back again.
2507 */ 2491 */
2508 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2492 if (get_ob_key_link (op->arch, canonical_key))
2509 field->value = 0; 2493 field->value = 0;
2510 else 2494 else
2511 { 2495 {
2512 if (last) 2496 if (last)
2513 last->next = field->next; 2497 last->next = field->next;
… …
2582 } 2566 }
2583 else 2567 else
2584 item = item->env; 2568 item = item->env;
2585} 2569}
2586 2570
2587
2588const char * 2571const char *
2589object::flag_desc (char *desc, int len) const 2572object::flag_desc (char *desc, int len) const
2590{ 2573{
2591 char *p = desc; 2574 char *p = desc;
2592 bool first = true; 2575 bool first = true;
… …
2626 &name, 2609 &name,
2627 title ? "\",title:\"" : "", 2610 title ? "\",title:\"" : "",
2628 title ? (const char *)title : "", 2611 title ? (const char *)title : "",
2629 flag_desc (flagdesc, 512), type); 2612 flag_desc (flagdesc, 512), type);
2630 2613
2631 if (env) 2614 if (!this->flag[FLAG_REMOVED] && env)
2632 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2615 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2633 2616
2634 if (map) 2617 if (map)
2635 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2618 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2636 2619
… …
2654} 2637}
2655 2638
2656const materialtype_t * 2639const materialtype_t *
2657object::dominant_material () const 2640object::dominant_material () const
2658{ 2641{
2659 if (materialtype_t *mat = name_to_material (materialname)) 2642 if (materialtype_t *mt = name_to_material (materialname))
2660 return mat; 2643 return mt;
2661 2644
2662 // omfg this is slow, this has to be temporary :)
2663 shstr unknown ("unknown");
2664
2665 return name_to_material (unknown); 2645 return name_to_material (shstr_unknown);
2666} 2646}
2667 2647
2668void 2648void
2669object::open_container (object *new_container) 2649object::open_container (object *new_container)
2670{ 2650{
… …
2686 old_container->flag [FLAG_APPLIED] = 0; 2666 old_container->flag [FLAG_APPLIED] = 0;
2687 container = 0; 2667 container = 0;
2688 2668
2689 esrv_update_item (UPD_FLAGS, this, old_container); 2669 esrv_update_item (UPD_FLAGS, this, old_container);
2690 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2670 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2671 play_sound (sound_find ("chest_close"));
2691 } 2672 }
2692 2673
2693 if (new_container) 2674 if (new_container)
2694 { 2675 {
2695 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2676 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2711 new_container->flag [FLAG_APPLIED] = 1; 2692 new_container->flag [FLAG_APPLIED] = 1;
2712 container = new_container; 2693 container = new_container;
2713 2694
2714 esrv_update_item (UPD_FLAGS, this, new_container); 2695 esrv_update_item (UPD_FLAGS, this, new_container);
2715 esrv_send_inventory (this, new_container); 2696 esrv_send_inventory (this, new_container);
2697 play_sound (sound_find ("chest_open"));
2698 }
2699}
2700
2701object *
2702object::force_find (const shstr name)
2703{
2704 /* cycle through his inventory to look for the MARK we want to
2705 * place
2706 */
2707 for (object *tmp = inv; tmp; tmp = tmp->below)
2708 if (tmp->type == FORCE && tmp->slaying == name)
2709 return splay (tmp);
2710
2711 return 0;
2712}
2713
2714void
2715object::force_add (const shstr name, int duration)
2716{
2717 if (object *force = force_find (name))
2718 force->destroy ();
2719
2720 object *force = get_archetype (FORCE_NAME);
2721
2722 force->slaying = name;
2723 force->stats.food = 1;
2724 force->speed_left = -1.f;
2725
2726 force->set_speed (duration ? 1.f / duration : 0.f);
2727 force->flag [FLAG_IS_USED_UP] = true;
2728 force->flag [FLAG_APPLIED] = true;
2729
2730 insert (force);
2731}
2732
2733void
2734object::play_sound (faceidx sound) const
2735{
2736 if (!sound)
2737 return;
2738
2739 if (flag [FLAG_REMOVED])
2740 return;
2741
2742 if (env)
2716 } 2743 {
2744 if (object *pl = in_player ())
2745 pl->contr->play_sound (sound);
2746 }
2747 else
2748 map->play_sound (sound, x, y);
2717} 2749}
2718 2750
2719

Diff Legend

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