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.263 by root, Sat Dec 20 16:29:41 2008 UTC vs.
Revision 1.290 by sf-marcmagus, Sun Oct 11 05:43:35 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra 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
… …
32#include <bitset> 32#include <bitset>
33 33
34UUID UUID::cur; 34UUID UUID::cur;
35static uint64_t seq_next_save; 35static uint64_t seq_next_save;
36static const uint64 UUID_GAP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
37uint32_t mapspace::smellcount = 10000;
37 38
38objectvec objects; 39objectvec objects;
39activevec actives; 40activevec actives;
40 41
41short freearr_x[SIZEOFFREE] = { 42short freearr_x[SIZEOFFREE] = {
… …
323 { 324 {
324 // see if we are in a container of sorts 325 // see if we are in a container of sorts
325 if (env) 326 if (env)
326 { 327 {
327 // the player inventory itself is always visible 328 // the player inventory itself is always visible
328 if (env->type == PLAYER) 329 if (env->is_player ())
329 return env; 330 return env;
330 331
331 // else a player could have our env open 332 // else a player could have our env open
332 object *envest = env->outer_env (); 333 object *envest = env->outer_env_or_self ();
333 334
334 // the player itself is always on a map, so we will find him here 335 // the player itself is always on a map, so we will find him here
335 // even if our inv is in a player. 336 // even if our inv is in a player.
336 if (envest->is_on_map ()) 337 if (envest->is_on_map ())
337 if (object *pl = envest->ms ().player ()) 338 if (object *pl = envest->ms ().player ())
… …
430 object_freezer freezer; 431 object_freezer freezer;
431 op->write (freezer); 432 op->write (freezer);
432 return freezer.as_string (); 433 return freezer.as_string ();
433} 434}
434 435
436char *
437object::as_string ()
438{
439 return dump_object (this);
440}
441
435/* 442/*
436 * get_nearest_part(multi-object, object 2) returns the part of the 443 * get_nearest_part(multi-object, object 2) returns the part of the
437 * multi-object 1 which is closest to the second object. 444 * multi-object 1 which is closest to the second object.
438 * If it's not a multi-object, it is returned. 445 * If it's not a multi-object, it is returned.
439 */ 446 */
… …
554 update_stats (); 561 update_stats ();
555 562
556 new_draw_info_format (NDI_UNIQUE, 0, this, 563 new_draw_info_format (NDI_UNIQUE, 0, this,
557 "You try to balance all your items at once, " 564 "You try to balance all your items at once, "
558 "but the %s is just too much for your body. " 565 "but the %s is just too much for your body. "
559 "[You need to unapply some items first.]", &ob->name); 566 "[You need to unapply some items first - use the 'body' command to see "
567 "how many items you cna wera on a specific body part.]", &ob->name);
560 return false; 568 return false;
561 } 569 }
562 570
563 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 571 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
564 } 572 }
… …
758 else if (action == UP_OBJ_INSERT) 766 else if (action == UP_OBJ_INSERT)
759 { 767 {
760 // this is likely overkill, TODO: revisit (schmorp) 768 // this is likely overkill, TODO: revisit (schmorp)
761 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 769 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
762 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 770 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
763 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 771 || (op->is_player () && !(m.flags_ & P_PLAYER))
764 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 772 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
765 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 773 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
766 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 774 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
767 || (m.move_on | op->move_on ) != m.move_on 775 || (m.move_on | op->move_on ) != m.move_on
768 || (m.move_off | op->move_off ) != m.move_off 776 || (m.move_off | op->move_off ) != m.move_off
… …
770 /* This isn't perfect, but I don't expect a lot of objects to 778 /* This isn't perfect, but I don't expect a lot of objects to
771 * have move_allow right now. 779 * have move_allow right now.
772 */ 780 */
773 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 781 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
774 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp) 782 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
775 m.flags_ = 0; 783 m.invalidate ();
776 } 784 }
777 /* if the object is being removed, we can't make intelligent 785 /* if the object is being removed, we can't make intelligent
778 * decisions, because remove_ob can't really pass the object 786 * decisions, because remove_ob can't really pass the object
779 * that is being removed. 787 * that is being removed.
780 */ 788 */
781 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) 789 else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
782 m.flags_ = 0; 790 m.invalidate ();
783 else if (action == UP_OBJ_FACE) 791 else if (action == UP_OBJ_FACE)
784 /* Nothing to do for that case */ ; 792 /* Nothing to do for that case */ ;
785 else 793 else
786 LOG (llevError, "update_object called with invalid action: %d\n", action); 794 LOG (llevError, "update_object called with invalid action: %d\n", action);
787 795
… …
791 799
792object::object () 800object::object ()
793{ 801{
794 SET_FLAG (this, FLAG_REMOVED); 802 SET_FLAG (this, FLAG_REMOVED);
795 803
796 expmul = 1.0; 804 //expmul = 1.0; declared const for the time being
797 face = blank_face; 805 face = blank_face;
798} 806}
799 807
800object::~object () 808object::~object ()
801{ 809{
… …
830{ 838{
831 /* If already on active list, don't do anything */ 839 /* If already on active list, don't do anything */
832 if (active) 840 if (active)
833 return; 841 return;
834 842
835 if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
836 if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
837
838 if (has_active_speed ()) 843 if (has_active_speed ())
844 {
845 if (flag [FLAG_FREED])
846 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
847
839 actives.insert (this); 848 actives.insert (this);
849 }
840} 850}
841 851
842void 852void
843object::activate_recursive () 853object::activate_recursive ()
844{ 854{
… …
962 972
963void 973void
964object::do_destroy () 974object::do_destroy ()
965{ 975{
966 if (flag [FLAG_IS_LINKED]) 976 if (flag [FLAG_IS_LINKED])
967 remove_button_link (this); 977 remove_link ();
968 978
969 if (flag [FLAG_FRIENDLY]) 979 if (flag [FLAG_FRIENDLY])
970 remove_friendly_object (this); 980 remove_friendly_object (this);
971 981
972 remove (); 982 remove ();
… …
1055 if (object *pl = visible_to ()) 1065 if (object *pl = visible_to ())
1056 esrv_del_item (pl->contr, count); 1066 esrv_del_item (pl->contr, count);
1057 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed 1067 flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1058 1068
1059 adjust_weight (env, -total_weight ()); 1069 adjust_weight (env, -total_weight ());
1070
1071 object *pl = in_player ();
1060 1072
1061 /* we set up values so that it could be inserted into 1073 /* we set up values so that it could be inserted into
1062 * the map, but we don't actually do that - it is up 1074 * the map, but we don't actually do that - it is up
1063 * to the caller to decide what we want to do. 1075 * to the caller to decide what we want to do.
1064 */ 1076 */
… …
1076 1088
1077 /* NO_FIX_PLAYER is set when a great many changes are being 1089 /* NO_FIX_PLAYER is set when a great many changes are being
1078 * made to players inventory. If set, avoiding the call 1090 * made to players inventory. If set, avoiding the call
1079 * to save cpu time. 1091 * to save cpu time.
1080 */ 1092 */
1081 if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER)) 1093 if (pl)
1094 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1095 {
1082 otmp->update_stats (); 1096 pl->update_stats ();
1097
1098 if (glow_radius && pl->is_on_map ())
1099 update_all_los (pl->map, pl->x, pl->y);
1100 }
1083 } 1101 }
1084 else if (map) 1102 else if (map)
1085 { 1103 {
1086 map->dirty = true; 1104 map->dirty = true;
1087 mapspace &ms = this->ms (); 1105 mapspace &ms = this->ms ();
1088 1106
1089 if (object *pl = ms.player ()) 1107 if (object *pl = ms.player ())
1090 { 1108 {
1091 if (type == PLAYER) // this == pl(!) 1109 if (is_player ())
1092 { 1110 {
1111 if (!flag [FLAG_WIZPASS])
1112 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1113
1093 // leaving a spot always closes any open container on the ground 1114 // leaving a spot always closes any open container on the ground
1094 if (container && !container->env) 1115 if (container && !container->env)
1095 // this causes spurious floorbox updates, but it ensures 1116 // this causes spurious floorbox updates, but it ensures
1096 // that the CLOSE event is being sent. 1117 // that the CLOSE event is being sent.
1097 close_container (); 1118 close_container ();
… …
1114 *(below ? &below->above : &ms.bot) = above; 1135 *(below ? &below->above : &ms.bot) = above;
1115 1136
1116 above = 0; 1137 above = 0;
1117 below = 0; 1138 below = 0;
1118 1139
1119 ms.flags_ = 0; 1140 ms.invalidate ();
1120 1141
1121 if (map->in_memory == MAP_SAVING) 1142 if (map->in_memory == MAP_SAVING)
1122 return; 1143 return;
1123 1144
1124 int check_walk_off = !flag [FLAG_NO_APPLY]; 1145 int check_walk_off = !flag [FLAG_NO_APPLY];
… …
1157 } 1178 }
1158 1179
1159 last = tmp; 1180 last = tmp;
1160 } 1181 }
1161 1182
1162 if (glow_radius || flag [FLAG_BLOCKSVIEW]) 1183 if (affects_los ())
1163 update_all_los (map, x, y); 1184 update_all_los (map, x, y);
1164 } 1185 }
1165} 1186}
1166 1187
1167/* 1188/*
… …
1274 1295
1275 /* Ideally, the caller figures this out. However, it complicates a lot 1296 /* Ideally, the caller figures this out. However, it complicates a lot
1276 * of areas of callers (eg, anything that uses find_free_spot would now 1297 * of areas of callers (eg, anything that uses find_free_spot would now
1277 * need extra work 1298 * need extra work
1278 */ 1299 */
1300 maptile *newmap = m;
1279 if (!xy_normalise (m, op->x, op->y)) 1301 if (!xy_normalise (newmap, op->x, op->y))
1280 { 1302 {
1281 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found 1303 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1282 return 0; 1304 return 0;
1283 } 1305 }
1284 1306
1285 if (object *more = op->more) 1307 if (object *more = op->more)
1286 if (!insert_ob_in_map (more, m, originator, flag)) 1308 if (!insert_ob_in_map (more, m, originator, flag))
1287 return 0; 1309 return 0;
1288 1310
1289 CLEAR_FLAG (op, FLAG_REMOVED); 1311 op->flag [FLAG_REMOVED] = false;
1290 1312 op->env = 0;
1291 op->map = m; 1313 op->map = newmap;
1314
1292 mapspace &ms = op->ms (); 1315 mapspace &ms = op->ms ();
1293 1316
1294 /* this has to be done after we translate the coordinates. 1317 /* this has to be done after we translate the coordinates.
1295 */ 1318 */
1296 if (op->nrof && !(flag & INS_NO_MERGE)) 1319 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1317 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1340 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1318 abort (); 1341 abort ();
1319 } 1342 }
1320 1343
1321 if (!originator->is_on_map ()) 1344 if (!originator->is_on_map ())
1345 {
1322 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", 1346 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1323 op->debug_desc (), originator->debug_desc ()); 1347 op->debug_desc (), originator->debug_desc ());
1348 abort ();
1349 }
1324 1350
1325 op->above = originator; 1351 op->above = originator;
1326 op->below = originator->below; 1352 op->below = originator->below;
1327 originator->below = op; 1353 originator->below = op;
1328 1354
… …
1414 op->below = top; 1440 op->below = top;
1415 *(op->above ? &op->above->below : &ms.top) = op; 1441 *(op->above ? &op->above->below : &ms.top) = op;
1416 } 1442 }
1417 } 1443 }
1418 1444
1419 if (op->type == PLAYER) 1445 if (op->is_player ())
1420 { 1446 {
1421 op->contr->do_los = 1; 1447 op->contr->do_los = 1;
1422 ++op->map->players; 1448 ++op->map->players;
1423 op->map->touch (); 1449 op->map->touch ();
1424 } 1450 }
… …
1439 * be far away from this change and not affected in any way - 1465 * be far away from this change and not affected in any way -
1440 * this should get redone to only look for players within range, 1466 * this should get redone to only look for players within range,
1441 * or just updating the P_UPTODATE for spaces within this area 1467 * or just updating the P_UPTODATE for spaces within this area
1442 * of effect may be sufficient. 1468 * of effect may be sufficient.
1443 */ 1469 */
1444 if (op->map->darkness && (op->glow_radius || op->flag [FLAG_BLOCKSVIEW])) 1470 if (op->affects_los ())
1471 {
1472 op->ms ().invalidate ();
1445 update_all_los (op->map, op->x, op->y); 1473 update_all_los (op->map, op->x, op->y);
1474 }
1446 1475
1447 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1476 /* updates flags (blocked, alive, no magic, etc) for this map space */
1448 update_object (op, UP_OBJ_INSERT); 1477 update_object (op, UP_OBJ_INSERT);
1449 1478
1450 INVOKE_OBJECT (INSERT, op); 1479 INVOKE_OBJECT (INSERT, op);
… …
1457 * blocked() and wall() work properly), and these flags are updated by 1486 * blocked() and wall() work properly), and these flags are updated by
1458 * update_object(). 1487 * update_object().
1459 */ 1488 */
1460 1489
1461 /* if this is not the head or flag has been passed, don't check walk on status */ 1490 /* if this is not the head or flag has been passed, don't check walk on status */
1462 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1491 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1463 { 1492 {
1464 if (check_move_on (op, originator)) 1493 if (check_move_on (op, originator))
1465 return 0; 1494 return 0;
1466 1495
1467 /* If we are a multi part object, lets work our way through the check 1496 /* If we are a multi part object, lets work our way through the check
… …
1478/* this function inserts an object in the map, but if it 1507/* this function inserts an object in the map, but if it
1479 * finds an object of its own type, it'll remove that one first. 1508 * finds an object of its own type, it'll remove that one first.
1480 * op is the object to insert it under: supplies x and the map. 1509 * op is the object to insert it under: supplies x and the map.
1481 */ 1510 */
1482void 1511void
1483replace_insert_ob_in_map (const char *arch_string, object *op) 1512replace_insert_ob_in_map (shstr_tmp archname, object *op)
1484{ 1513{
1485 /* first search for itself and remove any old instances */ 1514 /* first search for itself and remove any old instances */
1486 1515
1487 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1516 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1488 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1517 if (tmp->arch->archname == archname) /* same archetype */
1489 tmp->destroy (); 1518 tmp->destroy ();
1490 1519
1491 object *tmp = arch_to_object (archetype::find (arch_string)); 1520 object *tmp = arch_to_object (archetype::find (archname));
1492 1521
1493 tmp->x = op->x; 1522 tmp->x = op->x;
1494 tmp->y = op->y; 1523 tmp->y = op->y;
1495 1524
1496 insert_ob_in_map (tmp, op->map, op, 0); 1525 insert_ob_in_map (tmp, op->map, op, 0);
… …
1645 1674
1646 adjust_weight (this, op->total_weight ()); 1675 adjust_weight (this, op->total_weight ());
1647 1676
1648inserted: 1677inserted:
1649 /* reset the light list and los of the players on the map */ 1678 /* reset the light list and los of the players on the map */
1650 if (op->glow_radius && map && map->darkness) 1679 if (op->glow_radius && is_on_map ())
1680 {
1681 update_stats ();
1651 update_all_los (map, x, y); 1682 update_all_los (map, x, y);
1652 1683 }
1684 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1653 // if this is a player's inventory, update stats 1685 // if this is a player's inventory, update stats
1654 if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1655 update_stats (); 1686 update_stats ();
1656 1687
1657 INVOKE_OBJECT (INSERT, this); 1688 INVOKE_OBJECT (INSERT, this);
1658 1689
1659 return op; 1690 return op;
… …
1680 * on top. 1711 * on top.
1681 */ 1712 */
1682int 1713int
1683check_move_on (object *op, object *originator) 1714check_move_on (object *op, object *originator)
1684{ 1715{
1716 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1717 return 0;
1718
1685 object *tmp; 1719 object *tmp;
1686 maptile *m = op->map; 1720 maptile *m = op->map;
1687 int x = op->x, y = op->y; 1721 int x = op->x, y = op->y;
1688 1722
1689 MoveType move_on, move_slow, move_block; 1723 mapspace &ms = m->at (x, y);
1690 1724
1691 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1725 ms.update ();
1692 return 0;
1693 1726
1694 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1727 MoveType move_on = ms.move_on;
1695 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1728 MoveType move_slow = ms.move_slow;
1696 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1729 MoveType move_block = ms.move_block;
1697 1730
1698 /* if nothing on this space will slow op down or be applied, 1731 /* if nothing on this space will slow op down or be applied,
1699 * no need to do checking below. have to make sure move_type 1732 * no need to do checking below. have to make sure move_type
1700 * is set, as lots of objects don't have it set - we treat that 1733 * is set, as lots of objects don't have it set - we treat that
1701 * as walking. 1734 * as walking.
… …
1712 return 0; 1745 return 0;
1713 1746
1714 /* The objects have to be checked from top to bottom. 1747 /* The objects have to be checked from top to bottom.
1715 * Hence, we first go to the top: 1748 * Hence, we first go to the top:
1716 */ 1749 */
1717 1750 for (object *next, *tmp = ms.top; tmp; tmp = next)
1718 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1719 {
1720 /* Trim the search when we find the first other spell effect
1721 * this helps performance so that if a space has 50 spell objects,
1722 * we don't need to check all of them.
1723 */
1724 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1725 break;
1726 } 1751 {
1752 next = tmp->below;
1727 1753
1728 for (; tmp; tmp = tmp->below)
1729 {
1730 if (tmp == op) 1754 if (tmp == op)
1731 continue; /* Can't apply yourself */ 1755 continue; /* Can't apply yourself */
1732 1756
1733 /* Check to see if one of the movement types should be slowed down. 1757 /* Check to see if one of the movement types should be slowed down.
1734 * Second check makes sure that the movement types not being slowed 1758 * Second check makes sure that the movement types not being slowed
… …
1739 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1763 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1740 { 1764 {
1741 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1765 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1742 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1766 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1743 { 1767 {
1744
1745 float
1746 diff = tmp->move_slow_penalty * fabs (op->speed); 1768 float diff = tmp->move_slow_penalty * fabs (op->speed);
1747 1769
1748 if (op->type == PLAYER) 1770 if (op->is_player ())
1749 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1771 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1750 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1772 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1751 diff /= 4.0; 1773 diff /= 4.0;
1752 1774
1753 op->speed_left -= diff; 1775 op->speed_left -= diff;
1754 } 1776 }
1755 } 1777 }
… …
2039 * there is capable of. 2061 * there is capable of.
2040 */ 2062 */
2041int 2063int
2042find_dir (maptile *m, int x, int y, object *exclude) 2064find_dir (maptile *m, int x, int y, object *exclude)
2043{ 2065{
2044 int i, max = SIZEOFFREE, mflags; 2066 int max = SIZEOFFREE, mflags;
2045
2046 sint16 nx, ny;
2047 object *tmp;
2048 maptile *mp;
2049
2050 MoveType blocked, move_type; 2067 MoveType move_type;
2051 2068
2052 if (exclude && exclude->head_ () != exclude) 2069 if (exclude && exclude->head_ () != exclude)
2053 { 2070 {
2054 exclude = exclude->head; 2071 exclude = exclude->head;
2055 move_type = exclude->move_type; 2072 move_type = exclude->move_type;
… …
2058 { 2075 {
2059 /* If we don't have anything, presume it can use all movement types. */ 2076 /* If we don't have anything, presume it can use all movement types. */
2060 move_type = MOVE_ALL; 2077 move_type = MOVE_ALL;
2061 } 2078 }
2062 2079
2063 for (i = 1; i < max; i++) 2080 for (int i = 1; i < max; i++)
2064 { 2081 {
2065 mp = m; 2082 mapxy pos (m, x, y);
2066 nx = x + freearr_x[i]; 2083 pos.move (i);
2067 ny = y + freearr_y[i];
2068 2084
2069 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2085 if (!pos.normalise ())
2070
2071 if (mflags & P_OUT_OF_MAP)
2072 max = maxfree[i]; 2086 max = maxfree[i];
2073 else 2087 else
2074 { 2088 {
2075 mapspace &ms = mp->at (nx, ny); 2089 mapspace &ms = *pos;
2076 2090
2077 blocked = ms.move_block;
2078
2079 if ((move_type & blocked) == move_type) 2091 if ((move_type & ms.move_block) == move_type)
2080 max = maxfree[i]; 2092 max = maxfree [i];
2081 else if (mflags & P_IS_ALIVE) 2093 else if (ms.flags () & P_IS_ALIVE)
2082 { 2094 {
2083 for (tmp = ms.bot; tmp; tmp = tmp->above) 2095 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2084 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2096 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2085 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2097 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2086 break;
2087
2088 if (tmp)
2089 return freedir[i]; 2098 return freedir [i];
2090 } 2099 }
2091 } 2100 }
2092 } 2101 }
2093 2102
2094 return 0; 2103 return 0;
… …
2169 * This basically means that if direction is 15, then it could either go 2178 * This basically means that if direction is 15, then it could either go
2170 * direction 4, 14, or 16 to get back to where we are. 2179 * direction 4, 14, or 16 to get back to where we are.
2171 * Moved from spell_util.c to object.c with the other related direction 2180 * Moved from spell_util.c to object.c with the other related direction
2172 * functions. 2181 * functions.
2173 */ 2182 */
2174int reduction_dir[SIZEOFFREE][3] = { 2183const int reduction_dir[SIZEOFFREE][3] = {
2175 {0, 0, 0}, /* 0 */ 2184 {0, 0, 0}, /* 0 */
2176 {0, 0, 0}, /* 1 */ 2185 {0, 0, 0}, /* 1 */
2177 {0, 0, 0}, /* 2 */ 2186 {0, 0, 0}, /* 2 */
2178 {0, 0, 0}, /* 3 */ 2187 {0, 0, 0}, /* 3 */
2179 {0, 0, 0}, /* 4 */ 2188 {0, 0, 0}, /* 4 */
… …
2275int 2284int
2276can_pick (const object *who, const object *item) 2285can_pick (const object *who, const object *item)
2277{ 2286{
2278 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2287 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2279 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2288 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2280 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2289 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2281} 2290}
2282 2291
2283/* 2292/*
2284 * create clone from object to another 2293 * create clone from object to another
2285 */ 2294 */
… …
2317 return tmp; 2326 return tmp;
2318 2327
2319 return 0; 2328 return 0;
2320} 2329}
2321 2330
2322const shstr & 2331shstr_tmp
2323object::kv_get (const shstr &key) const 2332object::kv_get (shstr_tmp key) const
2324{ 2333{
2325 for (key_value *kv = key_values; kv; kv = kv->next) 2334 for (key_value *kv = key_values; kv; kv = kv->next)
2326 if (kv->key == key) 2335 if (kv->key == key)
2327 return kv->value; 2336 return kv->value;
2328 2337
2329 return shstr_null; 2338 return shstr ();
2330} 2339}
2331 2340
2332void 2341void
2333object::kv_set (const shstr &key, const shstr &value) 2342object::kv_set (shstr_tmp key, shstr_tmp value)
2334{ 2343{
2335 for (key_value *kv = key_values; kv; kv = kv->next) 2344 for (key_value *kv = key_values; kv; kv = kv->next)
2336 if (kv->key == key) 2345 if (kv->key == key)
2337 { 2346 {
2338 kv->value = value; 2347 kv->value = value;
… …
2347 2356
2348 key_values = kv; 2357 key_values = kv;
2349} 2358}
2350 2359
2351void 2360void
2352object::kv_del (const shstr &key) 2361object::kv_del (shstr_tmp key)
2353{ 2362{
2354 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2363 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2355 if ((*kvp)->key == key) 2364 if ((*kvp)->key == key)
2356 { 2365 {
2357 key_value *kv = *kvp; 2366 key_value *kv = *kvp;
… …
2488 container = 0; 2497 container = 0;
2489 2498
2490 // client needs item update to make it work, client bug requires this to be separate 2499 // client needs item update to make it work, client bug requires this to be separate
2491 esrv_update_item (UPD_FLAGS, this, old_container); 2500 esrv_update_item (UPD_FLAGS, this, old_container);
2492 2501
2493 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2502 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2494 play_sound (sound_find ("chest_close")); 2503 play_sound (sound_find ("chest_close"));
2495 } 2504 }
2496 2505
2497 if (new_container) 2506 if (new_container)
2498 { 2507 {
… …
2508 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2517 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2509 new_container->insert (closer); 2518 new_container->insert (closer);
2510 } 2519 }
2511#endif 2520#endif
2512 2521
2513 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2522 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2514 2523
2515 // make sure the container is available, client bug requires this to be separate 2524 // make sure the container is available, client bug requires this to be separate
2516 esrv_send_item (this, new_container); 2525 esrv_send_item (this, new_container);
2517 2526
2518 new_container->flag [FLAG_APPLIED] = true; 2527 new_container->flag [FLAG_APPLIED] = true;
… …
2526// else if (!old_container->env && contr && contr->ns) 2535// else if (!old_container->env && contr && contr->ns)
2527// contr->ns->floorbox_reset (); 2536// contr->ns->floorbox_reset ();
2528} 2537}
2529 2538
2530object * 2539object *
2531object::force_find (const shstr name) 2540object::force_find (shstr_tmp name)
2532{ 2541{
2533 /* cycle through his inventory to look for the MARK we want to 2542 /* cycle through his inventory to look for the MARK we want to
2534 * place 2543 * place
2535 */ 2544 */
2536 for (object *tmp = inv; tmp; tmp = tmp->below) 2545 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2539 2548
2540 return 0; 2549 return 0;
2541} 2550}
2542 2551
2543void 2552void
2553object::force_set_timer (int duration)
2554{
2555 this->duration = 1;
2556 this->speed_left = -1.f;
2557
2558 this->set_speed (duration ? 1.f / duration : 0.f);
2559}
2560
2561object *
2544object::force_add (const shstr name, int duration) 2562object::force_add (shstr_tmp name, int duration)
2545{ 2563{
2546 if (object *force = force_find (name)) 2564 if (object *force = force_find (name))
2547 force->destroy (); 2565 force->destroy ();
2548 2566
2549 object *force = get_archetype (FORCE_NAME); 2567 object *force = get_archetype (FORCE_NAME);
2550 2568
2551 force->slaying = name; 2569 force->slaying = name;
2552 force->stats.food = 1;
2553 force->speed_left = -1.f;
2554 2570
2555 force->set_speed (duration ? 1.f / duration : 0.f); 2571 force->force_set_timer (duration);
2556 force->flag [FLAG_IS_USED_UP] = true; 2572
2557 force->flag [FLAG_APPLIED] = true; 2573 force->flag [FLAG_APPLIED] = true;
2558 2574
2559 insert (force); 2575 return insert (force);
2560} 2576}
2561 2577
2562void 2578void
2563object::play_sound (faceidx sound) 2579object::play_sound (faceidx sound) const
2564{ 2580{
2565 if (!sound) 2581 if (!sound)
2566 return; 2582 return;
2567 2583
2568 if (flag [FLAG_REMOVED]) 2584 if (is_on_map ())
2585 map->play_sound (sound, x, y);
2586 else if (object *pl = in_player ())
2587 pl->contr->play_sound (sound);
2588}
2589
2590void
2591object::say_msg (const char *msg) const
2592{
2593 if (is_on_map ())
2594 map->say_msg (msg, x, y);
2595 else if (object *pl = in_player ())
2596 pl->contr->play_sound (sound);
2597}
2598
2599void
2600object::make_noise ()
2601{
2602 // we do not model noise in the map, so instead put
2603 // a temporary light into the noise source
2604 // could use the map instead, but that's less reliable for our
2605 // goal, which is to make invisibility a bit harder to exploit
2606
2607 // currently only works sensibly for players
2608 if (!is_player ())
2569 return; 2609 return;
2570 2610
2571 if (env) 2611 // find old force, or create new one
2572 { 2612 object *force = force_find (shstr_noise_force);
2573 if (object *pl = in_player ()) 2613
2574 pl->contr->play_sound (sound); 2614 if (force)
2575 } 2615 force->speed_left = -1.f; // patch old speed up
2576 else 2616 else
2577 map->play_sound (sound, x, y); 2617 {
2578} 2618 force = archetype::get (shstr_noise_force);
2579 2619
2620 force->slaying = shstr_noise_force;
2621 force->stats.food = 1;
2622 force->speed_left = -1.f;
2623
2624 force->set_speed (1.f / 4.f);
2625 force->flag [FLAG_IS_USED_UP] = true;
2626 force->flag [FLAG_APPLIED] = true;
2627
2628 insert (force);
2629 }
2630}
2631

Diff Legend

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