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.139 by root, Sat Apr 21 17:34:22 2007 UTC vs.
Revision 1.192 by root, Fri Oct 12 19:13:25 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 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. */
… …
29#include <stdio.h> 28#include <stdio.h>
30#include <sys/types.h> 29#include <sys/types.h>
31#include <sys/uio.h> 30#include <sys/uio.h>
32#include <object.h> 31#include <object.h>
33#include <funcpoint.h> 32#include <funcpoint.h>
33#include <sproto.h>
34#include <loader.h> 34#include <loader.h>
35 35
36#include <bitset> 36#include <bitset>
37 37
38int nrofallocobjects = 0; 38int nrofallocobjects = 0;
… …
299 return 0; 299 return 0;
300 else if (!compare_ob_value_lists (ob1, ob2)) 300 else if (!compare_ob_value_lists (ob1, ob2))
301 return 0; 301 return 0;
302 } 302 }
303 303
304 //TODO: generate an event or call into perl for additional checks
305 if (ob1->self || ob2->self) 304 if (ob1->self || ob2->self)
306 { 305 {
307 ob1->optimise (); 306 ob1->optimise ();
308 ob2->optimise (); 307 ob2->optimise ();
309 308
310 if (ob1->self || ob2->self) 309 if (ob1->self || ob2->self)
310 {
311 int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0;
312 int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0;
313
314 if (k1 != k2)
311 return 0; 315 return 0;
316 else if (k1 == 0)
317 return 1;
318 else if (!cfperl_can_merge (ob1, ob2))
319 return 0;
320 }
312 } 321 }
313 322
314 /* Everything passes, must be OK. */ 323 /* Everything passes, must be OK. */
315 return 1; 324 return 1;
316} 325}
… …
324sum_weight (object *op) 333sum_weight (object *op)
325{ 334{
326 long sum; 335 long sum;
327 object *inv; 336 object *inv;
328 337
329 for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below) 338 for (sum = 0, inv = op->inv; inv; inv = inv->below)
330 { 339 {
331 if (inv->inv) 340 if (inv->inv)
332 sum_weight (inv); 341 sum_weight (inv);
342
333 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1); 343 sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334 } 344 }
335 345
336 if (op->type == CONTAINER && op->stats.Str) 346 if (op->type == CONTAINER && op->stats.Str)
337 sum = (sum * (100 - op->stats.Str)) / 100; 347 sum = (sum * (100 - op->stats.Str)) / 100;
… …
373/* 383/*
374 * get_nearest_part(multi-object, object 2) returns the part of the 384 * get_nearest_part(multi-object, object 2) returns the part of the
375 * multi-object 1 which is closest to the second object. 385 * multi-object 1 which is closest to the second object.
376 * If it's not a multi-object, it is returned. 386 * If it's not a multi-object, it is returned.
377 */ 387 */
378
379object * 388object *
380get_nearest_part (object *op, const object *pl) 389get_nearest_part (object *op, const object *pl)
381{ 390{
382 object *tmp, *closest; 391 object *tmp, *closest;
383 int last_dist, i; 392 int last_dist, i;
… …
428} 437}
429 438
430/* 439/*
431 * Sets the owner and sets the skill and exp pointers to owner's current 440 * Sets the owner and sets the skill and exp pointers to owner's current
432 * skill and experience objects. 441 * skill and experience objects.
442 * ACTUALLY NO! investigate! TODO
433 */ 443 */
434void 444void
435object::set_owner (object *owner) 445object::set_owner (object *owner)
436{ 446{
447 // allow objects which own objects
437 if (!owner) 448 if (owner)
438 return;
439
440 /* next line added to allow objects which own objects */
441 /* Add a check for ownercounts in here, as I got into an endless loop
442 * with the fireball owning a poison cloud which then owned the
443 * fireball. I believe that was caused by one of the objects getting
444 * freed and then another object replacing it. Since the ownercounts
445 * didn't match, this check is valid and I believe that cause is valid.
446 */
447 while (owner->owner) 449 while (owner->owner)
448 owner = owner->owner; 450 owner = owner->owner;
449 451
450 this->owner = owner; 452 this->owner = owner;
453}
454
455int
456object::slottype () const
457{
458 if (type == SKILL)
459 {
460 if (IS_COMBAT_SKILL (subtype)) return slot_combat;
461 if (IS_RANGED_SKILL (subtype)) return slot_ranged;
462 }
463 else
464 {
465 if (slot [body_combat].info) return slot_combat;
466 if (slot [body_range ].info) return slot_ranged;
467 }
468
469 return slot_none;
470}
471
472bool
473object::change_weapon (object *ob)
474{
475 if (current_weapon == ob)
476 return true;
477
478 if (chosen_skill)
479 chosen_skill->flag [FLAG_APPLIED] = false;
480
481 current_weapon = ob;
482 chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
483
484 if (chosen_skill)
485 chosen_skill->flag [FLAG_APPLIED] = true;
486
487 update_stats ();
488
489 if (ob)
490 {
491 // now check wether any body locations became invalid, in which case
492 // we cannot apply the weapon at the moment.
493 for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
494 if (slot[i].used < 0)
495 {
496 current_weapon = chosen_skill = 0;
497 update_stats ();
498
499 new_draw_info_format (NDI_UNIQUE, 0, this,
500 "You try to balance all your items at once, "
501 "but the %s is just too much for your body. "
502 "[You need to unapply some items first.]", &ob->name);
503 return false;
504 }
505
506 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
507 }
508 else
509 ;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
510
511 if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
512 {
513 LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
514 &name, ob->debug_desc ());
515 return false;
516 }
517
518 return true;
451} 519}
452 520
453/* Zero the key_values on op, decrementing the shared-string 521/* Zero the key_values on op, decrementing the shared-string
454 * refcounts and freeing the links. 522 * refcounts and freeing the links.
455 */ 523 */
… …
519object::copy_to (object *dst) 587object::copy_to (object *dst)
520{ 588{
521 *dst = *this; 589 *dst = *this;
522 590
523 if (speed < 0) 591 if (speed < 0)
524 dst->speed_left = speed_left - rndm (); 592 dst->speed_left -= rndm ();
525 593
526 dst->set_speed (dst->speed); 594 dst->set_speed (dst->speed);
527} 595}
528 596
529void 597void
… …
537 * need for monsters, but doesn't hurt to do it for everything. 605 * need for monsters, but doesn't hurt to do it for everything.
538 * by doing so, when a monster is created, it has good starting 606 * by doing so, when a monster is created, it has good starting
539 * values for the body_used info, so when items are created 607 * values for the body_used info, so when items are created
540 * for it, they can be properly equipped. 608 * for it, they can be properly equipped.
541 */ 609 */
542 memcpy (body_used, body_info, sizeof (body_used)); 610 for (int i = NUM_BODY_LOCATIONS; i--; )
611 slot[i].used = slot[i].info;
543 612
544 attachable::instantiate (); 613 attachable::instantiate ();
545} 614}
546 615
547object * 616object *
… …
835 904
836 if (flag [FLAG_IS_LINKED]) 905 if (flag [FLAG_IS_LINKED])
837 remove_button_link (this); 906 remove_button_link (this);
838 907
839 if (flag [FLAG_FRIENDLY]) 908 if (flag [FLAG_FRIENDLY])
840 {
841 remove_friendly_object (this); 909 remove_friendly_object (this);
842
843 if (type == GOLEM
844 && owner
845 && owner->type == PLAYER
846 && owner->contr->ranges[range_golem] == this)
847 owner->contr->ranges[range_golem] = 0;
848 }
849 910
850 if (!flag [FLAG_REMOVED]) 911 if (!flag [FLAG_REMOVED])
851 remove (); 912 remove ();
852 913
853 destroy_inv (true); 914 destroy_inv (true);
… …
863 924
864 if (!freed_map) 925 if (!freed_map)
865 { 926 {
866 freed_map = new maptile; 927 freed_map = new maptile;
867 928
929 freed_map->path = "<freed objects map>";
868 freed_map->name = "/internal/freed_objects_map"; 930 freed_map->name = "/internal/freed_objects_map";
869 freed_map->width = 3; 931 freed_map->width = 3;
870 freed_map->height = 3; 932 freed_map->height = 3;
871 933
872 freed_map->alloc (); 934 freed_map->alloc ();
… …
876 map = freed_map; 938 map = freed_map;
877 x = 1; 939 x = 1;
878 y = 1; 940 y = 1;
879 } 941 }
880 942
881 head = 0;
882
883 if (more) 943 if (more)
884 { 944 {
885 more->destroy (); 945 more->destroy ();
886 more = 0; 946 more = 0;
887 } 947 }
888 948
949 head = 0;
950
889 // clear those pointers that likely might have circular references to us 951 // clear those pointers that likely might cause circular references
890 owner = 0; 952 owner = 0;
891 enemy = 0; 953 enemy = 0;
892 attacked_by = 0; 954 attacked_by = 0;
955 current_weapon = 0;
893} 956}
894 957
895void 958void
896object::destroy (bool destroy_inventory) 959object::destroy (bool destroy_inventory)
897{ 960{
898 if (destroyed ()) 961 if (destroyed ())
899 return; 962 return;
900 963
901 if (destroy_inventory) 964 if (destroy_inventory)
902 destroy_inv (false); 965 destroy_inv (false);
966
967 if (is_head ())
968 if (sound_destroy)
969 play_sound (sound_destroy);
970 else if (flag [FLAG_MONSTER])
971 play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
903 972
904 attachable::destroy (); 973 attachable::destroy ();
905} 974}
906 975
907/* 976/*
… …
1022 if (map->in_memory == MAP_SAVING) 1091 if (map->in_memory == MAP_SAVING)
1023 return; 1092 return;
1024 1093
1025 int check_walk_off = !flag [FLAG_NO_APPLY]; 1094 int check_walk_off = !flag [FLAG_NO_APPLY];
1026 1095
1096 if (object *pl = ms.player ())
1097 {
1098 if (pl->container == this)
1099 /* If a container that the player is currently using somehow gets
1100 * removed (most likely destroyed), update the player view
1101 * appropriately.
1102 */
1103 pl->close_container ();
1104
1105 pl->contr->ns->floorbox_update ();
1106 }
1107
1027 for (tmp = ms.bot; tmp; tmp = tmp->above) 1108 for (tmp = ms.bot; tmp; tmp = tmp->above)
1028 { 1109 {
1029 /* No point updating the players look faces if he is the object 1110 /* No point updating the players look faces if he is the object
1030 * being removed. 1111 * being removed.
1031 */ 1112 */
1032
1033 if (tmp->type == PLAYER && tmp != this)
1034 {
1035 /* If a container that the player is currently using somehow gets
1036 * removed (most likely destroyed), update the player view
1037 * appropriately.
1038 */
1039 if (tmp->container == this)
1040 {
1041 flag [FLAG_APPLIED] = 0;
1042 tmp->container = 0;
1043 }
1044
1045 if (tmp->contr->ns)
1046 tmp->contr->ns->floorbox_update ();
1047 }
1048 1113
1049 /* See if object moving off should effect something */ 1114 /* See if object moving off should effect something */
1050 if (check_walk_off 1115 if (check_walk_off
1051 && ((move_type & tmp->move_off) 1116 && ((move_type & tmp->move_off)
1052 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1117 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
… …
1055 1120
1056 if (destroyed ()) 1121 if (destroyed ())
1057 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ()); 1122 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1058 } 1123 }
1059 1124
1060 /* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1061 //TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1062 if (tmp->above == tmp)
1063 tmp->above = 0;
1064
1065 last = tmp; 1125 last = tmp;
1066 } 1126 }
1067 1127
1068 /* last == NULL if there are no objects on this space */ 1128 /* last == NULL if there are no objects on this space */
1069 //TODO: this makes little sense, why only update the topmost object? 1129 //TODO: this makes little sense, why only update the topmost object?
… …
1120 if (more) 1180 if (more)
1121 return; 1181 return;
1122 1182
1123 object *prev = this; 1183 object *prev = this;
1124 1184
1125 for (archetype *at = arch->more; at; at = at->more) 1185 for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1126 { 1186 {
1127 object *op = arch_to_object (at); 1187 object *op = arch_to_object (at);
1128 1188
1129 op->name = name; 1189 op->name = name;
1130 op->name_pl = name_pl; 1190 op->name_pl = name_pl;
… …
1144object * 1204object *
1145insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y) 1205insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1146{ 1206{
1147 for (object *tmp = op->head_ (); tmp; tmp = tmp->more) 1207 for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1148 { 1208 {
1149 tmp->x = x + tmp->arch->clone.x; 1209 tmp->x = x + tmp->arch->x;
1150 tmp->y = y + tmp->arch->clone.y; 1210 tmp->y = y + tmp->arch->y;
1151 } 1211 }
1152 1212
1153 return insert_ob_in_map (op, m, originator, flag); 1213 return insert_ob_in_map (op, m, originator, flag);
1154} 1214}
1155 1215
… …
1176object * 1236object *
1177insert_ob_in_map (object *op, maptile *m, object *originator, int flag) 1237insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1178{ 1238{
1179 assert (!op->flag [FLAG_FREED]); 1239 assert (!op->flag [FLAG_FREED]);
1180 1240
1181 object *tmp, *top, *floor = NULL; 1241 object *top, *floor = NULL;
1182 1242
1183 op->remove (); 1243 op->remove ();
1184
1185#if 0
1186 if (!m->active != !op->active)
1187 if (m->active)
1188 op->activate_recursive ();
1189 else
1190 op->deactivate_recursive ();
1191#endif
1192
1193 if (out_of_map (m, op->x, op->y))
1194 {
1195 LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1196#ifdef MANY_CORES
1197 /* Better to catch this here, as otherwise the next use of this object
1198 * is likely to cause a crash. Better to find out where it is getting
1199 * improperly inserted.
1200 */
1201 abort ();
1202#endif
1203 return op;
1204 }
1205
1206 if (object *more = op->more)
1207 {
1208 if (!insert_ob_in_map (more, m, originator, flag))
1209 {
1210 if (!op->head)
1211 LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1212
1213 return 0;
1214 }
1215 }
1216
1217 CLEAR_FLAG (op, FLAG_REMOVED);
1218 1244
1219 /* Ideally, the caller figures this out. However, it complicates a lot 1245 /* Ideally, the caller figures this out. However, it complicates a lot
1220 * of areas of callers (eg, anything that uses find_free_spot would now 1246 * of areas of callers (eg, anything that uses find_free_spot would now
1221 * need extra work 1247 * need extra work
1222 */ 1248 */
1223 if (!xy_normalise (m, op->x, op->y)) 1249 if (!xy_normalise (m, op->x, op->y))
1250 {
1251 op->destroy ();
1224 return 0; 1252 return 0;
1253 }
1254
1255 if (object *more = op->more)
1256 if (!insert_ob_in_map (more, m, originator, flag))
1257 return 0;
1258
1259 CLEAR_FLAG (op, FLAG_REMOVED);
1225 1260
1226 op->map = m; 1261 op->map = m;
1227 mapspace &ms = op->ms (); 1262 mapspace &ms = op->ms ();
1228 1263
1229 /* this has to be done after we translate the coordinates. 1264 /* this has to be done after we translate the coordinates.
1230 */ 1265 */
1231 if (op->nrof && !(flag & INS_NO_MERGE)) 1266 if (op->nrof && !(flag & INS_NO_MERGE))
1232 for (tmp = ms.bot; tmp; tmp = tmp->above) 1267 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1233 if (object::can_merge (op, tmp)) 1268 if (object::can_merge (op, tmp))
1234 { 1269 {
1235 op->nrof += tmp->nrof; 1270 op->nrof += tmp->nrof;
1236 tmp->destroy (); 1271 tmp->destroy ();
1237 } 1272 }
… …
1264 else 1299 else
1265 { 1300 {
1266 top = ms.bot; 1301 top = ms.bot;
1267 1302
1268 /* If there are other objects, then */ 1303 /* If there are other objects, then */
1269 if ((!(flag & INS_MAP_LOAD)) && top) 1304 if (top)
1270 { 1305 {
1271 object *last = 0; 1306 object *last = 0;
1272 1307
1273 /* 1308 /*
1274 * If there are multiple objects on this space, we do some trickier handling. 1309 * If there are multiple objects on this space, we do some trickier handling.
… …
1327 if (last && last->below && last != floor) 1362 if (last && last->below && last != floor)
1328 top = last->below; 1363 top = last->below;
1329 } 1364 }
1330 } /* If objects on this space */ 1365 } /* If objects on this space */
1331 1366
1332 if (flag & INS_MAP_LOAD)
1333 top = ms.top;
1334
1335 if (flag & INS_ABOVE_FLOOR_ONLY) 1367 if (flag & INS_ABOVE_FLOOR_ONLY)
1336 top = floor; 1368 top = floor;
1337 1369
1338 /* Top is the object that our object (op) is going to get inserted above. 1370 /* Top is the object that our object (op) is going to get inserted above.
1339 */ 1371 */
… …
1371 op->map->touch (); 1403 op->map->touch ();
1372 } 1404 }
1373 1405
1374 op->map->dirty = true; 1406 op->map->dirty = true;
1375 1407
1376 /* If we have a floor, we know the player, if any, will be above
1377 * it, so save a few ticks and start from there.
1378 */
1379 if (!(flag & INS_MAP_LOAD))
1380 if (object *pl = ms.player ()) 1408 if (object *pl = ms.player ())
1381 if (pl->contr->ns)
1382 pl->contr->ns->floorbox_update (); 1409 pl->contr->ns->floorbox_update ();
1383 1410
1384 /* If this object glows, it may affect lighting conditions that are 1411 /* If this object glows, it may affect lighting conditions that are
1385 * visible to others on this map. But update_all_los is really 1412 * visible to others on this map. But update_all_los is really
1386 * an inefficient way to do this, as it means los for all players 1413 * an inefficient way to do this, as it means los for all players
1387 * on the map will get recalculated. The players could very well 1414 * on the map will get recalculated. The players could very well
… …
1406 * blocked() and wall() work properly), and these flags are updated by 1433 * blocked() and wall() work properly), and these flags are updated by
1407 * update_object(). 1434 * update_object().
1408 */ 1435 */
1409 1436
1410 /* if this is not the head or flag has been passed, don't check walk on status */ 1437 /* if this is not the head or flag has been passed, don't check walk on status */
1411 if (!(flag & INS_NO_WALK_ON) && !op->head) 1438 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1412 { 1439 {
1413 if (check_move_on (op, originator)) 1440 if (check_move_on (op, originator))
1414 return 0; 1441 return 0;
1415 1442
1416 /* If we are a multi part object, lets work our way through the check 1443 /* If we are a multi part object, lets work our way through the check
1417 * walk on's. 1444 * walk on's.
1418 */ 1445 */
1419 for (tmp = op->more; tmp != NULL; tmp = tmp->more) 1446 for (object *tmp = op->more; tmp; tmp = tmp->more)
1420 if (check_move_on (tmp, originator)) 1447 if (check_move_on (tmp, originator))
1421 return 0; 1448 return 0;
1422 } 1449 }
1423 1450
1424 return op; 1451 return op;
… …
1434 object *tmp, *tmp1; 1461 object *tmp, *tmp1;
1435 1462
1436 /* first search for itself and remove any old instances */ 1463 /* first search for itself and remove any old instances */
1437 1464
1438 for (tmp = op->ms ().bot; tmp; tmp = tmp->above) 1465 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1439 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1466 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1440 tmp->destroy (); 1467 tmp->destroy ();
1441 1468
1442 tmp1 = arch_to_object (archetype::find (arch_string)); 1469 tmp1 = arch_to_object (archetype::find (arch_string));
1443 1470
1444 tmp1->x = op->x; 1471 tmp1->x = op->x;
… …
1605 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump); 1632 LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1606 free (dump); 1633 free (dump);
1607 return op; 1634 return op;
1608 } 1635 }
1609 1636
1610 if (where->head) 1637 if (where->head_ () != where)
1611 { 1638 {
1612 LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n"); 1639 LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1613 where = where->head; 1640 where = where->head;
1614 } 1641 }
1615 1642
1616 return where->insert (op); 1643 return where->insert (op);
1617} 1644}
… …
1625 * be != op, if items are merged. -Tero 1652 * be != op, if items are merged. -Tero
1626 */ 1653 */
1627object * 1654object *
1628object::insert (object *op) 1655object::insert (object *op)
1629{ 1656{
1630 object *tmp, *otmp;
1631
1632 if (!QUERY_FLAG (op, FLAG_REMOVED)) 1657 if (!QUERY_FLAG (op, FLAG_REMOVED))
1633 op->remove (); 1658 op->remove ();
1634 1659
1635 if (op->more) 1660 if (op->more)
1636 { 1661 {
… …
1638 return op; 1663 return op;
1639 } 1664 }
1640 1665
1641 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1666 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1642 CLEAR_FLAG (op, FLAG_REMOVED); 1667 CLEAR_FLAG (op, FLAG_REMOVED);
1668
1643 if (op->nrof) 1669 if (op->nrof)
1644 { 1670 {
1645 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1671 for (object *tmp = inv; tmp; tmp = tmp->below)
1646 if (object::can_merge (tmp, op)) 1672 if (object::can_merge (tmp, op))
1647 { 1673 {
1648 /* return the original object and remove inserted object 1674 /* return the original object and remove inserted object
1649 (client needs the original object) */ 1675 (client needs the original object) */
1650 tmp->nrof += op->nrof; 1676 tmp->nrof += op->nrof;
… …
1669 add_weight (this, op->weight * op->nrof); 1695 add_weight (this, op->weight * op->nrof);
1670 } 1696 }
1671 else 1697 else
1672 add_weight (this, (op->weight + op->carrying)); 1698 add_weight (this, (op->weight + op->carrying));
1673 1699
1674 otmp = this->in_player (); 1700 if (object *otmp = this->in_player ())
1675 if (otmp && otmp->contr)
1676 if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1701 if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1677 otmp->update_stats (); 1702 otmp->update_stats ();
1678 1703
1704 op->owner = 0; // its his/hers now. period.
1679 op->map = 0; 1705 op->map = 0;
1680 op->env = this; 1706 op->env = this;
1681 op->above = 0; 1707 op->above = 0;
1682 op->below = 0; 1708 op->below = 0;
1683 op->x = 0, op->y = 0; 1709 op->x = op->y = 0;
1684 1710
1685 /* reset the light list and los of the players on the map */ 1711 /* reset the light list and los of the players on the map */
1686 if ((op->glow_radius != 0) && map) 1712 if (op->glow_radius && map)
1687 { 1713 {
1688#ifdef DEBUG_LIGHTS 1714#ifdef DEBUG_LIGHTS
1689 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name); 1715 LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1690#endif /* DEBUG_LIGHTS */ 1716#endif /* DEBUG_LIGHTS */
1691 if (map->darkness) 1717 if (map->darkness)
… …
1945 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below) 1971 for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1946 { 1972 {
1947 CLEAR_FLAG (tmp, flag); 1973 CLEAR_FLAG (tmp, flag);
1948 unflag_inv (tmp, flag); 1974 unflag_inv (tmp, flag);
1949 } 1975 }
1950}
1951
1952/*
1953 * set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1954 * all it's inventory (recursively).
1955 * If checksums are used, a player will get set_cheat called for
1956 * him/her-self and all object carried by a call to this function.
1957 */
1958void
1959set_cheat (object *op)
1960{
1961 SET_FLAG (op, FLAG_WAS_WIZ);
1962 flag_inv (op, FLAG_WAS_WIZ);
1963} 1976}
1964 1977
1965/* 1978/*
1966 * find_free_spot(object, map, x, y, start, stop) will search for 1979 * find_free_spot(object, map, x, y, start, stop) will search for
1967 * a spot at the given map and coordinates which will be able to contain 1980 * a spot at the given map and coordinates which will be able to contain
… …
1984 * customized, changed states, etc. 1997 * customized, changed states, etc.
1985 */ 1998 */
1986int 1999int
1987find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop) 2000find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1988{ 2001{
2002 int altern[SIZEOFFREE];
1989 int index = 0, flag; 2003 int index = 0, flag;
1990 int altern[SIZEOFFREE];
1991 2004
1992 for (int i = start; i < stop; i++) 2005 for (int i = start; i < stop; i++)
1993 { 2006 {
1994 flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]); 2007 mapxy pos (m, x, y); pos.move (i);
1995 if (!flag) 2008
2009 if (!pos.normalise ())
2010 continue;
2011
2012 mapspace &ms = *pos;
2013
2014 if (ms.flags () & P_IS_ALIVE)
2015 continue;
2016
2017 /* However, often
2018 * ob doesn't have any move type (when used to place exits)
2019 * so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
2020 */
2021 if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
2022 {
1996 altern [index++] = i; 2023 altern [index++] = i;
2024 continue;
2025 }
1997 2026
1998 /* Basically, if we find a wall on a space, we cut down the search size. 2027 /* Basically, if we find a wall on a space, we cut down the search size.
1999 * In this way, we won't return spaces that are on another side of a wall. 2028 * In this way, we won't return spaces that are on another side of a wall.
2000 * This mostly work, but it cuts down the search size in all directions - 2029 * This mostly work, but it cuts down the search size in all directions -
2001 * if the space being examined only has a wall to the north and empty 2030 * if the space being examined only has a wall to the north and empty
2002 * spaces in all the other directions, this will reduce the search space 2031 * spaces in all the other directions, this will reduce the search space
2003 * to only the spaces immediately surrounding the target area, and 2032 * to only the spaces immediately surrounding the target area, and
2004 * won't look 2 spaces south of the target space. 2033 * won't look 2 spaces south of the target space.
2005 */ 2034 */
2006 else if ((flag & P_NO_PASS) && maxfree[i] < stop) 2035 if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
2036 {
2007 stop = maxfree[i]; 2037 stop = maxfree[i];
2038 continue;
2039 }
2040
2041 /* Note it is intentional that we check ob - the movement type of the
2042 * head of the object should correspond for the entire object.
2043 */
2044 if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2045 continue;
2046
2047 altern [index++] = i;
2008 } 2048 }
2009 2049
2010 if (!index) 2050 if (!index)
2011 return -1; 2051 return -1;
2012 2052
… …
2021 */ 2061 */
2022int 2062int
2023find_first_free_spot (const object *ob, maptile *m, int x, int y) 2063find_first_free_spot (const object *ob, maptile *m, int x, int y)
2024{ 2064{
2025 for (int i = 0; i < SIZEOFFREE; i++) 2065 for (int i = 0; i < SIZEOFFREE; i++)
2026 if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i])) 2066 if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2027 return i; 2067 return i;
2028 2068
2029 return -1; 2069 return -1;
2030} 2070}
2031 2071
… …
2085 object *tmp; 2125 object *tmp;
2086 maptile *mp; 2126 maptile *mp;
2087 2127
2088 MoveType blocked, move_type; 2128 MoveType blocked, move_type;
2089 2129
2090 if (exclude && exclude->head) 2130 if (exclude && exclude->head_ () != exclude)
2091 { 2131 {
2092 exclude = exclude->head; 2132 exclude = exclude->head;
2093 move_type = exclude->move_type; 2133 move_type = exclude->move_type;
2094 } 2134 }
2095 else 2135 else
… …
2118 max = maxfree[i]; 2158 max = maxfree[i];
2119 else if (mflags & P_IS_ALIVE) 2159 else if (mflags & P_IS_ALIVE)
2120 { 2160 {
2121 for (tmp = ms.bot; tmp; tmp = tmp->above) 2161 for (tmp = ms.bot; tmp; tmp = tmp->above)
2122 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2162 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2123 && (tmp != exclude || (tmp->head && tmp->head != exclude))) 2163 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2124 break; 2164 break;
2125 2165
2126 if (tmp) 2166 if (tmp)
2127 return freedir[i]; 2167 return freedir[i];
2128 } 2168 }
… …
2308 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause 2348 * Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2309 * core dumps if they do. 2349 * core dumps if they do.
2310 * 2350 *
2311 * Add a check so we can't pick up invisible objects (0.93.8) 2351 * Add a check so we can't pick up invisible objects (0.93.8)
2312 */ 2352 */
2313
2314int 2353int
2315can_pick (const object *who, const object *item) 2354can_pick (const object *who, const object *item)
2316{ 2355{
2317 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2356 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2318 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2357 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
… …
2323 * create clone from object to another 2362 * create clone from object to another
2324 */ 2363 */
2325object * 2364object *
2326object_create_clone (object *asrc) 2365object_create_clone (object *asrc)
2327{ 2366{
2328 object *dst = 0, *tmp, *src, *part, *prev, *item; 2367 object *dst = 0, *tmp, *src, *prev, *item;
2329 2368
2330 if (!asrc) 2369 if (!asrc)
2331 return 0; 2370 return 0;
2332 2371
2333 src = asrc;
2334 if (src->head)
2335 src = src->head; 2372 src = asrc->head_ ();
2336 2373
2337 prev = 0; 2374 prev = 0;
2338 for (part = src; part; part = part->more) 2375 for (object *part = src; part; part = part->more)
2339 { 2376 {
2340 tmp = part->clone (); 2377 tmp = part->clone ();
2341 tmp->x -= src->x; 2378 tmp->x -= src->x;
2342 tmp->y -= src->y; 2379 tmp->y -= src->y;
2343 2380
… …
2456 /* Basically, if the archetype has this key set, 2493 /* Basically, if the archetype has this key set,
2457 * we need to store the null value so when we save 2494 * we need to store the null value so when we save
2458 * it, we save the empty value so that when we load, 2495 * it, we save the empty value so that when we load,
2459 * we get this value back again. 2496 * we get this value back again.
2460 */ 2497 */
2461 if (get_ob_key_link (&op->arch->clone, canonical_key)) 2498 if (get_ob_key_link (op->arch, canonical_key))
2462 field->value = 0; 2499 field->value = 0;
2463 else 2500 else
2464 { 2501 {
2465 if (last) 2502 if (last)
2466 last->next = field->next; 2503 last->next = field->next;
… …
2535 } 2572 }
2536 else 2573 else
2537 item = item->env; 2574 item = item->env;
2538} 2575}
2539 2576
2540
2541const char * 2577const char *
2542object::flag_desc (char *desc, int len) const 2578object::flag_desc (char *desc, int len) const
2543{ 2579{
2544 char *p = desc; 2580 char *p = desc;
2545 bool first = true; 2581 bool first = true;
… …
2579 &name, 2615 &name,
2580 title ? "\",title:\"" : "", 2616 title ? "\",title:\"" : "",
2581 title ? (const char *)title : "", 2617 title ? (const char *)title : "",
2582 flag_desc (flagdesc, 512), type); 2618 flag_desc (flagdesc, 512), type);
2583 2619
2584 if (env) 2620 if (!this->flag[FLAG_REMOVED] && env)
2585 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2)); 2621 p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2586 2622
2587 if (map) 2623 if (map)
2588 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y); 2624 p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2589 2625
… …
2591} 2627}
2592 2628
2593const char * 2629const char *
2594object::debug_desc () const 2630object::debug_desc () const
2595{ 2631{
2596 static char info[256 * 4]; 2632 static char info[3][256 * 4];
2633 static int info_idx;
2634
2597 return debug_desc (info); 2635 return debug_desc (info [++info_idx % 3]);
2598}
2599
2600const char *
2601object::debug_desc2 () const
2602{
2603 static char info[256 * 4];
2604 return debug_desc (info);
2605} 2636}
2606 2637
2607struct region * 2638struct region *
2608object::region () const 2639object::region () const
2609{ 2640{
… …
2612} 2643}
2613 2644
2614const materialtype_t * 2645const materialtype_t *
2615object::dominant_material () const 2646object::dominant_material () const
2616{ 2647{
2617 if (materialtype_t *mat = name_to_material (materialname)) 2648 if (materialtype_t *mt = name_to_material (materialname))
2618 return mat; 2649 return mt;
2619 2650
2620 // omfg this is slow, this has to be temporary :)
2621 shstr unknown ("unknown");
2622
2623 return name_to_material (unknown); 2651 return name_to_material (shstr_unknown);
2624} 2652}
2625 2653
2626void 2654void
2627object::open_container (object *new_container) 2655object::open_container (object *new_container)
2628{ 2656{
… …
2644 old_container->flag [FLAG_APPLIED] = 0; 2672 old_container->flag [FLAG_APPLIED] = 0;
2645 container = 0; 2673 container = 0;
2646 2674
2647 esrv_update_item (UPD_FLAGS, this, old_container); 2675 esrv_update_item (UPD_FLAGS, this, old_container);
2648 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2676 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2677 play_sound (sound_find ("chest_close"));
2649 } 2678 }
2650 2679
2651 if (new_container) 2680 if (new_container)
2652 { 2681 {
2653 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this))) 2682 if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
… …
2669 new_container->flag [FLAG_APPLIED] = 1; 2698 new_container->flag [FLAG_APPLIED] = 1;
2670 container = new_container; 2699 container = new_container;
2671 2700
2672 esrv_update_item (UPD_FLAGS, this, new_container); 2701 esrv_update_item (UPD_FLAGS, this, new_container);
2673 esrv_send_inventory (this, new_container); 2702 esrv_send_inventory (this, new_container);
2703 play_sound (sound_find ("chest_open"));
2704 }
2705}
2706
2707object *
2708object::force_find (const shstr name)
2709{
2710 /* cycle through his inventory to look for the MARK we want to
2711 * place
2712 */
2713 for (object *tmp = inv; tmp; tmp = tmp->below)
2714 if (tmp->type == FORCE && tmp->slaying == name)
2715 return splay (tmp);
2716
2717 return 0;
2718}
2719
2720void
2721object::force_add (const shstr name, int duration)
2722{
2723 if (object *force = force_find (name))
2724 force->destroy ();
2725
2726 object *force = get_archetype (FORCE_NAME);
2727
2728 force->slaying = name;
2729 force->stats.food = 1;
2730 force->speed_left = -1.f;
2731
2732 force->set_speed (duration ? 1.f / duration : 0.f);
2733 force->flag [FLAG_IS_USED_UP] = true;
2734 force->flag [FLAG_APPLIED] = true;
2735
2736 insert (force);
2737}
2738
2739void
2740object::play_sound (faceidx sound) const
2741{
2742 if (!sound)
2743 return;
2744
2745 if (flag [FLAG_REMOVED])
2746 return;
2747
2748 if (env)
2674 } 2749 {
2750 if (object *pl = in_player ())
2751 pl->contr->play_sound (sound);
2752 }
2753 else
2754 map->play_sound (sound, x, y);
2675} 2755}
2676 2756
2677

Diff Legend

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