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.292 by root, Mon Oct 19 21:48:49 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>
334 335
335 // the player itself is always on a map, so we will find him here 336 // the player itself is always on a map, so we will find him here
336 // even if our inv is in a player. 337 // even if our inv is in a player.
337 if (envest->is_on_map ()) 338 if (envest->is_on_map ())
338 if (object *pl = envest->ms ().player ()) 339 if (object *pl = envest->ms ().player ())
339 if (pl->container == env) 340 if (pl->container_ () == env)
340 return pl; 341 return pl;
341 } 342 }
342 else 343 else
343 { 344 {
344 // maybe there is a player standing on the same mapspace 345 // maybe there is a player standing on the same mapspace
345 // this will catch the case where "this" is a player 346 // this will catch the case where "this" is a player
346 if (object *pl = ms ().player ()) 347 if (object *pl = ms ().player ())
347 if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look) 348 if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
348 || this == pl->container) 349 || pl->container_ () == this)
349 return pl; 350 return pl;
350 } 351 }
351 } 352 }
352 353
353 return 0; 354 return 0;
429 return strdup ("[NULLOBJ]"); 430 return strdup ("[NULLOBJ]");
430 431
431 object_freezer freezer; 432 object_freezer freezer;
432 op->write (freezer); 433 op->write (freezer);
433 return freezer.as_string (); 434 return freezer.as_string ();
435}
436
437char *
438object::as_string ()
439{
440 return dump_object (this);
434} 441}
435 442
436/* 443/*
437 * get_nearest_part(multi-object, object 2) returns the part of the 444 * get_nearest_part(multi-object, object 2) returns the part of the
438 * multi-object 1 which is closest to the second object. 445 * multi-object 1 which is closest to the second object.
555 update_stats (); 562 update_stats ();
556 563
557 new_draw_info_format (NDI_UNIQUE, 0, this, 564 new_draw_info_format (NDI_UNIQUE, 0, this,
558 "You try to balance all your items at once, " 565 "You try to balance all your items at once, "
559 "but the %s is just too much for your body. " 566 "but the %s is just too much for your body. "
560 "[You need to unapply some items first.]", &ob->name); 567 "[You need to unapply some items first - use the 'body' command to see "
568 "how many items you cna wera on a specific body part.]", &ob->name);
561 return false; 569 return false;
562 } 570 }
563 571
564 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 572 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
565 } 573 }
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 ();
2540 return splay (tmp); 2548 return splay (tmp);
2541 2549
2542 return 0; 2550 return 0;
2543} 2551}
2544 2552
2553void
2554object::force_set_timer (int duration)
2555{
2556 this->duration = 1;
2557 this->speed_left = -1.f;
2558
2559 this->set_speed (duration ? 1.f / duration : 0.f);
2560}
2561
2545object * 2562object *
2546object::force_add (shstr_tmp name, int duration) 2563object::force_add (shstr_tmp name, int duration)
2547{ 2564{
2548 if (object *force = force_find (name)) 2565 if (object *force = force_find (name))
2549 force->destroy (); 2566 force->destroy ();
2550 2567
2551 object *force = get_archetype (FORCE_NAME); 2568 object *force = get_archetype (FORCE_NAME);
2552 2569
2553 force->slaying = name; 2570 force->slaying = name;
2554 force->stats.food = 1;
2555 force->speed_left = -1.f;
2556 2571
2557 force->set_speed (duration ? 1.f / duration : 0.f); 2572 force->force_set_timer (duration);
2558 force->flag [FLAG_IS_USED_UP] = true; 2573
2559 force->flag [FLAG_APPLIED] = true; 2574 force->flag [FLAG_APPLIED] = true;
2560 2575
2561 return insert (force); 2576 return insert (force);
2562} 2577}
2563 2578

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines