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.287 by root, Sat Oct 3 20:11:12 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;
… …
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
440char *
441object::as_string ()
442{
443 return dump_object (this);
444}
445
436/* 446/*
437 * 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
438 * multi-object 1 which is closest to the second object. 448 * multi-object 1 which is closest to the second object.
439 * If it's not a multi-object, it is returned. 449 * If it's not a multi-object, it is returned.
440 */ 450 */
441object * 451static object *
442get_nearest_part (object *op, const object *pl) 452get_nearest_part (object *op, const object *pl)
443{ 453{
444 object *tmp, *closest; 454 object *tmp, *closest;
445 int last_dist, i; 455 int last_dist, i;
446 456
… …
555 update_stats (); 565 update_stats ();
556 566
557 new_draw_info_format (NDI_UNIQUE, 0, this, 567 new_draw_info_format (NDI_UNIQUE, 0, this,
558 "You try to balance all your items at once, " 568 "You try to balance all your items at once, "
559 "but the %s is just too much for your body. " 569 "but the %s is just too much for your body. "
560 "[You need to unapply some items first.]", &ob->name); 570 "[You need to unapply some items first - use the 'body' command to see "
571 "how many items you cna wera on a specific body part.]", &ob->name);
561 return false; 572 return false;
562 } 573 }
563 574
564 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 575 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
565 } 576 }
… …
1033 * the previous environment. 1044 * the previous environment.
1034 */ 1045 */
1035void 1046void
1036object::do_remove () 1047object::do_remove ()
1037{ 1048{
1038 object *tmp, *last = 0;
1039 object *otmp;
1040
1041 if (flag [FLAG_REMOVED]) 1049 if (flag [FLAG_REMOVED])
1042 return; 1050 return;
1043 1051
1044 INVOKE_OBJECT (REMOVE, this); 1052 INVOKE_OBJECT (REMOVE, this);
1045 1053
… …
1111 close_container (); 1119 close_container ();
1112 1120
1113 --map->players; 1121 --map->players;
1114 map->touch (); 1122 map->touch ();
1115 } 1123 }
1116 else if (pl->container == this) 1124 else if (pl->container_ () == this)
1117 { 1125 {
1118 // removing a container should close it 1126 // removing a container should close it
1119 close_container (); 1127 close_container ();
1120 } 1128 }
1121 1129
… …
1137 1145
1138 int check_walk_off = !flag [FLAG_NO_APPLY]; 1146 int check_walk_off = !flag [FLAG_NO_APPLY];
1139 1147
1140 if (object *pl = ms.player ()) 1148 if (object *pl = ms.player ())
1141 { 1149 {
1142 if (pl->container == this) 1150 if (pl->container_ () == this)
1143 /* If a container that the player is currently using somehow gets 1151 /* If a container that the player is currently using somehow gets
1144 * removed (most likely destroyed), update the player view 1152 * removed (most likely destroyed), update the player view
1145 * appropriately. 1153 * appropriately.
1146 */ 1154 */
1147 pl->close_container (); 1155 pl->close_container ();
… …
1151 //TODO: update floorbox to preserve ordering 1159 //TODO: update floorbox to preserve ordering
1152 if (pl->contr->ns) 1160 if (pl->contr->ns)
1153 pl->contr->ns->floorbox_update (); 1161 pl->contr->ns->floorbox_update ();
1154 } 1162 }
1155 1163
1164 if (check_walk_off)
1156 for (tmp = ms.bot; tmp; tmp = tmp->above) 1165 for (object *above, *tmp = ms.bot; tmp; tmp = above)
1157 { 1166 {
1167 above = tmp->above;
1168
1158 /* 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
1159 * being removed. 1170 * being removed.
1160 */ 1171 */
1161 1172
1162 /* See if object moving off should effect something */ 1173 /* See if object moving off should effect something */
1163 if (check_walk_off
1164 && ((move_type & tmp->move_off) 1174 if ((move_type & tmp->move_off)
1165 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)) 1175 && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1166 {
1167 move_apply (tmp, this, 0); 1176 move_apply (tmp, this, 0);
1168
1169 if (destroyed ())
1170 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1171 } 1177 }
1172
1173 last = tmp;
1174 }
1175 1178
1176 if (affects_los ()) 1179 if (affects_los ())
1177 update_all_los (map, x, y); 1180 update_all_los (map, x, y);
1178 } 1181 }
1179} 1182}
… …
2171 * 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
2172 * 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.
2173 * 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
2174 * functions. 2177 * functions.
2175 */ 2178 */
2176const int reduction_dir[SIZEOFFREE][3] = { 2179static const int reduction_dir[SIZEOFFREE][3] = {
2177 {0, 0, 0}, /* 0 */ 2180 {0, 0, 0}, /* 0 */
2178 {0, 0, 0}, /* 1 */ 2181 {0, 0, 0}, /* 1 */
2179 {0, 0, 0}, /* 2 */ 2182 {0, 0, 0}, /* 2 */
2180 {0, 0, 0}, /* 3 */ 2183 {0, 0, 0}, /* 3 */
2181 {0, 0, 0}, /* 4 */ 2184 {0, 0, 0}, /* 4 */
… …
2540 return splay (tmp); 2543 return splay (tmp);
2541 2544
2542 return 0; 2545 return 0;
2543} 2546}
2544 2547
2548//-GPL
2549
2550void
2551object::force_set_timer (int duration)
2552{
2553 this->duration = 1;
2554 this->speed_left = -1.f;
2555
2556 this->set_speed (duration ? 1.f / duration : 0.f);
2557}
2558
2545object * 2559object *
2546object::force_add (shstr_tmp name, int duration) 2560object::force_add (shstr_tmp name, int duration)
2547{ 2561{
2548 if (object *force = force_find (name)) 2562 if (object *force = force_find (name))
2549 force->destroy (); 2563 force->destroy ();
2550 2564
2551 object *force = get_archetype (FORCE_NAME); 2565 object *force = get_archetype (FORCE_NAME);
2552 2566
2553 force->slaying = name; 2567 force->slaying = name;
2554 force->stats.food = 1; 2568 force->force_set_timer (duration);
2555 force->speed_left = -1.f;
2556
2557 force->set_speed (duration ? 1.f / duration : 0.f);
2558 force->flag [FLAG_IS_USED_UP] = true;
2559 force->flag [FLAG_APPLIED] = true; 2569 force->flag [FLAG_APPLIED] = true;
2560 2570
2561 return insert (force); 2571 return insert (force);
2562} 2572}
2563 2573
2564void 2574void

Diff Legend

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