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.147 by root, Sat May 12 16:06:42 2007 UTC vs.
Revision 1.197 by root, Wed Oct 17 22:04:31 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. */
… …
255 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
256 * check all objects in the inventory. 255 * check all objects in the inventory.
257 */ 256 */
258 if (ob1->inv || ob2->inv) 257 if (ob1->inv || ob2->inv)
259 { 258 {
260 /* if one object has inventory but the other doesn't, not equiv */ 259 if (!(ob1->inv && ob2->inv))
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 260 return 0; /* inventories differ in length */
262 return 0;
263 261
264 /* Now check to see if the two inventory objects could merge */ 262 if (ob1->inv->below || ob2->inv->below)
263 return 0; /* more than one object in inv */
264
265 if (!object::can_merge (ob1->inv, ob2->inv)) 265 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 266 return 0; /* inventory objexts differ */
267 267
268 /* inventory ok - still need to check rest of this object to see 268 /* inventory ok - still need to check rest of this object to see
269 * if it is valid. 269 * if it is valid.
270 */ 270 */
271 } 271 }
… …
300 return 0; 300 return 0;
301 else if (!compare_ob_value_lists (ob1, ob2)) 301 else if (!compare_ob_value_lists (ob1, ob2))
302 return 0; 302 return 0;
303 } 303 }
304 304
305 //TODO: generate an event or call into perl for additional checks
306 if (ob1->self || ob2->self) 305 if (ob1->self || ob2->self)
307 { 306 {
308 ob1->optimise (); 307 ob1->optimise ();
309 ob2->optimise (); 308 ob2->optimise ();
310 309
311 if (ob1->self || ob2->self) 310 if (ob1->self || ob2->self)
311 {
312 int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
313 int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
314
315 if (k1 != k2)
312 return 0; 316 return 0;
317 else if (k1 == 0)
318 return 1;
319 else if (!cfperl_can_merge (ob1, ob2))
320 return 0;
321 }
313 } 322 }
314 323
315 /* Everything passes, must be OK. */ 324 /* Everything passes, must be OK. */
316 return 1; 325 return 1;
317} 326}
… …
375/* 384/*
376 * get_nearest_part(multi-object, object 2) returns the part of the 385 * get_nearest_part(multi-object, object 2) returns the part of the
377 * multi-object 1 which is closest to the second object. 386 * multi-object 1 which is closest to the second object.
378 * If it's not a multi-object, it is returned. 387 * If it's not a multi-object, it is returned.
379 */ 388 */
380
381object * 389object *
382get_nearest_part (object *op, const object *pl) 390get_nearest_part (object *op, const object *pl)
383{ 391{
384 object *tmp, *closest; 392 object *tmp, *closest;
385 int last_dist, i; 393 int last_dist, i;
… …
430} 438}
431 439
432/* 440/*
433 * Sets the owner and sets the skill and exp pointers to owner's current 441 * Sets the owner and sets the skill and exp pointers to owner's current
434 * skill and experience objects. 442 * skill and experience objects.
443 * ACTUALLY NO! investigate! TODO
435 */ 444 */
436void 445void
437object::set_owner (object *owner) 446object::set_owner (object *owner)
438{ 447{
448 // allow objects which own objects
439 if (!owner) 449 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) 450 while (owner->owner)
450 owner = owner->owner; 451 owner = owner->owner;
451 452
452 this->owner = owner; 453 this->owner = owner;
454}
455
456int
457object::slottype () const
458{
459 if (type == SKILL)
460 {
461 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
462 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
463 }
464 else
465 {
466 if (slot [body_combat].info) return slot_combat;
467 if (slot [body_range ].info) return slot_ranged;
468 }
469
470 return slot_none;
453} 471}
454 472
455bool 473bool
456object::change_weapon (object *ob) 474object::change_weapon (object *ob)
457{ 475{
… …
478 { 496 {
479 current_weapon = chosen_skill = 0; 497 current_weapon = chosen_skill = 0;
480 update_stats (); 498 update_stats ();
481 499
482 new_draw_info_format (NDI_UNIQUE, 0, this, 500 new_draw_info_format (NDI_UNIQUE, 0, this,
483 "You try to balance your applied items all at once, but the %s is too much. " 501 "You try to balance all your items at once, "
502 "but the %s is just too much for your body. "
484 "You need to unapply some items first.", &ob->name); 503 "[You need to unapply some items first.]", &ob->name);
485 return false; 504 return false;
486 } 505 }
487 506
488 new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 507 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
489 } 508 }
490 else 509 else
491 new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons."); 510 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
511
512 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
513 {
514 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
515 &name, ob->debug_desc ());
516 return false;
517 }
492 518
493 return true; 519 return true;
494} 520}
495 521
496/* Zero the key_values on op, decrementing the shared-string 522/* Zero the key_values on op, decrementing the shared-string
… …
562object::copy_to (object *dst) 588object::copy_to (object *dst)
563{ 589{
564 *dst = *this; 590 *dst = *this;
565 591
566 if (speed < 0) 592 if (speed < 0)
567 dst->speed_left = speed_left - rndm (); 593 dst->speed_left -= rndm ();
568 594
569 dst->set_speed (dst->speed); 595 dst->set_speed (dst->speed);
570} 596}
571 597
572void 598void
… …
899 925
900 if (!freed_map) 926 if (!freed_map)
901 { 927 {
902 freed_map = new maptile; 928 freed_map = new maptile;
903 929
930 freed_map->path = "<freed objects map>";
904 freed_map->name = "/internal/freed_objects_map"; 931 freed_map->name = "/internal/freed_objects_map";
905 freed_map->width = 3; 932 freed_map->width = 3;
906 freed_map->height = 3; 933 freed_map->height = 3;
907 934
908 freed_map->alloc (); 935 freed_map->alloc ();
… …
912 map = freed_map; 939 map = freed_map;
913 x = 1; 940 x = 1;
914 y = 1; 941 y = 1;
915 } 942 }
916 943
917 head = 0;
918
919 if (more) 944 if (more)
920 { 945 {
921 more->destroy (); 946 more->destroy ();
922 more = 0; 947 more = 0;
923 } 948 }
924 949
950 head = 0;
951
925 // clear those pointers that likely might have circular references to us 952 // clear those pointers that likely might cause circular references
926 owner = 0; 953 owner = 0;
927 enemy = 0; 954 enemy = 0;
928 attacked_by = 0; 955 attacked_by = 0;
956 current_weapon = 0;
929} 957}
930 958
931void 959void
932object::destroy (bool destroy_inventory) 960object::destroy (bool destroy_inventory)
933{ 961{
934 if (destroyed ()) 962 if (destroyed ())
935 return; 963 return;
936 964
937 if (destroy_inventory) 965 if (destroy_inventory)
938 destroy_inv (false); 966 destroy_inv (false);
967
968 if (is_head ())
969 if (sound_destroy)
970 play_sound (sound_destroy);
971 else if (flag [FLAG_MONSTER])
972 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
939 973
940 attachable::destroy (); 974 attachable::destroy ();
941} 975}
942 976
943/* 977/*
… …
1058 if (map->in_memory == MAP_SAVING) 1092 if (map->in_memory == MAP_SAVING)
1059 return; 1093 return;
1060 1094
1061 int check_walk_off = !flag [FLAG_NO_APPLY]; 1095 int check_walk_off = !flag [FLAG_NO_APPLY];
1062 1096
1097 if (object *pl = ms.player ())
1098 {
1099 if (pl->container == this)
1100 /* If a container that the player is currently using somehow gets
1101 * removed (most likely destroyed), update the player view
1102 * appropriately.
1103 */
1104 pl->close_container ();
1105
1106 pl->contr->ns->floorbox_update ();
1107 }
1108
1063 for (tmp = ms.bot; tmp; tmp = tmp->above) 1109 for (tmp = ms.bot; tmp; tmp = tmp->above)
1064 { 1110 {
1065 /* No point updating the players look faces if he is the object 1111 /* No point updating the players look faces if he is the object
1066 * being removed. 1112 * being removed.
1067 */ 1113 */
1068
1069 if (tmp->type == PLAYER && tmp != this)
1070 {
1071 /* If a container that the player is currently using somehow gets
1072 * removed (most likely destroyed), update the player view
1073 * appropriately.
1074 */
1075 if (tmp->container == this)
1076 {
1077 flag [FLAG_APPLIED] = 0;
1078 tmp->container = 0;
1079 }
1080
1081 if (tmp->contr->ns)
1082 tmp->contr->ns->floorbox_update ();
1083 }
1084 1114
1085 /* See if object moving off should effect something */ 1115 /* See if object moving off should effect something */
1086 if (check_walk_off 1116 if (check_walk_off
1087 && ((move_type & tmp->move_off) 1117 && ((move_type & tmp->move_off)
1088 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1118 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1091 1121
1092 if (destroyed ()) 1122 if (destroyed ())
1093 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1123 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1094 } 1124 }
1095 1125
1096 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1097 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1098 if (tmp->above == tmp)
1099 tmp->above = 0;
1100
1101 last = tmp; 1126 last = tmp;
1102 } 1127 }
1103 1128
1104 /* last == NULL if there are no objects on this space */ 1129 /* last == NULL if there are no objects on this space */
1105 //TODO: this makes little sense, why only update the topmost object? 1130 //TODO: this makes little sense, why only update the topmost object?
… …
1125merge_ob (object *op, object *top) 1150merge_ob (object *op, object *top)
1126{ 1151{
1127 if (!op->nrof) 1152 if (!op->nrof)
1128 return 0; 1153 return 0;
1129 1154
1130 if (top) 1155 if (!top)
1131 for (top = op; top && top->above; top = top->above) 1156 for (top = op; top && top->above; top = top->above)
1132 ; 1157 ;
1133 1158
1134 for (; top; top = top->below) 1159 for (; top; top = top->below)
1135 { 1160 {
… …
1156 if (more) 1181 if (more)
1157 return; 1182 return;
1158 1183
1159 object *prev = this; 1184 object *prev = this;
1160 1185
1161 for (archetype *at = arch->more; at; at = at->more) 1186 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1162 { 1187 {
1163 object *op = arch_to_object (at); 1188 object *op = arch_to_object (at);
1164 1189
1165 op->name = name; 1190 op->name = name;
1166 op->name_pl = name_pl; 1191 op->name_pl = name_pl;
… …
1180object * 1205object *
1181insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1206insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1182{ 1207{
1183 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1208 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1184 { 1209 {
1185 tmp->x = x + tmp->arch->clone.x; 1210 tmp->x = x + tmp->arch->x;
1186 tmp->y = y + tmp->arch->clone.y; 1211 tmp->y = y + tmp->arch->y;
1187 } 1212 }
1188 1213
1189 return insert_ob_in_map (op, m, originator, flag); 1214 return insert_ob_in_map (op, m, originator, flag);
1190} 1215}
1191 1216
… …
1212object * 1237object *
1213insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1238insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1214{ 1239{
1215 assert (!op->flag [FLAG_FREED]); 1240 assert (!op->flag [FLAG_FREED]);
1216 1241
1217 object *tmp, *top, *floor = NULL; 1242 object *top, *floor = NULL;
1218 1243
1219 op->remove (); 1244 op->remove ();
1220
1221#if 0
1222 if (!m->active != !op->active)
1223 if (m->active)
1224 op->activate_recursive ();
1225 else
1226 op->deactivate_recursive ();
1227#endif
1228
1229 if (out_of_map (m, op->x, op->y))
1230 {
1231 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1232#ifdef MANY_CORES
1233 /* Better to catch this here, as otherwise the next use of this object
1234 * is likely to cause a crash. Better to find out where it is getting
1235 * improperly inserted.
1236 */
1237 abort ();
1238#endif
1239 return op;
1240 }
1241
1242 if (object *more = op->more)
1243 {
1244 if (!insert_ob_in_map (more, m, originator, flag))
1245 {
1246 if (!op->head)
1247 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1248
1249 return 0;
1250 }
1251 }
1252
1253 CLEAR_FLAG (op, FLAG_REMOVED);
1254 1245
1255 /* Ideally, the caller figures this out. However, it complicates a lot 1246 /* Ideally, the caller figures this out. However, it complicates a lot
1256 * of areas of callers (eg, anything that uses find_free_spot would now 1247 * of areas of callers (eg, anything that uses find_free_spot would now
1257 * need extra work 1248 * need extra work
1258 */ 1249 */
1259 if (!xy_normalise (m, op->x, op->y)) 1250 if (!xy_normalise (m, op->x, op->y))
1251 {
1252 op->destroy ();
1260 return 0; 1253 return 0;
1254 }
1255
1256 if (object *more = op->more)
1257 if (!insert_ob_in_map (more, m, originator, flag))
1258 return 0;
1259
1260 CLEAR_FLAG (op, FLAG_REMOVED);
1261 1261
1262 op->map = m; 1262 op->map = m;
1263 mapspace &ms = op->ms (); 1263 mapspace &ms = op->ms ();
1264 1264
1265 /* this has to be done after we translate the coordinates. 1265 /* this has to be done after we translate the coordinates.
1266 */ 1266 */
1267 if (op->nrof && !(flag & INS_NO_MERGE)) 1267 if (op->nrof && !(flag & INS_NO_MERGE))
1268 for (tmp = ms.bot; tmp; tmp = tmp->above) 1268 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1269 if (object::can_merge (op, tmp)) 1269 if (object::can_merge (op, tmp))
1270 { 1270 {
1271 op->nrof += tmp->nrof; 1271 op->nrof += tmp->nrof;
1272 tmp->destroy (); 1272 tmp->destroy ();
1273 } 1273 }
… …
1300 else 1300 else
1301 { 1301 {
1302 top = ms.bot; 1302 top = ms.bot;
1303 1303
1304 /* If there are other objects, then */ 1304 /* If there are other objects, then */
1305 if ((!(flag & INS_MAP_LOAD)) && top) 1305 if (top)
1306 { 1306 {
1307 object *last = 0; 1307 object *last = 0;
1308 1308
1309 /* 1309 /*
1310 * If there are multiple objects on this space, we do some trickier handling. 1310 * If there are multiple objects on this space, we do some trickier handling.
… …
1363 if (last && last->below && last != floor) 1363 if (last && last->below && last != floor)
1364 top = last->below; 1364 top = last->below;
1365 } 1365 }
1366 } /* If objects on this space */ 1366 } /* If objects on this space */
1367 1367
1368 if (flag & INS_MAP_LOAD)
1369 top = ms.top;
1370
1371 if (flag & INS_ABOVE_FLOOR_ONLY) 1368 if (flag & INS_ABOVE_FLOOR_ONLY)
1372 top = floor; 1369 top = floor;
1373 1370
1374 /* Top is the object that our object (op) is going to get inserted above. 1371 /* Top is the object that our object (op) is going to get inserted above.
1375 */ 1372 */
… …
1407 op->map->touch (); 1404 op->map->touch ();
1408 } 1405 }
1409 1406
1410 op->map->dirty = true; 1407 op->map->dirty = true;
1411 1408
1412 /* If we have a floor, we know the player, if any, will be above
1413 * it, so save a few ticks and start from there.
1414 */
1415 if (!(flag & INS_MAP_LOAD))
1416 if (object *pl = ms.player ()) 1409 if (object *pl = ms.player ())
1417 if (pl->contr->ns)
1418 pl->contr->ns->floorbox_update (); 1410 pl->contr->ns->floorbox_update ();
1419 1411
1420 /* If this object glows, it may affect lighting conditions that are 1412 /* If this object glows, it may affect lighting conditions that are
1421 * visible to others on this map. But update_all_los is really 1413 * visible to others on this map. But update_all_los is really
1422 * an inefficient way to do this, as it means los for all players 1414 * an inefficient way to do this, as it means los for all players
1423 * on the map will get recalculated. The players could very well 1415 * on the map will get recalculated. The players could very well
… …
1442 * blocked() and wall() work properly), and these flags are updated by 1434 * blocked() and wall() work properly), and these flags are updated by
1443 * update_object(). 1435 * update_object().
1444 */ 1436 */
1445 1437
1446 /* if this is not the head or flag has been passed, don't check walk on status */ 1438 /* if this is not the head or flag has been passed, don't check walk on status */
1447 if (!(flag & INS_NO_WALK_ON) && !op->head) 1439 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1448 { 1440 {
1449 if (check_move_on (op, originator)) 1441 if (check_move_on (op, originator))
1450 return 0; 1442 return 0;
1451 1443
1452 /* If we are a multi part object, lets work our way through the check 1444 /* If we are a multi part object, lets work our way through the check
1453 * walk on's. 1445 * walk on's.
1454 */ 1446 */
1455 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1447 for (object *tmp = op->more; tmp; tmp = tmp->more)
1456 if (check_move_on (tmp, originator)) 1448 if (check_move_on (tmp, originator))
1457 return 0; 1449 return 0;
1458 } 1450 }
1459 1451
1460 return op; 1452 return op;
… …
1470 object *tmp, *tmp1; 1462 object *tmp, *tmp1;
1471 1463
1472 /* first search for itself and remove any old instances */ 1464 /* first search for itself and remove any old instances */
1473 1465
1474 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1466 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1475 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1467 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1476 tmp->destroy (); 1468 tmp->destroy ();
1477 1469
1478 tmp1 = arch_to_object (archetype::find (arch_string)); 1470 tmp1 = arch_to_object (archetype::find (arch_string));
1479 1471
1480 tmp1->x = op->x; 1472 tmp1->x = op->x;
… …
1641 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1633 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1642 free (dump); 1634 free (dump);
1643 return op; 1635 return op;
1644 } 1636 }
1645 1637
1646 if (where->head) 1638 if (where->head_ () != where)
1647 { 1639 {
1648 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1640 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1649 where = where->head; 1641 where = where->head;
1650 } 1642 }
1651 1643
1652 return where->insert (op); 1644 return where->insert (op);
1653} 1645}
… …
1661 * be != op, if items are merged. -Tero 1653 * be != op, if items are merged. -Tero
1662 */ 1654 */
1663object * 1655object *
1664object::insert (object *op) 1656object::insert (object *op)
1665{ 1657{
1666 object *tmp, *otmp;
1667
1668 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1658 if (!QUERY_FLAG (op, FLAG_REMOVED))
1669 op->remove (); 1659 op->remove ();
1670 1660
1671 if (op->more) 1661 if (op->more)
1672 { 1662 {
… …
1674 return op; 1664 return op;
1675 } 1665 }
1676 1666
1677 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1667 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1678 CLEAR_FLAG (op, FLAG_REMOVED); 1668 CLEAR_FLAG (op, FLAG_REMOVED);
1669
1679 if (op->nrof) 1670 if (op->nrof)
1680 { 1671 {
1681 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1672 for (object *tmp = inv; tmp; tmp = tmp->below)
1682 if (object::can_merge (tmp, op)) 1673 if (object::can_merge (tmp, op))
1683 { 1674 {
1684 /* return the original object and remove inserted object 1675 /* return the original object and remove inserted object
1685 (client needs the original object) */ 1676 (client needs the original object) */
1686 tmp->nrof += op->nrof; 1677 tmp->nrof += op->nrof;
… …
1705 add_weight (this, op->weight * op->nrof); 1696 add_weight (this, op->weight * op->nrof);
1706 } 1697 }
1707 else 1698 else
1708 add_weight (this, (op->weight + op->carrying)); 1699 add_weight (this, (op->weight + op->carrying));
1709 1700
1710 otmp = this->in_player (); 1701 if (object *otmp = this->in_player ())
1711 if (otmp && otmp->contr)
1712 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1702 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1713 otmp->update_stats (); 1703 otmp->update_stats ();
1714 1704
1705 op->owner = 0; // its his/hers now. period.
1715 op->map = 0; 1706 op->map = 0;
1716 op->env = this; 1707 op->env = this;
1717 op->above = 0; 1708 op->above = 0;
1718 op->below = 0; 1709 op->below = 0;
1719 op->x = 0, op->y = 0; 1710 op->x = op->y = 0;
1720 1711
1721 /* reset the light list and los of the players on the map */ 1712 /* reset the light list and los of the players on the map */
1722 if ((op->glow_radius != 0) && map) 1713 if (op->glow_radius && map)
1723 { 1714 {
1724#ifdef DEBUG_LIGHTS 1715#ifdef DEBUG_LIGHTS
1725 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1716 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1726#endif /* DEBUG_LIGHTS */ 1717#endif /* DEBUG_LIGHTS */
1727 if (map->darkness) 1718 if (map->darkness)
… …
1961 * activate recursively a flag on an object inventory 1952 * activate recursively a flag on an object inventory
1962 */ 1953 */
1963void 1954void
1964flag_inv (object *op, int flag) 1955flag_inv (object *op, int flag)
1965{ 1956{
1966 if (op->inv)
1967 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1957 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1968 { 1958 {
1969 SET_FLAG (tmp, flag); 1959 SET_FLAG (tmp, flag);
1970 flag_inv (tmp, flag); 1960 flag_inv (tmp, flag);
1971 } 1961 }
1972} 1962}
1973 1963
1974/* 1964/*
1975 * deactivate recursively a flag on an object inventory 1965 * deactivate recursively a flag on an object inventory
1976 */ 1966 */
1977void 1967void
1978unflag_inv (object *op, int flag) 1968unflag_inv (object *op, int flag)
1979{ 1969{
1980 if (op->inv)
1981 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1970 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1982 { 1971 {
1983 CLEAR_FLAG (tmp, flag); 1972 CLEAR_FLAG (tmp, flag);
1984 unflag_inv (tmp, flag); 1973 unflag_inv (tmp, flag);
1985 } 1974 }
1986}
1987
1988/*
1989 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1990 * all it's inventory (recursively).
1991 * If checksums are used, a player will get set_cheat called for
1992 * him/her-self and all object carried by a call to this function.
1993 */
1994void
1995set_cheat (object *op)
1996{
1997 SET_FLAG (op, FLAG_WAS_WIZ);
1998 flag_inv (op, FLAG_WAS_WIZ);
1999} 1975}
2000 1976
2001/* 1977/*
2002 * find_free_spot(object, map, x, y, start, stop) will search for 1978 * find_free_spot(object, map, x, y, start, stop) will search for
2003 * a spot at the given map and coordinates which will be able to contain 1979 * a spot at the given map and coordinates which will be able to contain
… …
2005 * to search (see the freearr_x/y[] definition). 1981 * to search (see the freearr_x/y[] definition).
2006 * It returns a random choice among the alternatives found. 1982 * It returns a random choice among the alternatives found.
2007 * start and stop are where to start relative to the free_arr array (1,9 1983 * start and stop are where to start relative to the free_arr array (1,9
2008 * does all 4 immediate directions). This returns the index into the 1984 * does all 4 immediate directions). This returns the index into the
2009 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1985 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2010 * Note - this only checks to see if there is space for the head of the
2011 * object - if it is a multispace object, this should be called for all
2012 * pieces.
2013 * Note2: This function does correctly handle tiled maps, but does not 1986 * Note: This function does correctly handle tiled maps, but does not
2014 * inform the caller. However, insert_ob_in_map will update as 1987 * inform the caller. However, insert_ob_in_map will update as
2015 * necessary, so the caller shouldn't need to do any special work. 1988 * necessary, so the caller shouldn't need to do any special work.
2016 * Note - updated to take an object instead of archetype - this is necessary 1989 * Note - updated to take an object instead of archetype - this is necessary
2017 * because arch_blocked (now ob_blocked) needs to know the movement type 1990 * because arch_blocked (now ob_blocked) needs to know the movement type
2018 * to know if the space in question will block the object. We can't use 1991 * to know if the space in question will block the object. We can't use
… …
2020 * customized, changed states, etc. 1993 * customized, changed states, etc.
2021 */ 1994 */
2022int 1995int
2023find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 1996find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2024{ 1997{
1998 int altern[SIZEOFFREE];
2025 int index = 0, flag; 1999 int index = 0, flag;
2026 int altern[SIZEOFFREE];
2027 2000
2028 for (int i = start; i < stop; i++) 2001 for (int i = start; i < stop; i++)
2029 { 2002 {
2030 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2003 mapxy pos (m, x, y); pos.move (i);
2031 if (!flag) 2004
2005 if (!pos.normalise ())
2006 continue;
2007
2008 mapspace &ms = *pos;
2009
2010 if (ms.flags () & P_IS_ALIVE)
2011 continue;
2012
2013 /* However, often
2014 * ob doesn't have any move type (when used to place exits)
2015 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2016 */
2017 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2018 {
2032 altern [index++] = i; 2019 altern [index++] = i;
2020 continue;
2021 }
2033 2022
2034 /* Basically, if we find a wall on a space, we cut down the search size. 2023 /* Basically, if we find a wall on a space, we cut down the search size.
2035 * In this way, we won't return spaces that are on another side of a wall. 2024 * In this way, we won't return spaces that are on another side of a wall.
2036 * This mostly work, but it cuts down the search size in all directions - 2025 * This mostly work, but it cuts down the search size in all directions -
2037 * if the space being examined only has a wall to the north and empty 2026 * if the space being examined only has a wall to the north and empty
2038 * spaces in all the other directions, this will reduce the search space 2027 * spaces in all the other directions, this will reduce the search space
2039 * to only the spaces immediately surrounding the target area, and 2028 * to only the spaces immediately surrounding the target area, and
2040 * won't look 2 spaces south of the target space. 2029 * won't look 2 spaces south of the target space.
2041 */ 2030 */
2042 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2031 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2032 {
2043 stop = maxfree[i]; 2033 stop = maxfree[i];
2034 continue;
2035 }
2036
2037 /* Note it is intentional that we check ob - the movement type of the
2038 * head of the object should correspond for the entire object.
2039 */
2040 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2041 continue;
2042
2043 if (ob->blocked (m, pos.x, pos.y))
2044 continue;
2045
2046 altern [index++] = i;
2044 } 2047 }
2045 2048
2046 if (!index) 2049 if (!index)
2047 return -1; 2050 return -1;
2048 2051
… …
2057 */ 2060 */
2058int 2061int
2059find_first_free_spot (const object *ob, maptile *m, int x, int y) 2062find_first_free_spot (const object *ob, maptile *m, int x, int y)
2060{ 2063{
2061 for (int i = 0; i < SIZEOFFREE; i++) 2064 for (int i = 0; i < SIZEOFFREE; i++)
2062 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2065 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2063 return i; 2066 return i;
2064 2067
2065 return -1; 2068 return -1;
2066} 2069}
2067 2070
… …
2121 object *tmp; 2124 object *tmp;
2122 maptile *mp; 2125 maptile *mp;
2123 2126
2124 MoveType blocked, move_type; 2127 MoveType blocked, move_type;
2125 2128
2126 if (exclude && exclude->head) 2129 if (exclude && exclude->head_ () != exclude)
2127 { 2130 {
2128 exclude = exclude->head; 2131 exclude = exclude->head;
2129 move_type = exclude->move_type; 2132 move_type = exclude->move_type;
2130 } 2133 }
2131 else 2134 else
… …
2154 max = maxfree[i]; 2157 max = maxfree[i];
2155 else if (mflags & P_IS_ALIVE) 2158 else if (mflags & P_IS_ALIVE)
2156 { 2159 {
2157 for (tmp = ms.bot; tmp; tmp = tmp->above) 2160 for (tmp = ms.bot; tmp; tmp = tmp->above)
2158 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2161 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2159 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2162 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2160 break; 2163 break;
2161 2164
2162 if (tmp) 2165 if (tmp)
2163 return freedir[i]; 2166 return freedir[i];
2164 } 2167 }
… …
2344 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2347 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2345 * core dumps if they do. 2348 * core dumps if they do.
2346 * 2349 *
2347 * Add a check so we can't pick up invisible objects (0.93.8) 2350 * Add a check so we can't pick up invisible objects (0.93.8)
2348 */ 2351 */
2349
2350int 2352int
2351can_pick (const object *who, const object *item) 2353can_pick (const object *who, const object *item)
2352{ 2354{
2353 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2355 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2354 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2356 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2359 * create clone from object to another 2361 * create clone from object to another
2360 */ 2362 */
2361object * 2363object *
2362object_create_clone (object *asrc) 2364object_create_clone (object *asrc)
2363{ 2365{
2364 object *dst = 0, *tmp, *src, *part, *prev, *item; 2366 object *dst = 0, *tmp, *src, *prev, *item;
2365 2367
2366 if (!asrc) 2368 if (!asrc)
2367 return 0; 2369 return 0;
2368 2370
2369 src = asrc;
2370 if (src->head)
2371 src = src->head; 2371 src = asrc->head_ ();
2372 2372
2373 prev = 0; 2373 prev = 0;
2374 for (part = src; part; part = part->more) 2374 for (object *part = src; part; part = part->more)
2375 { 2375 {
2376 tmp = part->clone (); 2376 tmp = part->clone ();
2377 tmp->x -= src->x; 2377 tmp->x -= src->x;
2378 tmp->y -= src->y; 2378 tmp->y -= src->y;
2379 2379
… …
2492 /* Basically, if the archetype has this key set, 2492 /* Basically, if the archetype has this key set,
2493 * we need to store the null value so when we save 2493 * we need to store the null value so when we save
2494 * it, we save the empty value so that when we load, 2494 * it, we save the empty value so that when we load,
2495 * we get this value back again. 2495 * we get this value back again.
2496 */ 2496 */
2497 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2497 if (get_ob_key_link (op->arch, canonical_key))
2498 field->value = 0; 2498 field->value = 0;
2499 else 2499 else
2500 { 2500 {
2501 if (last) 2501 if (last)
2502 last->next = field->next; 2502 last->next = field->next;
… …
2571 } 2571 }
2572 else 2572 else
2573 item = item->env; 2573 item = item->env;
2574} 2574}
2575 2575
2576
2577const char * 2576const char *
2578object::flag_desc (char *desc, int len) const 2577object::flag_desc (char *desc, int len) const
2579{ 2578{
2580 char *p = desc; 2579 char *p = desc;
2581 bool first = true; 2580 bool first = true;
… …
2615 &name, 2614 &name,
2616 title ? "\",title:\"" : "", 2615 title ? "\",title:\"" : "",
2617 title ? (const char *)title : "", 2616 title ? (const char *)title : "",
2618 flag_desc (flagdesc, 512), type); 2617 flag_desc (flagdesc, 512), type);
2619 2618
2620 if (env) 2619 if (!this->flag[FLAG_REMOVED] && env)
2621 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2620 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2622 2621
2623 if (map) 2622 if (map)
2624 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2623 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2625 2624
… …
2643} 2642}
2644 2643
2645const materialtype_t * 2644const materialtype_t *
2646object::dominant_material () const 2645object::dominant_material () const
2647{ 2646{
2648 if (materialtype_t *mat = name_to_material (materialname)) 2647 if (materialtype_t *mt = name_to_material (materialname))
2649 return mat; 2648 return mt;
2650 2649
2651 // omfg this is slow, this has to be temporary :)
2652 shstr unknown ("unknown");
2653
2654 return name_to_material (unknown); 2650 return name_to_material (shstr_unknown);
2655} 2651}
2656 2652
2657void 2653void
2658object::open_container (object *new_container) 2654object::open_container (object *new_container)
2659{ 2655{
… …
2675 old_container->flag [FLAG_APPLIED] = 0; 2671 old_container->flag [FLAG_APPLIED] = 0;
2676 container = 0; 2672 container = 0;
2677 2673
2678 esrv_update_item (UPD_FLAGS, this, old_container); 2674 esrv_update_item (UPD_FLAGS, this, old_container);
2679 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2675 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2676 play_sound (sound_find ("chest_close"));
2680 } 2677 }
2681 2678
2682 if (new_container) 2679 if (new_container)
2683 { 2680 {
2684 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2681 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2700 new_container->flag [FLAG_APPLIED] = 1; 2697 new_container->flag [FLAG_APPLIED] = 1;
2701 container = new_container; 2698 container = new_container;
2702 2699
2703 esrv_update_item (UPD_FLAGS, this, new_container); 2700 esrv_update_item (UPD_FLAGS, this, new_container);
2704 esrv_send_inventory (this, new_container); 2701 esrv_send_inventory (this, new_container);
2702 play_sound (sound_find ("chest_open"));
2703 }
2704}
2705
2706object *
2707object::force_find (const shstr name)
2708{
2709 /* cycle through his inventory to look for the MARK we want to
2710 * place
2711 */
2712 for (object *tmp = inv; tmp; tmp = tmp->below)
2713 if (tmp->type == FORCE && tmp->slaying == name)
2714 return splay (tmp);
2715
2716 return 0;
2717}
2718
2719void
2720object::force_add (const shstr name, int duration)
2721{
2722 if (object *force = force_find (name))
2723 force->destroy ();
2724
2725 object *force = get_archetype (FORCE_NAME);
2726
2727 force->slaying = name;
2728 force->stats.food = 1;
2729 force->speed_left = -1.f;
2730
2731 force->set_speed (duration ? 1.f / duration : 0.f);
2732 force->flag [FLAG_IS_USED_UP] = true;
2733 force->flag [FLAG_APPLIED] = true;
2734
2735 insert (force);
2736}
2737
2738void
2739object::play_sound (faceidx sound) const
2740{
2741 if (!sound)
2742 return;
2743
2744 if (flag [FLAG_REMOVED])
2745 return;
2746
2747 if (env)
2705 } 2748 {
2749 if (object *pl = in_player ())
2750 pl->contr->play_sound (sound);
2751 }
2752 else
2753 map->play_sound (sound, x, y);
2706} 2754}
2707 2755
2708

Diff Legend

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