ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/object.h
(Generate patch)

Comparing deliantra/server/include/object.h (file contents):
Revision 1.207 by root, Wed Sep 16 23:22:50 2009 UTC vs.
Revision 1.212 by root, Mon Oct 12 14:00:58 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#ifndef OBJECT_H 25#ifndef OBJECT_H
… …
436 { 437 {
437 open_container (0); 438 open_container (0);
438 } 439 }
439 440
440 MTH object *force_find (shstr_tmp name); 441 MTH object *force_find (shstr_tmp name);
442 MTH void force_set_timer (int duration);
441 MTH object *force_add (shstr_tmp name, int duration = 0); 443 MTH object *force_add (shstr_tmp name, int duration = 0);
442 444
443 oblinkpt *find_link () const; 445 oblinkpt *find_link () const;
444 MTH void add_link (maptile *map, shstr_tmp id); 446 MTH void add_link (maptile *map, shstr_tmp id);
445 MTH void remove_link (); 447 MTH void remove_link ();
… …
521 /* This return true if object has still randomitems which 523 /* This return true if object has still randomitems which
522 * could be expanded. 524 * could be expanded.
523 */ 525 */
524 MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; } 526 MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
525 527
526 MTH bool has_dialogue () const { return *&msg == '@'; } 528 static bool msg_has_dialogue (const char *msg) { return *msg == '@'; }
529
530 MTH bool has_dialogue () const { return msg_has_dialogue (&msg); }
527 531
528 // returns the outermost owner, never returns 0 532 // returns the outermost owner, never returns 0
529 MTH object *outer_owner () 533 MTH object *outer_owner ()
530 { 534 {
531 object *op; 535 object *op;
… …
707 // currently only used for players to make them temporarily visible 711 // currently only used for players to make them temporarily visible
708 // when they are invisible. 712 // when they are invisible.
709 MTH void make_noise (); 713 MTH void make_noise ();
710 714
711 /* animation */ 715 /* animation */
712 bool has_anim () { return animation_id; } 716 MTH bool has_anim () const { return animation_id; }
713 const animation &anim () const { return animations [animation_id]; } 717 const animation &anim () const { return animations [animation_id]; }
714 faceidx get_anim_frame (int frame) const { return anim ().faces [frame]; } 718 MTH faceidx get_anim_frame (int frame) const { return anim ().faces [frame]; }
715 void set_anim_frame (int frame) { face = get_anim_frame (frame); } 719 MTH void set_anim_frame (int frame) { face = get_anim_frame (frame); }
716 /* anim_frames () returns the number of animations allocated. The last 720 /* anim_frames () returns the number of animations allocated. The last
717 * usuable animation will be anim_frames () - 1 (for example, if an object 721 * usuable animation will be anim_frames () - 1 (for example, if an object
718 * has 8 animations, anim_frames () will return 8, but the values will 722 * has 8 animations, anim_frames () will return 8, but the values will
719 * range from 0 through 7. 723 * range from 0 through 7.
720 */ 724 */
721 int anim_frames () const { return anim ().num_animations; } 725 MTH int anim_frames () const { return anim ().num_animations; }
722 int anim_facings () const { return anim ().facings; } 726 MTH int anim_facings () const { return anim ().facings; }
727
728 MTH char *as_string ();
723 729
724protected: 730protected:
725 void link (); 731 void link ();
726 void unlink (); 732 void unlink ();
727 733
… …
736// move this object to the top of its env's inventory to speed up 742// move this object to the top of its env's inventory to speed up
737// searches for it. 743// searches for it.
738static object * 744static object *
739splay (object *ob) 745splay (object *ob)
740{ 746{
741 if (ob->env && ob->env->inv != ob) 747 if (ob->above && ob->env)
742 { 748 {
743 if (ob->above) ob->above->below = ob->below; 749 if (ob->above) ob->above->below = ob->below;
744 if (ob->below) ob->below->above = ob->above; 750 if (ob->below) ob->below->above = ob->above;
745 751
746 ob->above = 0; 752 ob->above = 0;

Diff Legend

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