--- deliantra/server/common/object.C 2008/12/23 01:51:27 1.267 +++ deliantra/server/common/object.C 2009/09/02 16:54:20 1.286 @@ -1,7 +1,7 @@ /* * 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 * @@ -34,6 +34,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; @@ -325,11 +326,11 @@ if (env) { // the player inventory itself is always visible - if (env->type == PLAYER) + if (env->is_player ()) 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. @@ -760,7 +761,7 @@ // 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)) - || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) + || (op->is_player () && !(m.flags_ & P_PLAYER)) || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) @@ -793,7 +794,7 @@ { SET_FLAG (this, FLAG_REMOVED); - expmul = 1.0; + //expmul = 1.0; declared const for the time being face = blank_face; } @@ -832,11 +833,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 +967,7 @@ object::do_destroy () { if (flag [FLAG_IS_LINKED]) - remove_button_link (this); + remove_link (); if (flag [FLAG_FRIENDLY]) remove_friendly_object (this); @@ -1085,7 +1088,7 @@ { pl->update_stats (); - if (glow_radius && pl->is_on_map () && pl->map->darkness) + if (glow_radius && pl->is_on_map ()) update_all_los (pl->map, pl->x, pl->y); } } @@ -1096,8 +1099,11 @@ if (object *pl = ms.player ()) { - if (type == PLAYER) // this == pl(!) + if (is_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) // this causes spurious floorbox updates, but it ensures @@ -1167,7 +1173,7 @@ last = tmp; } - if (map->darkness && affects_los ()) + if (affects_los ()) update_all_los (map, x, y); } } @@ -1284,7 +1290,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; @@ -1294,9 +1301,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. @@ -1327,8 +1335,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; @@ -1424,7 +1435,7 @@ } } - if (op->type == PLAYER) + if (op->is_player ()) { op->contr->do_los = 1; ++op->map->players; @@ -1449,7 +1460,7 @@ * or just updating the P_UPTODATE for spaces within this area * of effect may be sufficient. */ - if (op->affects_los () && op->map->darkness) + if (op->affects_los ()) { op->ms ().invalidate (); update_all_los (op->map, op->x, op->y); @@ -1491,15 +1502,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; @@ -1658,12 +1669,12 @@ inserted: /* reset the light list and los of the players on the map */ - if (op->glow_radius && is_on_map () && map->darkness) + if (op->glow_radius && is_on_map ()) { update_stats (); update_all_los (map, x, y); } - else if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) + else if (is_player () && !flag [FLAG_NO_FIX_PLAYER]) // if this is a player's inventory, update stats update_stats (); @@ -1758,7 +1769,7 @@ float diff = tmp->move_slow_penalty * fabs (op->speed); - if (op->type == PLAYER) + 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))) diff /= 4.0; @@ -2054,13 +2065,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) { @@ -2073,33 +2079,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); - - blocked = ms.move_block; + mapspace &ms = *pos; - 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) - if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) + 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]; } } } @@ -2184,7 +2182,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 */ @@ -2290,7 +2288,7 @@ { return /*QUERY_FLAG(who,FLAG_WIZ)|| */ (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && - !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); + !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3)); } /* @@ -2332,18 +2330,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) @@ -2362,7 +2360,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) @@ -2503,7 +2501,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")); } @@ -2523,7 +2521,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); @@ -2541,7 +2539,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 @@ -2554,7 +2552,7 @@ } 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 (); @@ -2573,21 +2571,24 @@ } 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 @@ -2606,8 +2607,20 @@ object *force = force_find (shstr_noise_force); if (force) - force->speed = 1.f / 4; // patch old speed up + force->speed_left = -1.f; // patch old speed up else - force_add (shstr_noise_force, 4); + { + force = archetype::get (shstr_noise_force); + + force->slaying = shstr_noise_force; + force->stats.food = 1; + force->speed_left = -1.f; + + force->set_speed (1.f / 4.f); + force->flag [FLAG_IS_USED_UP] = true; + force->flag [FLAG_APPLIED] = true; + + insert (force); + } }