--- deliantra/server/common/object.C 2009/10/11 05:43:35 1.290
+++ deliantra/server/common/object.C 2010/01/16 13:41:37 1.311
@@ -1,22 +1,23 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
* 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
*/
@@ -27,7 +28,6 @@
#include
#include
#include
-#include
#include
@@ -39,6 +39,8 @@
objectvec objects;
activevec actives;
+//+GPL
+
short freearr_x[SIZEOFFREE] = {
0,
0, 1, 1, 1, 0, -1, -1, -1,
@@ -51,12 +53,6 @@
-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
};
-int maxfree[SIZEOFFREE] = {
- 0,
- 9, 10, 13, 14, 17, 18, 21, 22,
- 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
- 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
-};
int freedir[SIZEOFFREE] = {
0,
1, 2, 3, 4, 5, 6, 7, 8,
@@ -64,6 +60,13 @@
1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
};
+static int maxfree[SIZEOFFREE] = {
+ 0,
+ 9, 10, 13, 14, 17, 18, 21, 22,
+ 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
+ 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
+};
+
static void
write_uuid (uval64 skip, bool sync)
{
@@ -75,7 +78,7 @@
}
static void
-read_uuid (void)
+read_uuid ()
{
char filename[MAX_BUF];
@@ -99,7 +102,7 @@
_exit (1);
}
- UUID::BUF buf;
+ char buf [UUID::MAX_LEN];
buf[0] = 0;
fgets (buf, sizeof (buf), fp);
@@ -138,6 +141,71 @@
read_uuid ();
}
+bool
+UUID::parse (const char *s)
+{
+ if (*s++ != '<' || *s++ != '1' || *s++ != '.')
+ return false;
+
+ seq = 0;
+
+ while (*s != '>')
+ {
+ if (*s < '0')
+ return false;
+
+ // this gives nice branchless code with gcc
+ assert ('0' < 'a' && '0' == 48 && 'a' == 97);
+ int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
+
+ seq = (seq << 4) | digit;
+
+ ++s;
+ }
+
+ return true;
+}
+
+char *
+UUID::append (char *buf) const
+{
+ *buf++ = '<';
+ *buf++ = '1';
+ *buf++ = '.';
+
+ uint64_t seq = this->seq;
+ const int bits = 64;
+ char nz = 0;
+ static const char tohex [] = "0123456789abcdef";
+
+ // assert (len >= 3 + bits / 4 + 1 + 1);
+ for (int i = bits / 4; --i; )
+ {
+ uint8_t digit = seq >> (bits - 4);
+
+ *buf = tohex [digit];
+ nz |= digit;
+ buf += nz ? 1 : 0;
+ seq <<= 4;
+ }
+
+ // last digit is special - always emit
+ uint8_t digit = seq >> (bits - 4);
+ *buf++ = tohex [digit];
+
+ *buf++ = '>';
+
+ return buf;
+}
+
+char *
+UUID::c_str () const
+{
+ static char buf [MAX_LEN];
+ *append (buf) = 0;
+ return buf;
+}
+
/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
static bool
compare_ob_value_lists_one (const object *wants, const object *has)
@@ -181,12 +249,12 @@
*/
bool object::can_merge_slow (object *ob1, object *ob2)
{
- /* A couple quicksanity checks */
+ /* A couple quick sanity checks */
if (ob1 == ob2
|| ob1->type != ob2->type
- || ob1->speed != ob2->speed
|| ob1->value != ob2->value
- || ob1->name != ob2->name)
+ || ob1->name != ob2->name
+ || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
return 0;
/* Do not merge objects if nrof would overflow, assume nrof
@@ -217,9 +285,9 @@
|| ob1->skill != ob2->skill
|| ob1->value != ob2->value
|| ob1->animation_id != ob2->animation_id
- || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
+ || (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
|| ob1->client_type != ob2->client_type
- || ob1->materialname != ob2->materialname
+ || ob1->material != ob2->material
|| ob1->lore != ob2->lore
|| ob1->subtype != ob2->subtype
|| ob1->move_type != ob2->move_type
@@ -228,7 +296,7 @@
|| ob1->move_on != ob2->move_on
|| ob1->move_off != ob2->move_off
|| ob1->move_slow != ob2->move_slow
- || ob1->move_slow_penalty != ob2->move_slow_penalty
+ || fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
return 0;
@@ -336,7 +404,7 @@
// even if our inv is in a player.
if (envest->is_on_map ())
if (object *pl = envest->ms ().player ())
- if (pl->container == env)
+ if (pl->container_ () == env)
return pl;
}
else
@@ -344,8 +412,8 @@
// maybe there is a player standing on the same mapspace
// this will catch the case where "this" is a player
if (object *pl = ms ().player ())
- if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
- || this == pl->container)
+ if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
+ || pl->container_ () == this)
return pl;
}
}
@@ -440,29 +508,6 @@
}
/*
- * get_nearest_part(multi-object, object 2) returns the part of the
- * multi-object 1 which is closest to the second object.
- * If it's not a multi-object, it is returned.
- */
-object *
-get_nearest_part (object *op, const object *pl)
-{
- object *tmp, *closest;
- int last_dist, i;
-
- if (!op->more)
- return op;
-
- for (last_dist = distance (op, pl), closest = op, tmp = op->more;
- tmp;
- tmp = tmp->more)
- if ((i = distance (tmp, pl)) < last_dist)
- closest = tmp, last_dist = i;
-
- return closest;
-}
-
-/*
* Returns the object which has the count-variable equal to the argument.
* VERRRY slow.
*/
@@ -643,9 +688,6 @@
}
}
- if (speed < 0)
- dst->speed_left -= rndm ();
-
dst->activate ();
}
@@ -655,7 +697,12 @@
if (!uuid.seq) // HACK
uuid = UUID::gen ();
- speed_left = -0.1f;
+ // TODO: unclean state changes, should nt be done in copy_to AND instantiate
+ if (flag [FLAG_RANDOM_SPEED] && speed)
+ speed_left = - speed - rndm (); // TODO animation
+ else
+ speed_left = -1.;
+
/* copy the body_info to the body_used - this is only really
* need for monsters, but doesn't hurt to do it for everything.
* by doing so, when a monster is created, it has good starting
@@ -673,6 +720,11 @@
{
object *neu = create ();
copy_to (neu);
+
+ // TODO: unclean state changes, should not be done in clone AND instantiate
+ if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
+ neu->speed_left = - neu->speed - rndm (); // TODO animation
+
neu->map = map; // not copied by copy_to
return neu;
}
@@ -700,12 +752,6 @@
void
object::set_speed (float speed)
{
- if (flag [FLAG_FREED] && speed)
- {
- LOG (llevError, "Object %s is freed but has speed.\n", &name);
- speed = 0;
- }
-
this->speed = speed;
if (has_active_speed ())
@@ -765,6 +811,7 @@
/* nop */;
else if (action == UP_OBJ_INSERT)
{
+#if 0
// this is likely overkill, TODO: revisit (schmorp)
if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
@@ -779,8 +826,11 @@
* have move_allow right now.
*/
|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
- || 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
m.invalidate ();
+#else
+ // the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
+ m.invalidate ();
+#endif
}
/* if the object is being removed, we can't make intelligent
* decisions, because remove_ob can't really pass the object
@@ -802,7 +852,8 @@
SET_FLAG (this, FLAG_REMOVED);
//expmul = 1.0; declared const for the time being
- face = blank_face;
+ face = blank_face;
+ material = MATERIAL_NULL;
}
object::~object ()
@@ -1042,9 +1093,6 @@
void
object::do_remove ()
{
- object *tmp, *last = 0;
- object *otmp;
-
if (flag [FLAG_REMOVED])
return;
@@ -1086,18 +1134,13 @@
below = 0;
env = 0;
- /* NO_FIX_PLAYER is set when a great many changes are being
- * made to players inventory. If set, avoiding the call
- * to save cpu time.
- */
- if (pl)
- if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
- {
- pl->update_stats ();
+ if (pl && pl->is_player ())
+ {
+ pl->contr->queue_stats_update ();
- if (glow_radius && pl->is_on_map ())
- update_all_los (pl->map, pl->x, pl->y);
- }
+ if (glow_radius && pl->is_on_map ())
+ update_all_los (pl->map, pl->x, pl->y);
+ }
}
else if (map)
{
@@ -1120,7 +1163,7 @@
--map->players;
map->touch ();
}
- else if (pl->container == this)
+ else if (pl->container_ () == this)
{
// removing a container should close it
close_container ();
@@ -1146,7 +1189,7 @@
if (object *pl = ms.player ())
{
- if (pl->container == this)
+ if (pl->container_ () == this)
/* If a container that the player is currently using somehow gets
* removed (most likely destroyed), update the player view
* appropriately.
@@ -1160,25 +1203,20 @@
pl->contr->ns->floorbox_update ();
}
- for (tmp = ms.bot; tmp; tmp = tmp->above)
- {
- /* No point updating the players look faces if he is the object
- * being removed.
- */
-
- /* See if object moving off should effect something */
- if (check_walk_off
- && ((move_type & tmp->move_off)
- && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
- {
- move_apply (tmp, this, 0);
+ if (check_walk_off)
+ for (object *above, *tmp = ms.bot; tmp; tmp = above)
+ {
+ above = tmp->above;
- if (destroyed ())
- LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
- }
+ /* No point updating the players look faces if he is the object
+ * being removed.
+ */
- last = tmp;
- }
+ /* See if object moving off should effect something */
+ if ((move_type & tmp->move_off)
+ && (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
+ move_apply (tmp, this, 0);
+ }
if (affects_los ())
update_all_los (map, x, y);
@@ -1232,7 +1270,7 @@
for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
{
- object *op = arch_to_object (at);
+ object *op = at->instance ();
op->name = name;
op->name_pl = name_pl;
@@ -1517,7 +1555,7 @@
if (tmp->arch->archname == archname) /* same archetype */
tmp->destroy ();
- object *tmp = arch_to_object (archetype::find (archname));
+ object *tmp = archetype::find (archname)->instance ();
tmp->x = op->x;
tmp->y = op->y;
@@ -1534,6 +1572,28 @@
return where->map->insert (this, where->x, where->y, originator, flags);
}
+// check whether we can put this into the map, respect max_volume, max_items
+bool
+object::can_drop_at (maptile *m, int x, int y, object *originator)
+{
+ mapspace &ms = m->at (x, y);
+
+ int items = ms.items ();
+
+ if (!items // testing !items ensures we can drop at least one item
+ || (items < m->max_items
+ && ms.volume () < m->max_volume))
+ return true;
+
+ if (originator && originator->is_player ())
+ originator->contr->failmsg (format (
+ "No matter how hard you try, you just cannot put the %s here H",
+ query_name ()
+ ));
+
+ return false;
+}
+
/*
* decrease(object, number) decreases a specified number from
* the amount of an object. If the amount reaches 0, the object
@@ -1681,9 +1741,9 @@
update_stats ();
update_all_los (map, x, y);
}
- else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
+ else if (is_player ())
// if this is a player's inventory, update stats
- update_stats ();
+ contr->queue_stats_update ();
INVOKE_OBJECT (INSERT, this);
@@ -2180,7 +2240,7 @@
* Moved from spell_util.c to object.c with the other related direction
* functions.
*/
-const int reduction_dir[SIZEOFFREE][3] = {
+static const int reduction_dir[SIZEOFFREE][3] = {
{0, 0, 0}, /* 0 */
{0, 0, 0}, /* 1 */
{0, 0, 0}, /* 2 */
@@ -2461,15 +2521,6 @@
: region::default_region ();
}
-const materialtype_t *
-object::dominant_material () const
-{
- if (materialtype_t *mt = name_to_material (materialname))
- return mt;
-
- return name_to_material (shstr_unknown);
-}
-
void
object::open_container (object *new_container)
{
@@ -2513,7 +2564,7 @@
// insert the "Close Container" object.
if (archetype *closer = new_container->other_arch)
{
- object *closer = arch_to_object (new_container->other_arch);
+ object *closer = new_container->other_arch->instance ();
closer->flag [FLAG_NO_MAP_SAVE] = 1;
new_container->insert (closer);
}
@@ -2549,6 +2600,8 @@
return 0;
}
+//-GPL
+
void
object::force_set_timer (int duration)
{
@@ -2567,10 +2620,8 @@
object *force = get_archetype (FORCE_NAME);
force->slaying = name;
-
force->force_set_timer (duration);
-
- force->flag [FLAG_APPLIED] = true;
+ force->flag [FLAG_APPLIED] = true;
return insert (force);
}