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.290 by sf-marcmagus, Sun Oct 11 05:43:35 2009 UTC vs.
Revision 1.295 by root, Fri Nov 6 13:03:34 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{
… …
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;
… …
442/* 446/*
443 * 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
444 * multi-object 1 which is closest to the second object. 448 * multi-object 1 which is closest to the second object.
445 * If it's not a multi-object, it is returned. 449 * If it's not a multi-object, it is returned.
446 */ 450 */
447object * 451static object *
448get_nearest_part (object *op, const object *pl) 452get_nearest_part (object *op, const object *pl)
449{ 453{
450 object *tmp, *closest; 454 object *tmp, *closest;
451 int last_dist, i; 455 int last_dist, i;
452 456
… …
1040 * the previous environment. 1044 * the previous environment.
1041 */ 1045 */
1042void 1046void
1043object::do_remove () 1047object::do_remove ()
1044{ 1048{
1045 object *tmp, *last = 0;
1046 object *otmp;
1047
1048 if (flag [FLAG_REMOVED]) 1049 if (flag [FLAG_REMOVED])
1049 return; 1050 return;
1050 1051
1051 INVOKE_OBJECT (REMOVE, this); 1052 INVOKE_OBJECT (REMOVE, this);
1052 1053
… …
1118 close_container (); 1119 close_container ();
1119 1120
1120 --map->players; 1121 --map->players;
1121 map->touch (); 1122 map->touch ();
1122 } 1123 }
1123 else if (pl->container == this) 1124 else if (pl->container_ () == this)
1124 { 1125 {
1125 // removing a container should close it 1126 // removing a container should close it
1126 close_container (); 1127 close_container ();
1127 } 1128 }
1128 1129
… …
1144 1145
1145 int check_walk_off = !flag [FLAG_NO_APPLY]; 1146 int check_walk_off = !flag [FLAG_NO_APPLY];
1146 1147
1147 if (object *pl = ms.player ()) 1148 if (object *pl = ms.player ())
1148 { 1149 {
1149 if (pl->container == this) 1150 if (pl->container_ () == this)
1150 /* If a container that the player is currently using somehow gets 1151 /* If a container that the player is currently using somehow gets
1151 * removed (most likely destroyed), update the player view 1152 * removed (most likely destroyed), update the player view
1152 * appropriately. 1153 * appropriately.
1153 */ 1154 */
1154 pl->close_container (); 1155 pl->close_container ();
… …
1158 //TODO: update floorbox to preserve ordering 1159 //TODO: update floorbox to preserve ordering
1159 if (pl->contr->ns) 1160 if (pl->contr->ns)
1160 pl->contr->ns->floorbox_update (); 1161 pl->contr->ns->floorbox_update ();
1161 } 1162 }
1162 1163
1164 if (check_walk_off)
1163 for (tmp = ms.bot; tmp; tmp = tmp->above) 1165 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1164 { 1166 {
1167 above = tmp->above;
1168
1165 /* 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
1166 * being removed. 1170 * being removed.
1167 */ 1171 */
1168 1172
1169 /* See if object moving off should effect something */ 1173 /* See if object moving off should effect something */
1170 if (check_walk_off
1171 && ((move_type & tmp->move_off) 1174 if ((move_type & tmp->move_off)
1172 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1175 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1173 {
1174 move_apply (tmp, this, 0); 1176 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 } 1177 }
1179
1180 last = tmp;
1181 }
1182 1178
1183 if (affects_los ()) 1179 if (affects_los ())
1184 update_all_los (map, x, y); 1180 update_all_los (map, x, y);
1185 } 1181 }
1186} 1182}
… …
2178 * 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
2179 * 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.
2180 * 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
2181 * functions. 2177 * functions.
2182 */ 2178 */
2183const int reduction_dir[SIZEOFFREE][3] = { 2179static const int reduction_dir[SIZEOFFREE][3] = {
2184 {0, 0, 0}, /* 0 */ 2180 {0, 0, 0}, /* 0 */
2185 {0, 0, 0}, /* 1 */ 2181 {0, 0, 0}, /* 1 */
2186 {0, 0, 0}, /* 2 */ 2182 {0, 0, 0}, /* 2 */
2187 {0, 0, 0}, /* 3 */ 2183 {0, 0, 0}, /* 3 */
2188 {0, 0, 0}, /* 4 */ 2184 {0, 0, 0}, /* 4 */
… …
2547 return splay (tmp); 2543 return splay (tmp);
2548 2544
2549 return 0; 2545 return 0;
2550} 2546}
2551 2547
2548//-GPL
2549
2552void 2550void
2553object::force_set_timer (int duration) 2551object::force_set_timer (int duration)
2554{ 2552{
2555 this->duration = 1; 2553 this->duration = 1;
2556 this->speed_left = -1.f; 2554 this->speed_left = -1.f;
… …
2565 force->destroy (); 2563 force->destroy ();
2566 2564
2567 object *force = get_archetype (FORCE_NAME); 2565 object *force = get_archetype (FORCE_NAME);
2568 2566
2569 force->slaying = name; 2567 force->slaying = name;
2570
2571 force->force_set_timer (duration); 2568 force->force_set_timer (duration);
2572
2573 force->flag [FLAG_APPLIED] = true; 2569 force->flag [FLAG_APPLIED] = true;
2574 2570
2575 return insert (force); 2571 return insert (force);
2576} 2572}
2577 2573
2578void 2574void

Diff Legend

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