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.291 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.295 by root, Fri Nov 6 13:03:34 2009 UTC

… …
38uint32_t mapspace::smellcount = 10000; 38uint32_t mapspace::smellcount = 10000;
39 39
40objectvec objects; 40objectvec objects;
41activevec actives; 41activevec actives;
42 42
43//+GPL
44
43short freearr_x[SIZEOFFREE] = { 45short freearr_x[SIZEOFFREE] = {
44 0, 46 0,
45 0, 1, 1, 1, 0, -1, -1, -1, 47 0, 1, 1, 1, 0, -1, -1, -1,
46 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,
47 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1 49 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
… …
50 0, 52 0,
51 -1, -1, 0, 1, 1, 1, 0, -1, 53 -1, -1, 0, 1, 1, 1, 0, -1,
52 -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,
53 -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
54}; 56};
55int maxfree[SIZEOFFREE] = {
56 0,
57 9, 10, 13, 14, 17, 18, 21, 22,
58 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
59 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
60};
61int freedir[SIZEOFFREE] = { 57int freedir[SIZEOFFREE] = {
62 0, 58 0,
63 1, 2, 3, 4, 5, 6, 7, 8, 59 1, 2, 3, 4, 5, 6, 7, 8,
64 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,
65 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
66}; 69};
67 70
68static void 71static void
69write_uuid (uval64 skip, bool sync) 72write_uuid (uval64 skip, bool sync)
70{ 73{
… …
335 338
336 // 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
337 // even if our inv is in a player. 340 // even if our inv is in a player.
338 if (envest->is_on_map ()) 341 if (envest->is_on_map ())
339 if (object *pl = envest->ms ().player ()) 342 if (object *pl = envest->ms ().player ())
340 if (pl->container == env) 343 if (pl->container_ () == env)
341 return pl; 344 return pl;
342 } 345 }
343 else 346 else
344 { 347 {
345 // maybe there is a player standing on the same mapspace 348 // maybe there is a player standing on the same mapspace
346 // this will catch the case where "this" is a player 349 // this will catch the case where "this" is a player
347 if (object *pl = ms ().player ()) 350 if (object *pl = ms ().player ())
348 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) 351 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
349 || this == pl->container) 352 || pl->container_ () == this)
350 return pl; 353 return pl;
351 } 354 }
352 } 355 }
353 356
354 return 0; 357 return 0;
… …
443/* 446/*
444 * get_nearest_part(multi-object, object 2) returns the part of the 447 * get_nearest_part(multi-object, object 2) returns the part of the
445 * multi-object 1 which is closest to the second object. 448 * multi-object 1 which is closest to the second object.
446 * If it's not a multi-object, it is returned. 449 * If it's not a multi-object, it is returned.
447 */ 450 */
448object * 451static object *
449get_nearest_part (object *op, const object *pl) 452get_nearest_part (object *op, const object *pl)
450{ 453{
451 object *tmp, *closest; 454 object *tmp, *closest;
452 int last_dist, i; 455 int last_dist, i;
453 456
… …
1041 * the previous environment. 1044 * the previous environment.
1042 */ 1045 */
1043void 1046void
1044object::do_remove () 1047object::do_remove ()
1045{ 1048{
1046 object *tmp, *last = 0;
1047 object *otmp;
1048
1049 if (flag [FLAG_REMOVED]) 1049 if (flag [FLAG_REMOVED])
1050 return; 1050 return;
1051 1051
1052 INVOKE_OBJECT (REMOVE, this); 1052 INVOKE_OBJECT (REMOVE, this);
1053 1053
… …
1119 close_container (); 1119 close_container ();
1120 1120
1121 --map->players; 1121 --map->players;
1122 map->touch (); 1122 map->touch ();
1123 } 1123 }
1124 else if (pl->container == this) 1124 else if (pl->container_ () == this)
1125 { 1125 {
1126 // removing a container should close it 1126 // removing a container should close it
1127 close_container (); 1127 close_container ();
1128 } 1128 }
1129 1129
… …
1145 1145
1146 int check_walk_off = !flag [FLAG_NO_APPLY]; 1146 int check_walk_off = !flag [FLAG_NO_APPLY];
1147 1147
1148 if (object *pl = ms.player ()) 1148 if (object *pl = ms.player ())
1149 { 1149 {
1150 if (pl->container == this) 1150 if (pl->container_ () == this)
1151 /* If a container that the player is currently using somehow gets 1151 /* If a container that the player is currently using somehow gets
1152 * removed (most likely destroyed), update the player view 1152 * removed (most likely destroyed), update the player view
1153 * appropriately. 1153 * appropriately.
1154 */ 1154 */
1155 pl->close_container (); 1155 pl->close_container ();
… …
1159 //TODO: update floorbox to preserve ordering 1159 //TODO: update floorbox to preserve ordering
1160 if (pl->contr->ns) 1160 if (pl->contr->ns)
1161 pl->contr->ns->floorbox_update (); 1161 pl->contr->ns->floorbox_update ();
1162 } 1162 }
1163 1163
1164 if (check_walk_off)
1164 for (tmp = ms.bot; tmp; tmp = tmp->above) 1165 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1165 { 1166 {
1167 above = tmp->above;
1168
1166 /* No point updating the players look faces if he is the object 1169 /* No point updating the players look faces if he is the object
1167 * being removed. 1170 * being removed.
1168 */ 1171 */
1169 1172
1170 /* See if object moving off should effect something */ 1173 /* See if object moving off should effect something */
1171 if (check_walk_off
1172 && ((move_type & tmp->move_off) 1174 if ((move_type & tmp->move_off)
1173 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1175 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1174 {
1175 move_apply (tmp, this, 0); 1176 move_apply (tmp, this, 0);
1176
1177 if (destroyed ())
1178 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1179 } 1177 }
1180
1181 last = tmp;
1182 }
1183 1178
1184 if (affects_los ()) 1179 if (affects_los ())
1185 update_all_los (map, x, y); 1180 update_all_los (map, x, y);
1186 } 1181 }
1187} 1182}
… …
2179 * This basically means that if direction is 15, then it could either go 2174 * This basically means that if direction is 15, then it could either go
2180 * direction 4, 14, or 16 to get back to where we are. 2175 * direction 4, 14, or 16 to get back to where we are.
2181 * Moved from spell_util.c to object.c with the other related direction 2176 * Moved from spell_util.c to object.c with the other related direction
2182 * functions. 2177 * functions.
2183 */ 2178 */
2184const int reduction_dir[SIZEOFFREE][3] = { 2179static const int reduction_dir[SIZEOFFREE][3] = {
2185 {0, 0, 0}, /* 0 */ 2180 {0, 0, 0}, /* 0 */
2186 {0, 0, 0}, /* 1 */ 2181 {0, 0, 0}, /* 1 */
2187 {0, 0, 0}, /* 2 */ 2182 {0, 0, 0}, /* 2 */
2188 {0, 0, 0}, /* 3 */ 2183 {0, 0, 0}, /* 3 */
2189 {0, 0, 0}, /* 4 */ 2184 {0, 0, 0}, /* 4 */
… …
2548 return splay (tmp); 2543 return splay (tmp);
2549 2544
2550 return 0; 2545 return 0;
2551} 2546}
2552 2547
2548//-GPL
2549
2553void 2550void
2554object::force_set_timer (int duration) 2551object::force_set_timer (int duration)
2555{ 2552{
2556 this->duration = 1; 2553 this->duration = 1;
2557 this->speed_left = -1.f; 2554 this->speed_left = -1.f;
… …
2566 force->destroy (); 2563 force->destroy ();
2567 2564
2568 object *force = get_archetype (FORCE_NAME); 2565 object *force = get_archetype (FORCE_NAME);
2569 2566
2570 force->slaying = name; 2567 force->slaying = name;
2571
2572 force->force_set_timer (duration); 2568 force->force_set_timer (duration);
2573
2574 force->flag [FLAG_APPLIED] = true; 2569 force->flag [FLAG_APPLIED] = true;
2575 2570
2576 return insert (force); 2571 return insert (force);
2577} 2572}
2578 2573
2579void 2574void

Diff Legend

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