--- deliantra/server/include/object.h 2009/06/27 08:25:36 1.202
+++ deliantra/server/include/object.h 2009/11/08 20:55:39 1.216
@@ -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
*/
@@ -29,6 +30,8 @@
#include "cfperl.h"
#include "shstr.h"
+//+GPL
+
typedef int tag_t;
enum {
@@ -86,6 +89,8 @@
shstr key, value;
};
+//-GPL
+
struct UUID
{
uint64 seq;
@@ -121,6 +126,8 @@
}
};
+//+GPL
+
/* Definition for WILL_APPLY values. Replaces having harcoded values
* sprinkled in the code. Note that some of these also replace fields
* that were in the can_apply area. What is the point of having both
@@ -264,8 +271,9 @@
// 8 free bits
- float ACC (RW, expmul); /* needed experience = (calc_exp*expmul) - means some */
- /* races/classes can need less/more exp to gain levels */
+ //float ACC (RW, expmul) = 1.0; /* needed experience = (calc_exp*expmul) - means some */
+ // /* races/classes can need less/more exp to gain levels */
+ static const float expmul = 1.0;//D
float ACC (RW, move_slow_penalty); /* How much this slows down the object */
/* Following are values used by any object */
@@ -318,7 +326,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.
@@ -326,7 +334,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
@@ -334,6 +341,8 @@
void kv_del (shstr_tmp key);
void kv_set (shstr_tmp key, shstr_tmp value);
+//-GPL
+
// custom extra fields management
struct key_value_access_proxy
{
@@ -436,7 +445,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;
@@ -493,6 +517,8 @@
/ dominant_material ()->density;
}
+ MTH bool is_arch () const { return this == (const object *)(const archetype *)arch; }
+
MTH bool is_wiz () const { return flag [FLAG_WIZ]; }
MTH bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; }
MTH bool is_armor () const { return type == ARMOUR || type == SHIELD || type == HELMET
@@ -507,7 +533,7 @@
&& (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); }
MTH bool is_range () const { return type == BOW || type == ROD || type == WAND || type == HORN; }
- MTH bool has_active_speed () const { return FABS(speed) >= MIN_ACTIVE_SPEED; }
+ MTH bool has_active_speed () const { return fabs (speed) >= MIN_ACTIVE_SPEED; }
// temporary: wether the object can be saved in a map file
// contr => is a player
@@ -520,7 +546,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 ()
@@ -534,7 +562,7 @@
}
// returns the outermost environment, never returns 0
- MTH object *outer_env () const
+ MTH object *outer_env_or_self () const
{
const object *op;
@@ -544,11 +572,17 @@
return const_cast