--- deliantra/server/common/object.C 2008/12/27 02:31:19 1.270
+++ deliantra/server/common/object.C 2009/10/19 21:48:49 1.292
@@ -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
*/
@@ -34,6 +35,7 @@
UUID UUID::cur;
static uint64_t seq_next_save;
static const uint64 UUID_GAP = 1<<19;
+uint32_t mapspace::smellcount = 10000;
objectvec objects;
activevec actives;
@@ -329,13 +331,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
@@ -343,8 +345,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;
}
}
@@ -432,6 +434,12 @@
return freezer.as_string ();
}
+char *
+object::as_string ()
+{
+ return dump_object (this);
+}
+
/*
* get_nearest_part(multi-object, object 2) returns the part of the
* multi-object 1 which is closest to the second object.
@@ -556,7 +564,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;
}
@@ -793,7 +802,7 @@
{
SET_FLAG (this, FLAG_REMOVED);
- expmul = 1.0;
+ //expmul = 1.0; declared const for the time being
face = blank_face;
}
@@ -832,11 +841,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
@@ -964,7 +975,7 @@
object::do_destroy ()
{
if (flag [FLAG_IS_LINKED])
- remove_button_link (this);
+ remove_link ();
if (flag [FLAG_FRIENDLY])
remove_friendly_object (this);
@@ -1098,7 +1109,8 @@
{
if (is_player ())
{
- ms.smell = pticks; // remember the smell of the player
+ if (!flag [FLAG_WIZPASS])
+ ms.smell = ++mapspace::smellcount; // remember the smell of the player
// leaving a spot always closes any open container on the ground
if (container && !container->env)
@@ -1109,7 +1121,7 @@
--map->players;
map->touch ();
}
- else if (pl->container == this)
+ else if (pl->container_ () == this)
{
// removing a container should close it
close_container ();
@@ -1135,7 +1147,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.
@@ -1286,7 +1298,8 @@
* of areas of callers (eg, anything that uses find_free_spot would now
* need extra work
*/
- if (!xy_normalise (m, op->x, op->y))
+ maptile *newmap = m;
+ if (!xy_normalise (newmap, op->x, op->y))
{
op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
return 0;
@@ -1296,9 +1309,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;
- op->map = m;
mapspace &ms = op->ms ();
/* this has to be done after we translate the coordinates.
@@ -1329,8 +1343,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;
@@ -1472,7 +1489,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;
@@ -1493,15 +1510,15 @@
* op is the object to insert it under: supplies x and the map.
*/
void
-replace_insert_ob_in_map (const char *arch_string, object *op)
+replace_insert_ob_in_map (shstr_tmp archname, object *op)
{
/* first search for itself and remove any old instances */
for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
- if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
+ if (tmp->arch->archname == archname) /* same archetype */
tmp->destroy ();
- object *tmp = arch_to_object (archetype::find (arch_string));
+ object *tmp = arch_to_object (archetype::find (archname));
tmp->x = op->x;
tmp->y = op->y;
@@ -1697,18 +1714,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
@@ -1729,19 +1748,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 */
@@ -1756,13 +1766,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;
@@ -2056,13 +2064,8 @@
int
find_dir (maptile *m, int x, int y, object *exclude)
{
- int i, max = SIZEOFFREE, mflags;
-
- sint16 nx, ny;
- object *tmp;
- maptile *mp;
-
- MoveType blocked, move_type;
+ int max = SIZEOFFREE, mflags;
+ MoveType move_type;
if (exclude && exclude->head_ () != exclude)
{
@@ -2075,33 +2078,25 @@
move_type = MOVE_ALL;
}
- for (i = 1; i < max; i++)
+ for (int i = 1; i < max; i++)
{
- mp = m;
- nx = x + freearr_x[i];
- ny = y + freearr_y[i];
-
- mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
+ mapxy pos (m, x, y);
+ pos.move (i);
- if (mflags & P_OUT_OF_MAP)
+ if (!pos.normalise ())
max = maxfree[i];
else
{
- mapspace &ms = mp->at (nx, ny);
+ mapspace &ms = *pos;
- blocked = ms.move_block;
-
- if ((move_type & blocked) == move_type)
- max = maxfree[i];
- else if (mflags & P_IS_ALIVE)
+ if ((move_type & ms.move_block) == move_type)
+ max = maxfree [i];
+ else if (ms.flags () & P_IS_ALIVE)
{
- for (tmp = ms.bot; tmp; tmp = tmp->above)
+ for (object *tmp = ms.bot; tmp; tmp = tmp->above)
if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
- break;
-
- if (tmp)
- return freedir[i];
+ return freedir [i];
}
}
}
@@ -2186,7 +2181,7 @@
* Moved from spell_util.c to object.c with the other related direction
* functions.
*/
-int reduction_dir[SIZEOFFREE][3] = {
+const int reduction_dir[SIZEOFFREE][3] = {
{0, 0, 0}, /* 0 */
{0, 0, 0}, /* 1 */
{0, 0, 0}, /* 2 */
@@ -2334,18 +2329,18 @@
return 0;
}
-const shstr &
-object::kv_get (const shstr &key) const
+shstr_tmp
+object::kv_get (shstr_tmp key) const
{
for (key_value *kv = key_values; kv; kv = kv->next)
if (kv->key == key)
return kv->value;
- return shstr_null;
+ return shstr ();
}
void
-object::kv_set (const shstr &key, const shstr &value)
+object::kv_set (shstr_tmp key, shstr_tmp value)
{
for (key_value *kv = key_values; kv; kv = kv->next)
if (kv->key == key)
@@ -2364,7 +2359,7 @@
}
void
-object::kv_del (const shstr &key)
+object::kv_del (shstr_tmp key)
{
for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
if ((*kvp)->key == key)
@@ -2505,7 +2500,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"));
}
@@ -2525,7 +2520,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);
@@ -2543,7 +2538,7 @@
}
object *
-object::force_find (const shstr name)
+object::force_find (shstr_tmp name)
{
/* cycle through his inventory to look for the MARK we want to
* place
@@ -2555,41 +2550,51 @@
return 0;
}
+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 (const shstr name, int duration)
+object::force_add (shstr_tmp name, int duration)
{
if (object *force = force_find (name))
force->destroy ();
object *force = get_archetype (FORCE_NAME);
- force->slaying = name;
- force->stats.food = 1;
- force->speed_left = -1.f;
+ force->slaying = name;
+
+ force->force_set_timer (duration);
- force->set_speed (duration ? 1.f / duration : 0.f);
- force->flag [FLAG_IS_USED_UP] = true;
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