--- deliantra/server/common/object.C 2009/09/01 20:56:05 1.285
+++ deliantra/server/common/object.C 2009/10/12 14:00:57 1.291
@@ -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
*/
@@ -433,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.
@@ -557,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;
}
@@ -833,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
@@ -1479,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;
@@ -1704,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
@@ -1736,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 */
@@ -1763,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;
@@ -2549,6 +2550,15 @@
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 (shstr_tmp name, int duration)
{
@@ -2557,12 +2567,10 @@
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);