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.289 by root, Sun Oct 11 05:31:54 2009 UTC vs.
Revision 1.298 by root, Sun Nov 8 00:01:33 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 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)
… …
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;
… …
435 439
436char * 440char *
437object::as_string () 441object::as_string ()
438{ 442{
439 return dump_object (this); 443 return dump_object (this);
440}
441
442/*
443 * get_nearest_part(multi-object, object 2) returns the part of the
444 * multi-object 1 which is closest to the second object.
445 * If it's not a multi-object, it is returned.
446 */
447object *
448get_nearest_part (object *op, const object *pl)
449{
450 object *tmp, *closest;
451 int last_dist, i;
452
453 if (!op->more)
454 return op;
455
456 for (last_dist = distance (op, pl), closest = op, tmp = op->more;
457 tmp;
458 tmp = tmp->more)
459 if ((i = distance (tmp, pl)) < last_dist)
460 closest = tmp, last_dist = i;
461
462 return closest;
463} 444}
464 445
465/* 446/*
466 * 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.
467 * VERRRY slow. 448 * VERRRY slow.
… …
698 * 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.
699 */ 680 */
700void 681void
701object::set_speed (float speed) 682object::set_speed (float speed)
702{ 683{
703 if (flag [FLAG_FREED] && speed)
704 {
705 LOG (llevError, "Object %s is freed but has speed.\n", &name);
706 speed = 0;
707 }
708
709 this->speed = speed; 684 this->speed = speed;
710 685
711 if (has_active_speed ()) 686 if (has_active_speed ())
712 activate (); 687 activate ();
713 else 688 else
… …
763 738
764 if (!(m.flags_ & P_UPTODATE)) 739 if (!(m.flags_ & P_UPTODATE))
765 /* nop */; 740 /* nop */;
766 else if (action == UP_OBJ_INSERT) 741 else if (action == UP_OBJ_INSERT)
767 { 742 {
743#if 0
768 // this is likely overkill, TODO: revisit (schmorp) 744 // this is likely overkill, TODO: revisit (schmorp)
769 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 745 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
770 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 746 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
771 || (op->is_player () && !(m.flags_ & P_PLAYER)) 747 || (op->is_player () && !(m.flags_ & P_PLAYER))
772 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 748 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
… …
777 || (m.move_slow | op->move_slow) != m.move_slow 753 || (m.move_slow | op->move_slow) != m.move_slow
778 /* 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
779 * have move_allow right now. 755 * have move_allow right now.
780 */ 756 */
781 || ((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
782 || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
783 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
784 } 763 }
785 /* if the object is being removed, we can't make intelligent 764 /* if the object is being removed, we can't make intelligent
786 * decisions, because remove_ob can't really pass the object 765 * decisions, because remove_ob can't really pass the object
787 * that is being removed. 766 * that is being removed.
788 */ 767 */
… …
1040 * the previous environment. 1019 * the previous environment.
1041 */ 1020 */
1042void 1021void
1043object::do_remove () 1022object::do_remove ()
1044{ 1023{
1045 object *tmp, *last = 0;
1046 object *otmp;
1047
1048 if (flag [FLAG_REMOVED]) 1024 if (flag [FLAG_REMOVED])
1049 return; 1025 return;
1050 1026
1051 INVOKE_OBJECT (REMOVE, this); 1027 INVOKE_OBJECT (REMOVE, this);
1052 1028
… …
1118 close_container (); 1094 close_container ();
1119 1095
1120 --map->players; 1096 --map->players;
1121 map->touch (); 1097 map->touch ();
1122 } 1098 }
1123 else if (pl->container == this) 1099 else if (pl->container_ () == this)
1124 { 1100 {
1125 // removing a container should close it 1101 // removing a container should close it
1126 close_container (); 1102 close_container ();
1127 } 1103 }
1128 1104
… …
1144 1120
1145 int check_walk_off = !flag [FLAG_NO_APPLY]; 1121 int check_walk_off = !flag [FLAG_NO_APPLY];
1146 1122
1147 if (object *pl = ms.player ()) 1123 if (object *pl = ms.player ())
1148 { 1124 {
1149 if (pl->container == this) 1125 if (pl->container_ () == this)
1150 /* If a container that the player is currently using somehow gets 1126 /* If a container that the player is currently using somehow gets
1151 * removed (most likely destroyed), update the player view 1127 * removed (most likely destroyed), update the player view
1152 * appropriately. 1128 * appropriately.
1153 */ 1129 */
1154 pl->close_container (); 1130 pl->close_container ();
… …
1158 //TODO: update floorbox to preserve ordering 1134 //TODO: update floorbox to preserve ordering
1159 if (pl->contr->ns) 1135 if (pl->contr->ns)
1160 pl->contr->ns->floorbox_update (); 1136 pl->contr->ns->floorbox_update ();
1161 } 1137 }
1162 1138
1139 if (check_walk_off)
1163 for (tmp = ms.bot; tmp; tmp = tmp->above) 1140 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1164 { 1141 {
1142 above = tmp->above;
1143
1165 /* 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
1166 * being removed. 1145 * being removed.
1167 */ 1146 */
1168 1147
1169 /* See if object moving off should effect something */ 1148 /* See if object moving off should effect something */
1170 if (check_walk_off
1171 && ((move_type & tmp->move_off) 1149 if ((move_type & tmp->move_off)
1172 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1150 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1173 {
1174 move_apply (tmp, this, 0); 1151 move_apply (tmp, this, 0);
1175
1176 if (destroyed ())
1177 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1178 } 1152 }
1179
1180 last = tmp;
1181 }
1182 1153
1183 if (affects_los ()) 1154 if (affects_los ())
1184 update_all_los (map, x, y); 1155 update_all_los (map, x, y);
1185 } 1156 }
1186} 1157}
… …
2178 * 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
2179 * 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.
2180 * 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
2181 * functions. 2152 * functions.
2182 */ 2153 */
2183const int reduction_dir[SIZEOFFREE][3] = { 2154static const int reduction_dir[SIZEOFFREE][3] = {
2184 {0, 0, 0}, /* 0 */ 2155 {0, 0, 0}, /* 0 */
2185 {0, 0, 0}, /* 1 */ 2156 {0, 0, 0}, /* 1 */
2186 {0, 0, 0}, /* 2 */ 2157 {0, 0, 0}, /* 2 */
2187 {0, 0, 0}, /* 3 */ 2158 {0, 0, 0}, /* 3 */
2188 {0, 0, 0}, /* 4 */ 2159 {0, 0, 0}, /* 4 */
… …
2547 return splay (tmp); 2518 return splay (tmp);
2548 2519
2549 return 0; 2520 return 0;
2550} 2521}
2551 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
2552object * 2534object *
2553object::force_add (shstr_tmp name, int duration) 2535object::force_add (shstr_tmp name, int duration)
2554{ 2536{
2555 if (object *force = force_find (name)) 2537 if (object *force = force_find (name))
2556 force->destroy (); 2538 force->destroy ();
2557 2539
2558 object *force = get_archetype (FORCE_NAME); 2540 object *force = get_archetype (FORCE_NAME);
2559 2541
2560 force->slaying = name; 2542 force->slaying = name;
2561 force->stats.food = 1; 2543 force->force_set_timer (duration);
2562 force->speed_left = -1.f;
2563
2564 force->set_speed (duration ? 1.f / duration : 0.f);
2565 force->flag [FLAG_IS_USED_UP] = true;
2566 force->flag [FLAG_APPLIED] = true; 2544 force->flag [FLAG_APPLIED] = true;
2567 2545
2568 return insert (force); 2546 return insert (force);
2569} 2547}
2570 2548
2571void 2549void

Diff Legend

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