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.273 by root, Sat Dec 27 04:15:56 2008 UTC vs.
Revision 1.298 by root, Sun Nov 8 00:01:33 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 it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
36static const uint64 UUID_GAP = 1<<19; 37static const uint64 UUID_GAP = 1<<19;
37uint32_t mapspace::smellcount = 10000; 38uint32_t mapspace::smellcount = 10000;
38 39
39objectvec objects; 40objectvec objects;
40activevec actives; 41activevec actives;
42
43//+GPL
41 44
42short freearr_x[SIZEOFFREE] = { 45short freearr_x[SIZEOFFREE] = {
43 0, 46 0,
44 0, 1, 1, 1, 0, -1, -1, -1, 47 0, 1, 1, 1, 0, -1, -1, -1,
45 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1, 48 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
… …
49 0, 52 0,
50 -1, -1, 0, 1, 1, 1, 0, -1, 53 -1, -1, 0, 1, 1, 1, 0, -1,
51 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, 54 -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
52 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3 55 -3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
53}; 56};
54int maxfree[SIZEOFFREE] = {
55 0,
56 9, 10, 13, 14, 17, 18, 21, 22,
57 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
58 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
59};
60int freedir[SIZEOFFREE] = { 57int freedir[SIZEOFFREE] = {
61 0, 58 0,
62 1, 2, 3, 4, 5, 6, 7, 8, 59 1, 2, 3, 4, 5, 6, 7, 8,
63 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8, 60 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
64 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8 61 1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
62};
63
64static int maxfree[SIZEOFFREE] = {
65 0,
66 9, 10, 13, 14, 17, 18, 21, 22,
67 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
68 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
65}; 69};
66 70
67static void 71static void
68write_uuid (uval64 skip, bool sync) 72write_uuid (uval64 skip, bool sync)
69{ 73{
… …
182bool object::can_merge_slow (object *ob1, object *ob2) 186bool object::can_merge_slow (object *ob1, object *ob2)
183{ 187{
184 /* A couple quicksanity checks */ 188 /* A couple quicksanity checks */
185 if (ob1 == ob2 189 if (ob1 == ob2
186 || ob1->type != ob2->type 190 || ob1->type != ob2->type
187 || ob1->speed != ob2->speed 191 || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
188 || ob1->value != ob2->value 192 || ob1->value != ob2->value
189 || ob1->name != ob2->name) 193 || ob1->name != ob2->name)
190 return 0; 194 return 0;
191 195
192 /* Do not merge objects if nrof would overflow, assume nrof 196 /* Do not merge objects if nrof would overflow, assume nrof
… …
226 || ob1->move_block != ob2->move_block 230 || ob1->move_block != ob2->move_block
227 || ob1->move_allow != ob2->move_allow 231 || ob1->move_allow != ob2->move_allow
228 || ob1->move_on != ob2->move_on 232 || ob1->move_on != ob2->move_on
229 || ob1->move_off != ob2->move_off 233 || ob1->move_off != ob2->move_off
230 || ob1->move_slow != ob2->move_slow 234 || ob1->move_slow != ob2->move_slow
231 || ob1->move_slow_penalty != ob2->move_slow_penalty 235 || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
232 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) 236 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
233 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats))) 237 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
234 return 0; 238 return 0;
235 239
236 if ((ob1->flag ^ ob2->flag) 240 if ((ob1->flag ^ ob2->flag)
… …
328 // the player inventory itself is always visible 332 // the player inventory itself is always visible
329 if (env->is_player ()) 333 if (env->is_player ())
330 return env; 334 return env;
331 335
332 // else a player could have our env open 336 // else a player could have our env open
333 object *envest = env->outer_env (); 337 object *envest = env->outer_env_or_self ();
334 338
335 // the player itself is always on a map, so we will find him here 339 // the player itself is always on a map, so we will find him here
336 // even if our inv is in a player. 340 // even if our inv is in a player.
337 if (envest->is_on_map ()) 341 if (envest->is_on_map ())
338 if (object *pl = envest->ms ().player ()) 342 if (object *pl = envest->ms ().player ())
339 if (pl->container == env) 343 if (pl->container_ () == env)
340 return pl; 344 return pl;
341 } 345 }
342 else 346 else
343 { 347 {
344 // maybe there is a player standing on the same mapspace 348 // maybe there is a player standing on the same mapspace
345 // this will catch the case where "this" is a player 349 // this will catch the case where "this" is a player
346 if (object *pl = ms ().player ()) 350 if (object *pl = ms ().player ())
347 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) 351 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
348 || this == pl->container) 352 || pl->container_ () == this)
349 return pl; 353 return pl;
350 } 354 }
351 } 355 }
352 356
353 return 0; 357 return 0;
… …
431 object_freezer freezer; 435 object_freezer freezer;
432 op->write (freezer); 436 op->write (freezer);
433 return freezer.as_string (); 437 return freezer.as_string ();
434} 438}
435 439
436/* 440char *
437 * get_nearest_part(multi-object, object 2) returns the part of the 441object::as_string ()
438 * multi-object 1 which is closest to the second object.
439 * If it's not a multi-object, it is returned.
440 */
441object *
442get_nearest_part (object *op, const object *pl)
443{ 442{
444 object *tmp, *closest; 443 return dump_object (this);
445 int last_dist, i;
446
447 if (!op->more)
448 return op;
449
450 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
451 tmp;
452 tmp = tmp->more)
453 if ((i = distance (tmp, pl)) < last_dist)
454 closest = tmp, last_dist = i;
455
456 return closest;
457} 444}
458 445
459/* 446/*
460 * Returns the object which has the count-variable equal to the argument. 447 * Returns the object which has the count-variable equal to the argument.
461 * VERRRY slow. 448 * VERRRY slow.
… …
555 update_stats (); 542 update_stats ();
556 543
557 new_draw_info_format (NDI_UNIQUE, 0, this, 544 new_draw_info_format (NDI_UNIQUE, 0, this,
558 "You try to balance all your items at once, " 545 "You try to balance all your items at once, "
559 "but the %s is just too much for your body. " 546 "but the %s is just too much for your body. "
560 "[You need to unapply some items first.]", &ob->name); 547 "[You need to unapply some items first - use the 'body' command to see "
548 "how many items you cna wera on a specific body part.]", &ob->name);
561 return false; 549 return false;
562 } 550 }
563 551
564 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 552 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
565 } 553 }
… …
691 * This function needs to be called whenever the speed of an object changes. 679 * This function needs to be called whenever the speed of an object changes.
692 */ 680 */
693void 681void
694object::set_speed (float speed) 682object::set_speed (float speed)
695{ 683{
696 if (flag [FLAG_FREED] && speed)
697 {
698 LOG (llevError, "Object %s is freed but has speed.\n", &name);
699 speed = 0;
700 }
701
702 this->speed = speed; 684 this->speed = speed;
703 685
704 if (has_active_speed ()) 686 if (has_active_speed ())
705 activate (); 687 activate ();
706 else 688 else
… …
756 738
757 if (!(m.flags_ & P_UPTODATE)) 739 if (!(m.flags_ & P_UPTODATE))
758 /* nop */; 740 /* nop */;
759 else if (action == UP_OBJ_INSERT) 741 else if (action == UP_OBJ_INSERT)
760 { 742 {
743#if 0
761 // this is likely overkill, TODO: revisit (schmorp) 744 // this is likely overkill, TODO: revisit (schmorp)
762 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 745 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
763 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 746 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
764 || (op->is_player () && !(m.flags_ & P_PLAYER)) 747 || (op->is_player () && !(m.flags_ & P_PLAYER))
765 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 748 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
… …
770 || (m.move_slow | op->move_slow) != m.move_slow 753 || (m.move_slow | op->move_slow) != m.move_slow
771 /* This isn't perfect, but I don't expect a lot of objects to 754 /* This isn't perfect, but I don't expect a lot of objects to
772 * have move_allow right now. 755 * have move_allow right now.
773 */ 756 */
774 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block 757 || ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
775 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
776 m.invalidate (); 758 m.invalidate ();
759#else
760 // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
761 m.invalidate ();
762#endif
777 } 763 }
778 /* if the object is being removed, we can't make intelligent 764 /* if the object is being removed, we can't make intelligent
779 * decisions, because remove_ob can't really pass the object 765 * decisions, because remove_ob can't really pass the object
780 * that is being removed. 766 * that is being removed.
781 */ 767 */
… …
792 778
793object::object () 779object::object ()
794{ 780{
795 SET_FLAG (this, FLAG_REMOVED); 781 SET_FLAG (this, FLAG_REMOVED);
796 782
797 expmul = 1.0; 783 //expmul = 1.0; declared const for the time being
798 face = blank_face; 784 face = blank_face;
799} 785}
800 786
801object::~object () 787object::~object ()
802{ 788{
… …
831{ 817{
832 /* If already on active list, don't do anything */ 818 /* If already on active list, don't do anything */
833 if (active) 819 if (active)
834 return; 820 return;
835 821
836 if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
837 if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
838
839 if (has_active_speed ()) 822 if (has_active_speed ())
823 {
824 if (flag [FLAG_FREED])
825 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
826
840 actives.insert (this); 827 actives.insert (this);
828 }
841} 829}
842 830
843void 831void
844object::activate_recursive () 832object::activate_recursive ()
845{ 833{
… …
963 951
964void 952void
965object::do_destroy () 953object::do_destroy ()
966{ 954{
967 if (flag [FLAG_IS_LINKED]) 955 if (flag [FLAG_IS_LINKED])
968 remove_button_link (this); 956 remove_link ();
969 957
970 if (flag [FLAG_FRIENDLY]) 958 if (flag [FLAG_FRIENDLY])
971 remove_friendly_object (this); 959 remove_friendly_object (this);
972 960
973 remove (); 961 remove ();
… …
1031 * the previous environment. 1019 * the previous environment.
1032 */ 1020 */
1033void 1021void
1034object::do_remove () 1022object::do_remove ()
1035{ 1023{
1036 object *tmp, *last = 0;
1037 object *otmp;
1038
1039 if (flag [FLAG_REMOVED]) 1024 if (flag [FLAG_REMOVED])
1040 return; 1025 return;
1041 1026
1042 INVOKE_OBJECT (REMOVE, this); 1027 INVOKE_OBJECT (REMOVE, this);
1043 1028
… …
1109 close_container (); 1094 close_container ();
1110 1095
1111 --map->players; 1096 --map->players;
1112 map->touch (); 1097 map->touch ();
1113 } 1098 }
1114 else if (pl->container == this) 1099 else if (pl->container_ () == this)
1115 { 1100 {
1116 // removing a container should close it 1101 // removing a container should close it
1117 close_container (); 1102 close_container ();
1118 } 1103 }
1119 1104
… …
1135 1120
1136 int check_walk_off = !flag [FLAG_NO_APPLY]; 1121 int check_walk_off = !flag [FLAG_NO_APPLY];
1137 1122
1138 if (object *pl = ms.player ()) 1123 if (object *pl = ms.player ())
1139 { 1124 {
1140 if (pl->container == this) 1125 if (pl->container_ () == this)
1141 /* If a container that the player is currently using somehow gets 1126 /* If a container that the player is currently using somehow gets
1142 * removed (most likely destroyed), update the player view 1127 * removed (most likely destroyed), update the player view
1143 * appropriately. 1128 * appropriately.
1144 */ 1129 */
1145 pl->close_container (); 1130 pl->close_container ();
… …
1149 //TODO: update floorbox to preserve ordering 1134 //TODO: update floorbox to preserve ordering
1150 if (pl->contr->ns) 1135 if (pl->contr->ns)
1151 pl->contr->ns->floorbox_update (); 1136 pl->contr->ns->floorbox_update ();
1152 } 1137 }
1153 1138
1139 if (check_walk_off)
1154 for (tmp = ms.bot; tmp; tmp = tmp->above) 1140 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1155 { 1141 {
1142 above = tmp->above;
1143
1156 /* No point updating the players look faces if he is the object 1144 /* No point updating the players look faces if he is the object
1157 * being removed. 1145 * being removed.
1158 */ 1146 */
1159 1147
1160 /* See if object moving off should effect something */ 1148 /* See if object moving off should effect something */
1161 if (check_walk_off
1162 && ((move_type & tmp->move_off) 1149 if ((move_type & tmp->move_off)
1163 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1150 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1164 {
1165 move_apply (tmp, this, 0); 1151 move_apply (tmp, this, 0);
1166
1167 if (destroyed ())
1168 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1169 } 1152 }
1170
1171 last = tmp;
1172 }
1173 1153
1174 if (affects_los ()) 1154 if (affects_los ())
1175 update_all_los (map, x, y); 1155 update_all_los (map, x, y);
1176 } 1156 }
1177} 1157}
… …
1286 1266
1287 /* Ideally, the caller figures this out. However, it complicates a lot 1267 /* Ideally, the caller figures this out. However, it complicates a lot
1288 * of areas of callers (eg, anything that uses find_free_spot would now 1268 * of areas of callers (eg, anything that uses find_free_spot would now
1289 * need extra work 1269 * need extra work
1290 */ 1270 */
1271 maptile *newmap = m;
1291 if (!xy_normalise (m, op->x, op->y)) 1272 if (!xy_normalise (newmap, op->x, op->y))
1292 { 1273 {
1293 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found 1274 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1294 return 0; 1275 return 0;
1295 } 1276 }
1296 1277
1297 if (object *more = op->more) 1278 if (object *more = op->more)
1298 if (!insert_ob_in_map (more, m, originator, flag)) 1279 if (!insert_ob_in_map (more, m, originator, flag))
1299 return 0; 1280 return 0;
1300 1281
1301 CLEAR_FLAG (op, FLAG_REMOVED); 1282 op->flag [FLAG_REMOVED] = false;
1302 1283 op->env = 0;
1303 op->map = m; 1284 op->map = newmap;
1285
1304 mapspace &ms = op->ms (); 1286 mapspace &ms = op->ms ();
1305 1287
1306 /* this has to be done after we translate the coordinates. 1288 /* this has to be done after we translate the coordinates.
1307 */ 1289 */
1308 if (op->nrof && !(flag & INS_NO_MERGE)) 1290 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1329 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1311 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1330 abort (); 1312 abort ();
1331 } 1313 }
1332 1314
1333 if (!originator->is_on_map ()) 1315 if (!originator->is_on_map ())
1316 {
1334 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", 1317 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1335 op->debug_desc (), originator->debug_desc ()); 1318 op->debug_desc (), originator->debug_desc ());
1319 abort ();
1320 }
1336 1321
1337 op->above = originator; 1322 op->above = originator;
1338 op->below = originator->below; 1323 op->below = originator->below;
1339 originator->below = op; 1324 originator->below = op;
1340 1325
… …
1472 * blocked() and wall() work properly), and these flags are updated by 1457 * blocked() and wall() work properly), and these flags are updated by
1473 * update_object(). 1458 * update_object().
1474 */ 1459 */
1475 1460
1476 /* if this is not the head or flag has been passed, don't check walk on status */ 1461 /* if this is not the head or flag has been passed, don't check walk on status */
1477 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1462 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1478 { 1463 {
1479 if (check_move_on (op, originator)) 1464 if (check_move_on (op, originator))
1480 return 0; 1465 return 0;
1481 1466
1482 /* If we are a multi part object, lets work our way through the check 1467 /* If we are a multi part object, lets work our way through the check
… …
1493/* this function inserts an object in the map, but if it 1478/* this function inserts an object in the map, but if it
1494 * finds an object of its own type, it'll remove that one first. 1479 * finds an object of its own type, it'll remove that one first.
1495 * op is the object to insert it under: supplies x and the map. 1480 * op is the object to insert it under: supplies x and the map.
1496 */ 1481 */
1497void 1482void
1498replace_insert_ob_in_map (const char *arch_string, object *op) 1483replace_insert_ob_in_map (shstr_tmp archname, object *op)
1499{ 1484{
1500 /* first search for itself and remove any old instances */ 1485 /* first search for itself and remove any old instances */
1501 1486
1502 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1487 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1503 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1488 if (tmp->arch->archname == archname) /* same archetype */
1504 tmp->destroy (); 1489 tmp->destroy ();
1505 1490
1506 object *tmp = arch_to_object (archetype::find (arch_string)); 1491 object *tmp = arch_to_object (archetype::find (archname));
1507 1492
1508 tmp->x = op->x; 1493 tmp->x = op->x;
1509 tmp->y = op->y; 1494 tmp->y = op->y;
1510 1495
1511 insert_ob_in_map (tmp, op->map, op, 0); 1496 insert_ob_in_map (tmp, op->map, op, 0);
… …
1697 * on top. 1682 * on top.
1698 */ 1683 */
1699int 1684int
1700check_move_on (object *op, object *originator) 1685check_move_on (object *op, object *originator)
1701{ 1686{
1687 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1688 return 0;
1689
1702 object *tmp; 1690 object *tmp;
1703 maptile *m = op->map; 1691 maptile *m = op->map;
1704 int x = op->x, y = op->y; 1692 int x = op->x, y = op->y;
1705 1693
1706 MoveType move_on, move_slow, move_block; 1694 mapspace &ms = m->at (x, y);
1707 1695
1708 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1696 ms.update ();
1709 return 0;
1710 1697
1711 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1698 MoveType move_on = ms.move_on;
1712 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1699 MoveType move_slow = ms.move_slow;
1713 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1700 MoveType move_block = ms.move_block;
1714 1701
1715 /* if nothing on this space will slow op down or be applied, 1702 /* if nothing on this space will slow op down or be applied,
1716 * no need to do checking below. have to make sure move_type 1703 * no need to do checking below. have to make sure move_type
1717 * is set, as lots of objects don't have it set - we treat that 1704 * is set, as lots of objects don't have it set - we treat that
1718 * as walking. 1705 * as walking.
… …
1729 return 0; 1716 return 0;
1730 1717
1731 /* The objects have to be checked from top to bottom. 1718 /* The objects have to be checked from top to bottom.
1732 * Hence, we first go to the top: 1719 * Hence, we first go to the top:
1733 */ 1720 */
1734 1721 for (object *next, *tmp = ms.top; tmp; tmp = next)
1735 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1736 {
1737 /* Trim the search when we find the first other spell effect
1738 * this helps performance so that if a space has 50 spell objects,
1739 * we don't need to check all of them.
1740 */
1741 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1742 break;
1743 } 1722 {
1723 next = tmp->below;
1744 1724
1745 for (; tmp; tmp = tmp->below)
1746 {
1747 if (tmp == op) 1725 if (tmp == op)
1748 continue; /* Can't apply yourself */ 1726 continue; /* Can't apply yourself */
1749 1727
1750 /* Check to see if one of the movement types should be slowed down. 1728 /* Check to see if one of the movement types should be slowed down.
1751 * Second check makes sure that the movement types not being slowed 1729 * Second check makes sure that the movement types not being slowed
… …
1756 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1734 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1757 { 1735 {
1758 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1736 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1759 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1737 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1760 { 1738 {
1761
1762 float
1763 diff = tmp->move_slow_penalty * fabs (op->speed); 1739 float diff = tmp->move_slow_penalty * fabs (op->speed);
1764 1740
1765 if (op->is_player ()) 1741 if (op->is_player ())
1766 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1742 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1767 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1743 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1768 diff /= 4.0; 1744 diff /= 4.0;
1769 1745
1770 op->speed_left -= diff; 1746 op->speed_left -= diff;
1771 } 1747 }
1772 } 1748 }
… …
2056 * there is capable of. 2032 * there is capable of.
2057 */ 2033 */
2058int 2034int
2059find_dir (maptile *m, int x, int y, object *exclude) 2035find_dir (maptile *m, int x, int y, object *exclude)
2060{ 2036{
2061 int i, max = SIZEOFFREE, mflags; 2037 int max = SIZEOFFREE, mflags;
2062
2063 sint16 nx, ny;
2064 object *tmp;
2065 maptile *mp;
2066
2067 MoveType blocked, move_type; 2038 MoveType move_type;
2068 2039
2069 if (exclude && exclude->head_ () != exclude) 2040 if (exclude && exclude->head_ () != exclude)
2070 { 2041 {
2071 exclude = exclude->head; 2042 exclude = exclude->head;
2072 move_type = exclude->move_type; 2043 move_type = exclude->move_type;
… …
2075 { 2046 {
2076 /* If we don't have anything, presume it can use all movement types. */ 2047 /* If we don't have anything, presume it can use all movement types. */
2077 move_type = MOVE_ALL; 2048 move_type = MOVE_ALL;
2078 } 2049 }
2079 2050
2080 for (i = 1; i < max; i++) 2051 for (int i = 1; i < max; i++)
2081 { 2052 {
2082 mp = m; 2053 mapxy pos (m, x, y);
2083 nx = x + freearr_x[i]; 2054 pos.move (i);
2084 ny = y + freearr_y[i];
2085 2055
2086 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2056 if (!pos.normalise ())
2087
2088 if (mflags & P_OUT_OF_MAP)
2089 max = maxfree[i]; 2057 max = maxfree[i];
2090 else 2058 else
2091 { 2059 {
2092 mapspace &ms = mp->at (nx, ny); 2060 mapspace &ms = *pos;
2093 2061
2094 blocked = ms.move_block;
2095
2096 if ((move_type & blocked) == move_type) 2062 if ((move_type & ms.move_block) == move_type)
2097 max = maxfree[i]; 2063 max = maxfree [i];
2098 else if (mflags & P_IS_ALIVE) 2064 else if (ms.flags () & P_IS_ALIVE)
2099 { 2065 {
2100 for (tmp = ms.bot; tmp; tmp = tmp->above) 2066 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2101 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) 2067 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2102 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2068 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2103 break;
2104
2105 if (tmp)
2106 return freedir[i]; 2069 return freedir [i];
2107 } 2070 }
2108 } 2071 }
2109 } 2072 }
2110 2073
2111 return 0; 2074 return 0;
… …
2186 * This basically means that if direction is 15, then it could either go 2149 * This basically means that if direction is 15, then it could either go
2187 * direction 4, 14, or 16 to get back to where we are. 2150 * direction 4, 14, or 16 to get back to where we are.
2188 * Moved from spell_util.c to object.c with the other related direction 2151 * Moved from spell_util.c to object.c with the other related direction
2189 * functions. 2152 * functions.
2190 */ 2153 */
2191int reduction_dir[SIZEOFFREE][3] = { 2154static const int reduction_dir[SIZEOFFREE][3] = {
2192 {0, 0, 0}, /* 0 */ 2155 {0, 0, 0}, /* 0 */
2193 {0, 0, 0}, /* 1 */ 2156 {0, 0, 0}, /* 1 */
2194 {0, 0, 0}, /* 2 */ 2157 {0, 0, 0}, /* 2 */
2195 {0, 0, 0}, /* 3 */ 2158 {0, 0, 0}, /* 3 */
2196 {0, 0, 0}, /* 4 */ 2159 {0, 0, 0}, /* 4 */
… …
2334 return tmp; 2297 return tmp;
2335 2298
2336 return 0; 2299 return 0;
2337} 2300}
2338 2301
2339const shstr & 2302shstr_tmp
2340object::kv_get (const shstr &key) const 2303object::kv_get (shstr_tmp key) const
2341{ 2304{
2342 for (key_value *kv = key_values; kv; kv = kv->next) 2305 for (key_value *kv = key_values; kv; kv = kv->next)
2343 if (kv->key == key) 2306 if (kv->key == key)
2344 return kv->value; 2307 return kv->value;
2345 2308
2346 return shstr_null; 2309 return shstr ();
2347} 2310}
2348 2311
2349void 2312void
2350object::kv_set (const shstr &key, const shstr &value) 2313object::kv_set (shstr_tmp key, shstr_tmp value)
2351{ 2314{
2352 for (key_value *kv = key_values; kv; kv = kv->next) 2315 for (key_value *kv = key_values; kv; kv = kv->next)
2353 if (kv->key == key) 2316 if (kv->key == key)
2354 { 2317 {
2355 kv->value = value; 2318 kv->value = value;
… …
2364 2327
2365 key_values = kv; 2328 key_values = kv;
2366} 2329}
2367 2330
2368void 2331void
2369object::kv_del (const shstr &key) 2332object::kv_del (shstr_tmp key)
2370{ 2333{
2371 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2334 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2372 if ((*kvp)->key == key) 2335 if ((*kvp)->key == key)
2373 { 2336 {
2374 key_value *kv = *kvp; 2337 key_value *kv = *kvp;
… …
2505 container = 0; 2468 container = 0;
2506 2469
2507 // client needs item update to make it work, client bug requires this to be separate 2470 // client needs item update to make it work, client bug requires this to be separate
2508 esrv_update_item (UPD_FLAGS, this, old_container); 2471 esrv_update_item (UPD_FLAGS, this, old_container);
2509 2472
2510 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2473 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2511 play_sound (sound_find ("chest_close")); 2474 play_sound (sound_find ("chest_close"));
2512 } 2475 }
2513 2476
2514 if (new_container) 2477 if (new_container)
2515 { 2478 {
… …
2525 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2488 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2526 new_container->insert (closer); 2489 new_container->insert (closer);
2527 } 2490 }
2528#endif 2491#endif
2529 2492
2530 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2493 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2531 2494
2532 // make sure the container is available, client bug requires this to be separate 2495 // make sure the container is available, client bug requires this to be separate
2533 esrv_send_item (this, new_container); 2496 esrv_send_item (this, new_container);
2534 2497
2535 new_container->flag [FLAG_APPLIED] = true; 2498 new_container->flag [FLAG_APPLIED] = true;
… …
2543// else if (!old_container->env && contr && contr->ns) 2506// else if (!old_container->env && contr && contr->ns)
2544// contr->ns->floorbox_reset (); 2507// contr->ns->floorbox_reset ();
2545} 2508}
2546 2509
2547object * 2510object *
2548object::force_find (const shstr name) 2511object::force_find (shstr_tmp name)
2549{ 2512{
2550 /* cycle through his inventory to look for the MARK we want to 2513 /* cycle through his inventory to look for the MARK we want to
2551 * place 2514 * place
2552 */ 2515 */
2553 for (object *tmp = inv; tmp; tmp = tmp->below) 2516 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2555 return splay (tmp); 2518 return splay (tmp);
2556 2519
2557 return 0; 2520 return 0;
2558} 2521}
2559 2522
2523//-GPL
2524
2525void
2526object::force_set_timer (int duration)
2527{
2528 this->duration = 1;
2529 this->speed_left = -1.f;
2530
2531 this->set_speed (duration ? 1.f / duration : 0.f);
2532}
2533
2560object * 2534object *
2561object::force_add (const shstr name, int duration) 2535object::force_add (shstr_tmp name, int duration)
2562{ 2536{
2563 if (object *force = force_find (name)) 2537 if (object *force = force_find (name))
2564 force->destroy (); 2538 force->destroy ();
2565 2539
2566 object *force = get_archetype (FORCE_NAME); 2540 object *force = get_archetype (FORCE_NAME);
2567 2541
2568 force->slaying = name; 2542 force->slaying = name;
2569 force->stats.food = 1; 2543 force->force_set_timer (duration);
2570 force->speed_left = -1.f;
2571
2572 force->set_speed (duration ? 1.f / duration : 0.f);
2573 force->flag [FLAG_IS_USED_UP] = true;
2574 force->flag [FLAG_APPLIED] = true; 2544 force->flag [FLAG_APPLIED] = true;
2575 2545
2576 return insert (force); 2546 return insert (force);
2577} 2547}
2578 2548
2579void 2549void
2580object::play_sound (faceidx sound) 2550object::play_sound (faceidx sound) const
2581{ 2551{
2582 if (!sound) 2552 if (!sound)
2583 return; 2553 return;
2584 2554
2585 if (flag [FLAG_REMOVED]) 2555 if (is_on_map ())
2586 return;
2587
2588 if (env)
2589 {
2590 if (object *pl = in_player ())
2591 pl->contr->play_sound (sound);
2592 }
2593 else
2594 map->play_sound (sound, x, y); 2556 map->play_sound (sound, x, y);
2557 else if (object *pl = in_player ())
2558 pl->contr->play_sound (sound);
2559}
2560
2561void
2562object::say_msg (const char *msg) const
2563{
2564 if (is_on_map ())
2565 map->say_msg (msg, x, y);
2566 else if (object *pl = in_player ())
2567 pl->contr->play_sound (sound);
2595} 2568}
2596 2569
2597void 2570void
2598object::make_noise () 2571object::make_noise ()
2599{ 2572{

Diff Legend

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