--- deliantra/server/include/object.h 2009/09/16 23:22:50 1.207
+++ deliantra/server/include/object.h 2009/10/12 14:00:58 1.212
@@ -5,18 +5,19 @@
* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
* Copyright (©) 1992,2007 Frank Tore Johansen
*
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
*
* The authors can be reached via e-mail to
*/
@@ -438,6 +439,7 @@
}
MTH object *force_find (shstr_tmp name);
+ MTH void force_set_timer (int duration);
MTH object *force_add (shstr_tmp name, int duration = 0);
oblinkpt *find_link () const;
@@ -523,7 +525,9 @@
*/
MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
- MTH bool has_dialogue () const { return *&msg == '@'; }
+ static bool msg_has_dialogue (const char *msg) { return *msg == '@'; }
+
+ MTH bool has_dialogue () const { return msg_has_dialogue (&msg); }
// returns the outermost owner, never returns 0
MTH object *outer_owner ()
@@ -709,17 +713,19 @@
MTH void make_noise ();
/* animation */
- bool has_anim () { return animation_id; }
+ MTH bool has_anim () const { return animation_id; }
const animation &anim () const { return animations [animation_id]; }
- faceidx get_anim_frame (int frame) const { return anim ().faces [frame]; }
- void set_anim_frame (int frame) { face = get_anim_frame (frame); }
+ MTH faceidx get_anim_frame (int frame) const { return anim ().faces [frame]; }
+ MTH void set_anim_frame (int frame) { face = get_anim_frame (frame); }
/* anim_frames () returns the number of animations allocated. The last
* usuable animation will be anim_frames () - 1 (for example, if an object
* has 8 animations, anim_frames () will return 8, but the values will
* range from 0 through 7.
*/
- int anim_frames () const { return anim ().num_animations; }
- int anim_facings () const { return anim ().facings; }
+ MTH int anim_frames () const { return anim ().num_animations; }
+ MTH int anim_facings () const { return anim ().facings; }
+
+ MTH char *as_string ();
protected:
void link ();
@@ -738,7 +744,7 @@
static object *
splay (object *ob)
{
- if (ob->env && ob->env->inv != ob)
+ if (ob->above && ob->env)
{
if (ob->above) ob->above->below = ob->below;
if (ob->below) ob->below->above = ob->above;