--- deliantra/server/common/object.C 2009/01/08 03:03:23 1.279
+++ deliantra/server/common/object.C 2009/11/08 20:55:39 1.299
@@ -1,22 +1,23 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009 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
*/
@@ -39,6 +40,8 @@
objectvec objects;
activevec actives;
+//+GPL
+
short freearr_x[SIZEOFFREE] = {
0,
0, 1, 1, 1, 0, -1, -1, -1,
@@ -51,12 +54,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 +61,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)
{
@@ -184,7 +188,7 @@
/* A couple quicksanity checks */
if (ob1 == ob2
|| ob1->type != ob2->type
- || ob1->speed != ob2->speed
+ || fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
|| ob1->value != ob2->value
|| ob1->name != ob2->name)
return 0;
@@ -228,7 +232,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;
@@ -330,13 +334,13 @@
return env;
// else a player could have our env open
- object *envest = env->outer_env ();
+ object *envest = env->outer_env_or_self ();
// the player itself is always on a map, so we will find him here
// 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 +348,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;
}
}
@@ -433,27 +437,10 @@
return freezer.as_string ();
}
-/*
- * 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)
+char *
+object::as_string ()
{
- 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;
+ return dump_object (this);
}
/*
@@ -557,7 +544,8 @@
new_draw_info_format (NDI_UNIQUE, 0, this,
"You try to balance all your items at once, "
"but the %s is just too much for your body. "
- "[You need to unapply some items first.]", &ob->name);
+ "[You need to unapply some items first - use the 'body' command to see "
+ "how many items you cna wera on a specific body part.]", &ob->name);
return false;
}
@@ -693,12 +681,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 ())
@@ -758,6 +740,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))
@@ -772,8 +755,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
@@ -794,7 +780,7 @@
{
SET_FLAG (this, FLAG_REMOVED);
- expmul = 1.0;
+ //expmul = 1.0; declared const for the time being
face = blank_face;
}
@@ -833,11 +819,13 @@
if (active)
return;
- if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
- if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
-
if (has_active_speed ())
- actives.insert (this);
+ {
+ if (flag [FLAG_FREED])
+ LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
+
+ actives.insert (this);
+ }
}
void
@@ -1033,9 +1021,6 @@
void
object::do_remove ()
{
- object *tmp, *last = 0;
- object *otmp;
-
if (flag [FLAG_REMOVED])
return;
@@ -1111,7 +1096,7 @@
--map->players;
map->touch ();
}
- else if (pl->container == this)
+ else if (pl->container_ () == this)
{
// removing a container should close it
close_container ();
@@ -1137,7 +1122,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.
@@ -1151,25 +1136,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);
@@ -1299,9 +1279,10 @@
if (!insert_ob_in_map (more, m, originator, flag))
return 0;
- CLEAR_FLAG (op, FLAG_REMOVED);
-
+ op->flag [FLAG_REMOVED] = false;
+ op->env = 0;
op->map = newmap;
+
mapspace &ms = op->ms ();
/* this has to be done after we translate the coordinates.
@@ -1332,8 +1313,11 @@
}
if (!originator->is_on_map ())
- LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
- op->debug_desc (), originator->debug_desc ());
+ {
+ LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
+ op->debug_desc (), originator->debug_desc ());
+ abort ();
+ }
op->above = originator;
op->below = originator->below;
@@ -1475,7 +1459,7 @@
*/
/* if this is not the head or flag has been passed, don't check walk on status */
- if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
+ if (!(flag & INS_NO_WALK_ON) && op->is_head ())
{
if (check_move_on (op, originator))
return 0;
@@ -1521,6 +1505,29 @@
return where->map->insert (this, where->x, where->y, originator, flags);
}
+// check whether we can put this into the map, respect max_nrof, 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
+ && nrof <= m->max_nrof))
+ 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
@@ -1700,18 +1707,20 @@
int
check_move_on (object *op, object *originator)
{
+ if (QUERY_FLAG (op, FLAG_NO_APPLY))
+ return 0;
+
object *tmp;
maptile *m = op->map;
int x = op->x, y = op->y;
- MoveType move_on, move_slow, move_block;
+ mapspace &ms = m->at (x, y);
- if (QUERY_FLAG (op, FLAG_NO_APPLY))
- return 0;
+ ms.update ();
- move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
- move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
- move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
+ MoveType move_on = ms.move_on;
+ MoveType move_slow = ms.move_slow;
+ MoveType move_block = ms.move_block;
/* if nothing on this space will slow op down or be applied,
* no need to do checking below. have to make sure move_type
@@ -1732,19 +1741,10 @@
/* The objects have to be checked from top to bottom.
* Hence, we first go to the top:
*/
-
- for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
+ for (object *next, *tmp = ms.top; tmp; tmp = next)
{
- /* Trim the search when we find the first other spell effect
- * this helps performance so that if a space has 50 spell objects,
- * we don't need to check all of them.
- */
- if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
- break;
- }
+ next = tmp->below;
- for (; tmp; tmp = tmp->below)
- {
if (tmp == op)
continue; /* Can't apply yourself */
@@ -1759,13 +1759,11 @@
if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
{
-
- float
- diff = tmp->move_slow_penalty * fabs (op->speed);
+ float diff = tmp->move_slow_penalty * fabs (op->speed);
if (op->is_player ())
- if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
- (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
+ if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
+ (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
diff /= 4.0;
op->speed_left -= diff;
@@ -2176,7 +2174,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 */
@@ -2495,7 +2493,7 @@
// client needs item update to make it work, client bug requires this to be separate
esrv_update_item (UPD_FLAGS, this, old_container);
- new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
+ new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
play_sound (sound_find ("chest_close"));
}
@@ -2515,7 +2513,7 @@
}
#endif
- new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
+ new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
// make sure the container is available, client bug requires this to be separate
esrv_send_item (this, new_container);
@@ -2545,6 +2543,17 @@
return 0;
}
+//-GPL
+
+void
+object::force_set_timer (int duration)
+{
+ this->duration = 1;
+ this->speed_left = -1.f;
+
+ this->set_speed (duration ? 1.f / duration : 0.f);
+}
+
object *
object::force_add (shstr_tmp name, int duration)
{
@@ -2553,33 +2562,32 @@
object *force = get_archetype (FORCE_NAME);
- force->slaying = name;
- force->stats.food = 1;
- force->speed_left = -1.f;
-
- force->set_speed (duration ? 1.f / duration : 0.f);
- force->flag [FLAG_IS_USED_UP] = true;
- force->flag [FLAG_APPLIED] = true;
+ force->slaying = name;
+ force->force_set_timer (duration);
+ force->flag [FLAG_APPLIED] = true;
return insert (force);
}
void
-object::play_sound (faceidx sound)
+object::play_sound (faceidx sound) const
{
if (!sound)
return;
- if (flag [FLAG_REMOVED])
- return;
-
- if (env)
- {
- if (object *pl = in_player ())
- pl->contr->play_sound (sound);
- }
- else
+ if (is_on_map ())
map->play_sound (sound, x, y);
+ else if (object *pl = in_player ())
+ pl->contr->play_sound (sound);
+}
+
+void
+object::say_msg (const char *msg) const
+{
+ if (is_on_map ())
+ map->say_msg (msg, x, y);
+ else if (object *pl = in_player ())
+ pl->contr->play_sound (sound);
}
void