--- deliantra/server/include/object.h 2009/10/03 18:46:26 1.208
+++ deliantra/server/include/object.h 2009/10/19 21:48:49 1.213
@@ -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
*/
@@ -319,7 +320,7 @@
object *inv; /* Pointer to the first object in the inventory */
//TODO: container must move into client
- object_ptr ACC (RW, container); /* Current container being used. I think this
+ object_ptr ACC (RW, container);/* Currently opened container. I think this
* is only used by the player right now.
*/
object *ACC (RW, env); /* Pointer to the object which is the environment.
@@ -327,7 +328,6 @@
*/
object *ACC (RW, more); /* Pointer to the rest of a large body of objects */
object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different
- client_container *seen_by; // seen by which player/container currently?
key_value *key_values; /* Fields not explictly known by the loader. */
// privates / perl
@@ -437,7 +437,22 @@
open_container (0);
}
+ // potential future accessor for "container"
+ MTH object *container_ () const
+ {
+ return container;
+ }
+
+ MTH bool is_open_container () const
+ {
+ // strangely enough, using ?: here causes code to inflate
+ return type == CONTAINER
+ && ((env && env->container_ () == this)
+ || (!env && flag [FLAG_APPLIED]));
+ }
+
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 +538,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 +726,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 ();