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.201 by root, Tue Jan 22 16:22:45 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 <support@deliantra.net>
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;
452
453 if (flag [FLAG_FREED])
454 {
455 LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
456 return;
457 }
451 458
452 this->owner = owner; 459 this->owner = owner;
453} 460}
454 461
455int 462int
… …
473object::change_weapon (object *ob) 480object::change_weapon (object *ob)
474{ 481{
475 if (current_weapon == ob) 482 if (current_weapon == ob)
476 return true; 483 return true;
477 484
485 if (chosen_skill)
486 chosen_skill->flag [FLAG_APPLIED] = false;
487
478 current_weapon = ob; 488 current_weapon = ob;
479 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill); 489 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
490
491 if (chosen_skill)
492 chosen_skill->flag [FLAG_APPLIED] = true;
480 493
481 update_stats (); 494 update_stats ();
482 495
483 if (ob) 496 if (ob)
484 { 497 {
… …
489 { 502 {
490 current_weapon = chosen_skill = 0; 503 current_weapon = chosen_skill = 0;
491 update_stats (); 504 update_stats ();
492 505
493 new_draw_info_format (NDI_UNIQUE, 0, this, 506 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. " 507 "You try to balance all your items at once, "
508 "but the %s is just too much for your body. "
495 "You need to unapply some items first.", &ob->name); 509 "[You need to unapply some items first.]", &ob->name);
496 return false; 510 return false;
497 } 511 }
498 512
499 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 513 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
500 } 514 }
501 else 515 else
502 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons."); 516 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
517
518 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
519 {
520 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
521 &name, ob->debug_desc ());
522 return false;
523 }
503 524
504 return true; 525 return true;
505} 526}
506 527
507/* Zero the key_values on op, decrementing the shared-string 528/* Zero the key_values on op, decrementing the shared-string
… …
573object::copy_to (object *dst) 594object::copy_to (object *dst)
574{ 595{
575 *dst = *this; 596 *dst = *this;
576 597
577 if (speed < 0) 598 if (speed < 0)
578 dst->speed_left = speed_left - rndm (); 599 dst->speed_left -= rndm ();
579 600
580 dst->set_speed (dst->speed); 601 dst->set_speed (dst->speed);
581} 602}
582 603
583void 604void
… …
910 931
911 if (!freed_map) 932 if (!freed_map)
912 { 933 {
913 freed_map = new maptile; 934 freed_map = new maptile;
914 935
936 freed_map->path = "<freed objects map>";
915 freed_map->name = "/internal/freed_objects_map"; 937 freed_map->name = "/internal/freed_objects_map";
916 freed_map->width = 3; 938 freed_map->width = 3;
917 freed_map->height = 3; 939 freed_map->height = 3;
940 freed_map->nodrop = 1;
918 941
919 freed_map->alloc (); 942 freed_map->alloc ();
920 freed_map->in_memory = MAP_IN_MEMORY; 943 freed_map->in_memory = MAP_IN_MEMORY;
921 } 944 }
922 945
923 map = freed_map; 946 map = freed_map;
924 x = 1; 947 x = 1;
925 y = 1; 948 y = 1;
926 } 949 }
927 950
928 head = 0;
929
930 if (more) 951 if (more)
931 { 952 {
932 more->destroy (); 953 more->destroy ();
933 more = 0; 954 more = 0;
934 } 955 }
935 956
957 head = 0;
958
936 // clear those pointers that likely might have circular references to us 959 // clear those pointers that likely might cause circular references
937 owner = 0; 960 owner = 0;
938 enemy = 0; 961 enemy = 0;
939 attacked_by = 0; 962 attacked_by = 0;
963 current_weapon = 0;
940} 964}
941 965
942void 966void
943object::destroy (bool destroy_inventory) 967object::destroy (bool destroy_inventory)
944{ 968{
945 if (destroyed ()) 969 if (destroyed ())
946 return; 970 return;
947 971
948 if (destroy_inventory) 972 if (destroy_inventory)
949 destroy_inv (false); 973 destroy_inv (false);
974
975 if (is_head ())
976 if (sound_destroy)
977 play_sound (sound_destroy);
978 else if (flag [FLAG_MONSTER])
979 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
950 980
951 attachable::destroy (); 981 attachable::destroy ();
952} 982}
953 983
954/* 984/*
… …
1069 if (map->in_memory == MAP_SAVING) 1099 if (map->in_memory == MAP_SAVING)
1070 return; 1100 return;
1071 1101
1072 int check_walk_off = !flag [FLAG_NO_APPLY]; 1102 int check_walk_off = !flag [FLAG_NO_APPLY];
1073 1103
1104 if (object *pl = ms.player ())
1105 {
1106 if (pl->container == this)
1107 /* If a container that the player is currently using somehow gets
1108 * removed (most likely destroyed), update the player view
1109 * appropriately.
1110 */
1111 pl->close_container ();
1112
1113 pl->contr->ns->floorbox_update ();
1114 }
1115
1074 for (tmp = ms.bot; tmp; tmp = tmp->above) 1116 for (tmp = ms.bot; tmp; tmp = tmp->above)
1075 { 1117 {
1076 /* No point updating the players look faces if he is the object 1118 /* No point updating the players look faces if he is the object
1077 * being removed. 1119 * being removed.
1078 */ 1120 */
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 1121
1096 /* See if object moving off should effect something */ 1122 /* See if object moving off should effect something */
1097 if (check_walk_off 1123 if (check_walk_off
1098 && ((move_type & tmp->move_off) 1124 && ((move_type & tmp->move_off)
1099 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1125 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1102 1128
1103 if (destroyed ()) 1129 if (destroyed ())
1104 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1130 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1105 } 1131 }
1106 1132
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; 1133 last = tmp;
1113 } 1134 }
1114 1135
1115 /* last == NULL if there are no objects on this space */ 1136 /* last == NULL if there are no objects on this space */
1116 //TODO: this makes little sense, why only update the topmost object? 1137 //TODO: this makes little sense, why only update the topmost object?
… …
1136merge_ob (object *op, object *top) 1157merge_ob (object *op, object *top)
1137{ 1158{
1138 if (!op->nrof) 1159 if (!op->nrof)
1139 return 0; 1160 return 0;
1140 1161
1141 if (top) 1162 if (!top)
1142 for (top = op; top && top->above; top = top->above) 1163 for (top = op; top && top->above; top = top->above)
1143 ; 1164 ;
1144 1165
1145 for (; top; top = top->below) 1166 for (; top; top = top->below)
1146 { 1167 {
… …
1167 if (more) 1188 if (more)
1168 return; 1189 return;
1169 1190
1170 object *prev = this; 1191 object *prev = this;
1171 1192
1172 for (archetype *at = arch->more; at; at = at->more) 1193 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1173 { 1194 {
1174 object *op = arch_to_object (at); 1195 object *op = arch_to_object (at);
1175 1196
1176 op->name = name; 1197 op->name = name;
1177 op->name_pl = name_pl; 1198 op->name_pl = name_pl;
… …
1191object * 1212object *
1192insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1213insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1193{ 1214{
1194 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1215 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1195 { 1216 {
1196 tmp->x = x + tmp->arch->clone.x; 1217 tmp->x = x + tmp->arch->x;
1197 tmp->y = y + tmp->arch->clone.y; 1218 tmp->y = y + tmp->arch->y;
1198 } 1219 }
1199 1220
1200 return insert_ob_in_map (op, m, originator, flag); 1221 return insert_ob_in_map (op, m, originator, flag);
1201} 1222}
1202 1223
… …
1223object * 1244object *
1224insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1245insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1225{ 1246{
1226 assert (!op->flag [FLAG_FREED]); 1247 assert (!op->flag [FLAG_FREED]);
1227 1248
1228 object *tmp, *top, *floor = NULL; 1249 object *top, *floor = NULL;
1229 1250
1230 op->remove (); 1251 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 1252
1266 /* Ideally, the caller figures this out. However, it complicates a lot 1253 /* 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 1254 * of areas of callers (eg, anything that uses find_free_spot would now
1268 * need extra work 1255 * need extra work
1269 */ 1256 */
1270 if (!xy_normalise (m, op->x, op->y)) 1257 if (!xy_normalise (m, op->x, op->y))
1258 {
1259 op->destroy ();
1271 return 0; 1260 return 0;
1261 }
1262
1263 if (object *more = op->more)
1264 if (!insert_ob_in_map (more, m, originator, flag))
1265 return 0;
1266
1267 CLEAR_FLAG (op, FLAG_REMOVED);
1272 1268
1273 op->map = m; 1269 op->map = m;
1274 mapspace &ms = op->ms (); 1270 mapspace &ms = op->ms ();
1275 1271
1276 /* this has to be done after we translate the coordinates. 1272 /* this has to be done after we translate the coordinates.
1277 */ 1273 */
1278 if (op->nrof && !(flag & INS_NO_MERGE)) 1274 if (op->nrof && !(flag & INS_NO_MERGE))
1279 for (tmp = ms.bot; tmp; tmp = tmp->above) 1275 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1280 if (object::can_merge (op, tmp)) 1276 if (object::can_merge (op, tmp))
1281 { 1277 {
1282 op->nrof += tmp->nrof; 1278 op->nrof += tmp->nrof;
1283 tmp->destroy (); 1279 tmp->destroy ();
1284 } 1280 }
… …
1311 else 1307 else
1312 { 1308 {
1313 top = ms.bot; 1309 top = ms.bot;
1314 1310
1315 /* If there are other objects, then */ 1311 /* If there are other objects, then */
1316 if ((!(flag & INS_MAP_LOAD)) && top) 1312 if (top)
1317 { 1313 {
1318 object *last = 0; 1314 object *last = 0;
1319 1315
1320 /* 1316 /*
1321 * If there are multiple objects on this space, we do some trickier handling. 1317 * If there are multiple objects on this space, we do some trickier handling.
… …
1374 if (last && last->below && last != floor) 1370 if (last && last->below && last != floor)
1375 top = last->below; 1371 top = last->below;
1376 } 1372 }
1377 } /* If objects on this space */ 1373 } /* If objects on this space */
1378 1374
1379 if (flag & INS_MAP_LOAD)
1380 top = ms.top;
1381
1382 if (flag & INS_ABOVE_FLOOR_ONLY) 1375 if (flag & INS_ABOVE_FLOOR_ONLY)
1383 top = floor; 1376 top = floor;
1384 1377
1385 /* Top is the object that our object (op) is going to get inserted above. 1378 /* Top is the object that our object (op) is going to get inserted above.
1386 */ 1379 */
… …
1418 op->map->touch (); 1411 op->map->touch ();
1419 } 1412 }
1420 1413
1421 op->map->dirty = true; 1414 op->map->dirty = true;
1422 1415
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))
1427 if (object *pl = ms.player ()) 1416 if (object *pl = ms.player ())
1428 if (pl->contr->ns)
1429 pl->contr->ns->floorbox_update (); 1417 pl->contr->ns->floorbox_update ();
1430 1418
1431 /* If this object glows, it may affect lighting conditions that are 1419 /* If this object glows, it may affect lighting conditions that are
1432 * visible to others on this map. But update_all_los is really 1420 * 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 1421 * 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 1422 * on the map will get recalculated. The players could very well
… …
1453 * blocked() and wall() work properly), and these flags are updated by 1441 * blocked() and wall() work properly), and these flags are updated by
1454 * update_object(). 1442 * update_object().
1455 */ 1443 */
1456 1444
1457 /* if this is not the head or flag has been passed, don't check walk on status */ 1445 /* 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) 1446 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1459 { 1447 {
1460 if (check_move_on (op, originator)) 1448 if (check_move_on (op, originator))
1461 return 0; 1449 return 0;
1462 1450
1463 /* If we are a multi part object, lets work our way through the check 1451 /* If we are a multi part object, lets work our way through the check
1464 * walk on's. 1452 * walk on's.
1465 */ 1453 */
1466 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1454 for (object *tmp = op->more; tmp; tmp = tmp->more)
1467 if (check_move_on (tmp, originator)) 1455 if (check_move_on (tmp, originator))
1468 return 0; 1456 return 0;
1469 } 1457 }
1470 1458
1471 return op; 1459 return op;
… …
1481 object *tmp, *tmp1; 1469 object *tmp, *tmp1;
1482 1470
1483 /* first search for itself and remove any old instances */ 1471 /* first search for itself and remove any old instances */
1484 1472
1485 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1473 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1486 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1474 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1487 tmp->destroy (); 1475 tmp->destroy ();
1488 1476
1489 tmp1 = arch_to_object (archetype::find (arch_string)); 1477 tmp1 = arch_to_object (archetype::find (arch_string));
1490 1478
1491 tmp1->x = op->x; 1479 tmp1->x = op->x;
… …
1652 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1640 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1653 free (dump); 1641 free (dump);
1654 return op; 1642 return op;
1655 } 1643 }
1656 1644
1657 if (where->head) 1645 if (where->head_ () != where)
1658 { 1646 {
1659 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1647 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1660 where = where->head; 1648 where = where->head;
1661 } 1649 }
1662 1650
1663 return where->insert (op); 1651 return where->insert (op);
1664} 1652}
… …
1672 * be != op, if items are merged. -Tero 1660 * be != op, if items are merged. -Tero
1673 */ 1661 */
1674object * 1662object *
1675object::insert (object *op) 1663object::insert (object *op)
1676{ 1664{
1677 object *tmp, *otmp;
1678
1679 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1665 if (!QUERY_FLAG (op, FLAG_REMOVED))
1680 op->remove (); 1666 op->remove ();
1681 1667
1682 if (op->more) 1668 if (op->more)
1683 { 1669 {
… …
1685 return op; 1671 return op;
1686 } 1672 }
1687 1673
1688 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1674 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1689 CLEAR_FLAG (op, FLAG_REMOVED); 1675 CLEAR_FLAG (op, FLAG_REMOVED);
1676
1690 if (op->nrof) 1677 if (op->nrof)
1691 { 1678 {
1692 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1679 for (object *tmp = inv; tmp; tmp = tmp->below)
1693 if (object::can_merge (tmp, op)) 1680 if (object::can_merge (tmp, op))
1694 { 1681 {
1695 /* return the original object and remove inserted object 1682 /* return the original object and remove inserted object
1696 (client needs the original object) */ 1683 (client needs the original object) */
1697 tmp->nrof += op->nrof; 1684 tmp->nrof += op->nrof;
… …
1716 add_weight (this, op->weight * op->nrof); 1703 add_weight (this, op->weight * op->nrof);
1717 } 1704 }
1718 else 1705 else
1719 add_weight (this, (op->weight + op->carrying)); 1706 add_weight (this, (op->weight + op->carrying));
1720 1707
1721 otmp = this->in_player (); 1708 if (object *otmp = this->in_player ())
1722 if (otmp && otmp->contr)
1723 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1709 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1724 otmp->update_stats (); 1710 otmp->update_stats ();
1725 1711
1712 op->owner = 0; // its his/hers now. period.
1726 op->map = 0; 1713 op->map = 0;
1727 op->env = this; 1714 op->env = this;
1728 op->above = 0; 1715 op->above = 0;
1729 op->below = 0; 1716 op->below = 0;
1730 op->x = 0, op->y = 0; 1717 op->x = op->y = 0;
1731 1718
1732 /* reset the light list and los of the players on the map */ 1719 /* reset the light list and los of the players on the map */
1733 if ((op->glow_radius != 0) && map) 1720 if (op->glow_radius && map)
1734 { 1721 {
1735#ifdef DEBUG_LIGHTS 1722#ifdef DEBUG_LIGHTS
1736 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1723 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1737#endif /* DEBUG_LIGHTS */ 1724#endif /* DEBUG_LIGHTS */
1738 if (map->darkness) 1725 if (map->darkness)
… …
1972 * activate recursively a flag on an object inventory 1959 * activate recursively a flag on an object inventory
1973 */ 1960 */
1974void 1961void
1975flag_inv (object *op, int flag) 1962flag_inv (object *op, int flag)
1976{ 1963{
1977 if (op->inv)
1978 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1964 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1979 { 1965 {
1980 SET_FLAG (tmp, flag); 1966 SET_FLAG (tmp, flag);
1981 flag_inv (tmp, flag); 1967 flag_inv (tmp, flag);
1982 } 1968 }
1983} 1969}
1984 1970
1985/* 1971/*
1986 * deactivate recursively a flag on an object inventory 1972 * deactivate recursively a flag on an object inventory
1987 */ 1973 */
1988void 1974void
1989unflag_inv (object *op, int flag) 1975unflag_inv (object *op, int flag)
1990{ 1976{
1991 if (op->inv)
1992 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1977 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1993 { 1978 {
1994 CLEAR_FLAG (tmp, flag); 1979 CLEAR_FLAG (tmp, flag);
1995 unflag_inv (tmp, flag); 1980 unflag_inv (tmp, flag);
1996 } 1981 }
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} 1982}
2011 1983
2012/* 1984/*
2013 * find_free_spot(object, map, x, y, start, stop) will search for 1985 * 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 1986 * a spot at the given map and coordinates which will be able to contain
… …
2016 * to search (see the freearr_x/y[] definition). 1988 * to search (see the freearr_x/y[] definition).
2017 * It returns a random choice among the alternatives found. 1989 * It returns a random choice among the alternatives found.
2018 * start and stop are where to start relative to the free_arr array (1,9 1990 * start and stop are where to start relative to the free_arr array (1,9
2019 * does all 4 immediate directions). This returns the index into the 1991 * does all 4 immediate directions). This returns the index into the
2020 * array of the free spot, -1 if no spot available (dir 0 = x,y) 1992 * array of the free spot, -1 if no spot available (dir 0 = x,y)
2021 * Note - this only checks to see if there is space for the head of the
2022 * object - if it is a multispace object, this should be called for all
2023 * pieces.
2024 * Note2: This function does correctly handle tiled maps, but does not 1993 * Note: This function does correctly handle tiled maps, but does not
2025 * inform the caller. However, insert_ob_in_map will update as 1994 * inform the caller. However, insert_ob_in_map will update as
2026 * necessary, so the caller shouldn't need to do any special work. 1995 * necessary, so the caller shouldn't need to do any special work.
2027 * Note - updated to take an object instead of archetype - this is necessary 1996 * Note - updated to take an object instead of archetype - this is necessary
2028 * because arch_blocked (now ob_blocked) needs to know the movement type 1997 * because arch_blocked (now ob_blocked) needs to know the movement type
2029 * to know if the space in question will block the object. We can't use 1998 * to know if the space in question will block the object. We can't use
… …
2031 * customized, changed states, etc. 2000 * customized, changed states, etc.
2032 */ 2001 */
2033int 2002int
2034find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2003find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2035{ 2004{
2005 int altern[SIZEOFFREE];
2036 int index = 0, flag; 2006 int index = 0, flag;
2037 int altern[SIZEOFFREE];
2038 2007
2039 for (int i = start; i < stop; i++) 2008 for (int i = start; i < stop; i++)
2040 { 2009 {
2041 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2010 mapxy pos (m, x, y); pos.move (i);
2042 if (!flag) 2011
2012 if (!pos.normalise ())
2013 continue;
2014
2015 mapspace &ms = *pos;
2016
2017 if (ms.flags () & P_IS_ALIVE)
2018 continue;
2019
2020 /* However, often
2021 * ob doesn't have any move type (when used to place exits)
2022 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2023 */
2024 if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
2025 {
2043 altern [index++] = i; 2026 altern [index++] = i;
2027 continue;
2028 }
2044 2029
2045 /* Basically, if we find a wall on a space, we cut down the search size. 2030 /* 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. 2031 * 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 - 2032 * 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 2033 * 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 2034 * spaces in all the other directions, this will reduce the search space
2050 * to only the spaces immediately surrounding the target area, and 2035 * to only the spaces immediately surrounding the target area, and
2051 * won't look 2 spaces south of the target space. 2036 * won't look 2 spaces south of the target space.
2052 */ 2037 */
2053 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2038 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2039 {
2054 stop = maxfree[i]; 2040 stop = maxfree[i];
2041 continue;
2042 }
2043
2044 /* Note it is intentional that we check ob - the movement type of the
2045 * head of the object should correspond for the entire object.
2046 */
2047 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2048 continue;
2049
2050 if (ob->blocked (m, pos.x, pos.y))
2051 continue;
2052
2053 altern [index++] = i;
2055 } 2054 }
2056 2055
2057 if (!index) 2056 if (!index)
2058 return -1; 2057 return -1;
2059 2058
… …
2068 */ 2067 */
2069int 2068int
2070find_first_free_spot (const object *ob, maptile *m, int x, int y) 2069find_first_free_spot (const object *ob, maptile *m, int x, int y)
2071{ 2070{
2072 for (int i = 0; i < SIZEOFFREE; i++) 2071 for (int i = 0; i < SIZEOFFREE; i++)
2073 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2072 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2074 return i; 2073 return i;
2075 2074
2076 return -1; 2075 return -1;
2077} 2076}
2078 2077
… …
2132 object *tmp; 2131 object *tmp;
2133 maptile *mp; 2132 maptile *mp;
2134 2133
2135 MoveType blocked, move_type; 2134 MoveType blocked, move_type;
2136 2135
2137 if (exclude && exclude->head) 2136 if (exclude && exclude->head_ () != exclude)
2138 { 2137 {
2139 exclude = exclude->head; 2138 exclude = exclude->head;
2140 move_type = exclude->move_type; 2139 move_type = exclude->move_type;
2141 } 2140 }
2142 else 2141 else
… …
2165 max = maxfree[i]; 2164 max = maxfree[i];
2166 else if (mflags & P_IS_ALIVE) 2165 else if (mflags & P_IS_ALIVE)
2167 { 2166 {
2168 for (tmp = ms.bot; tmp; tmp = tmp->above) 2167 for (tmp = ms.bot; tmp; tmp = tmp->above)
2169 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2168 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2170 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2169 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2171 break; 2170 break;
2172 2171
2173 if (tmp) 2172 if (tmp)
2174 return freedir[i]; 2173 return freedir[i];
2175 } 2174 }
… …
2355 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2354 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2356 * core dumps if they do. 2355 * core dumps if they do.
2357 * 2356 *
2358 * Add a check so we can't pick up invisible objects (0.93.8) 2357 * Add a check so we can't pick up invisible objects (0.93.8)
2359 */ 2358 */
2360
2361int 2359int
2362can_pick (const object *who, const object *item) 2360can_pick (const object *who, const object *item)
2363{ 2361{
2364 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2362 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2365 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2363 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2370 * create clone from object to another 2368 * create clone from object to another
2371 */ 2369 */
2372object * 2370object *
2373object_create_clone (object *asrc) 2371object_create_clone (object *asrc)
2374{ 2372{
2375 object *dst = 0, *tmp, *src, *part, *prev, *item; 2373 object *dst = 0, *tmp, *src, *prev, *item;
2376 2374
2377 if (!asrc) 2375 if (!asrc)
2378 return 0; 2376 return 0;
2379 2377
2380 src = asrc;
2381 if (src->head)
2382 src = src->head; 2378 src = asrc->head_ ();
2383 2379
2384 prev = 0; 2380 prev = 0;
2385 for (part = src; part; part = part->more) 2381 for (object *part = src; part; part = part->more)
2386 { 2382 {
2387 tmp = part->clone (); 2383 tmp = part->clone ();
2388 tmp->x -= src->x; 2384 tmp->x -= src->x;
2389 tmp->y -= src->y; 2385 tmp->y -= src->y;
2390 2386
… …
2503 /* Basically, if the archetype has this key set, 2499 /* Basically, if the archetype has this key set,
2504 * we need to store the null value so when we save 2500 * we need to store the null value so when we save
2505 * it, we save the empty value so that when we load, 2501 * it, we save the empty value so that when we load,
2506 * we get this value back again. 2502 * we get this value back again.
2507 */ 2503 */
2508 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2504 if (get_ob_key_link (op->arch, canonical_key))
2509 field->value = 0; 2505 field->value = 0;
2510 else 2506 else
2511 { 2507 {
2512 if (last) 2508 if (last)
2513 last->next = field->next; 2509 last->next = field->next;
… …
2582 } 2578 }
2583 else 2579 else
2584 item = item->env; 2580 item = item->env;
2585} 2581}
2586 2582
2587
2588const char * 2583const char *
2589object::flag_desc (char *desc, int len) const 2584object::flag_desc (char *desc, int len) const
2590{ 2585{
2591 char *p = desc; 2586 char *p = desc;
2592 bool first = true; 2587 bool first = true;
… …
2626 &name, 2621 &name,
2627 title ? "\",title:\"" : "", 2622 title ? "\",title:\"" : "",
2628 title ? (const char *)title : "", 2623 title ? (const char *)title : "",
2629 flag_desc (flagdesc, 512), type); 2624 flag_desc (flagdesc, 512), type);
2630 2625
2631 if (env) 2626 if (!this->flag[FLAG_REMOVED] && env)
2632 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2627 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2633 2628
2634 if (map) 2629 if (map)
2635 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2630 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2636 2631
… …
2654} 2649}
2655 2650
2656const materialtype_t * 2651const materialtype_t *
2657object::dominant_material () const 2652object::dominant_material () const
2658{ 2653{
2659 if (materialtype_t *mat = name_to_material (materialname)) 2654 if (materialtype_t *mt = name_to_material (materialname))
2660 return mat; 2655 return mt;
2661 2656
2662 // omfg this is slow, this has to be temporary :)
2663 shstr unknown ("unknown");
2664
2665 return name_to_material (unknown); 2657 return name_to_material (shstr_unknown);
2666} 2658}
2667 2659
2668void 2660void
2669object::open_container (object *new_container) 2661object::open_container (object *new_container)
2670{ 2662{
… …
2686 old_container->flag [FLAG_APPLIED] = 0; 2678 old_container->flag [FLAG_APPLIED] = 0;
2687 container = 0; 2679 container = 0;
2688 2680
2689 esrv_update_item (UPD_FLAGS, this, old_container); 2681 esrv_update_item (UPD_FLAGS, this, old_container);
2690 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2682 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2683 play_sound (sound_find ("chest_close"));
2691 } 2684 }
2692 2685
2693 if (new_container) 2686 if (new_container)
2694 { 2687 {
2695 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2688 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2711 new_container->flag [FLAG_APPLIED] = 1; 2704 new_container->flag [FLAG_APPLIED] = 1;
2712 container = new_container; 2705 container = new_container;
2713 2706
2714 esrv_update_item (UPD_FLAGS, this, new_container); 2707 esrv_update_item (UPD_FLAGS, this, new_container);
2715 esrv_send_inventory (this, new_container); 2708 esrv_send_inventory (this, new_container);
2709 play_sound (sound_find ("chest_open"));
2710 }
2711}
2712
2713object *
2714object::force_find (const shstr name)
2715{
2716 /* cycle through his inventory to look for the MARK we want to
2717 * place
2718 */
2719 for (object *tmp = inv; tmp; tmp = tmp->below)
2720 if (tmp->type == FORCE && tmp->slaying == name)
2721 return splay (tmp);
2722
2723 return 0;
2724}
2725
2726void
2727object::force_add (const shstr name, int duration)
2728{
2729 if (object *force = force_find (name))
2730 force->destroy ();
2731
2732 object *force = get_archetype (FORCE_NAME);
2733
2734 force->slaying = name;
2735 force->stats.food = 1;
2736 force->speed_left = -1.f;
2737
2738 force->set_speed (duration ? 1.f / duration : 0.f);
2739 force->flag [FLAG_IS_USED_UP] = true;
2740 force->flag [FLAG_APPLIED] = true;
2741
2742 insert (force);
2743}
2744
2745void
2746object::play_sound (faceidx sound) const
2747{
2748 if (!sound)
2749 return;
2750
2751 if (flag [FLAG_REMOVED])
2752 return;
2753
2754 if (env)
2716 } 2755 {
2756 if (object *pl = in_player ())
2757 pl->contr->play_sound (sound);
2758 }
2759 else
2760 map->play_sound (sound, x, y);
2717} 2761}
2718 2762
2719

Diff Legend

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