ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.266 by root, Tue Dec 23 01:13:15 2008 UTC vs.
Revision 1.274 by root, Sun Dec 28 03:58:36 2008 UTC

… …
32#include <bitset> 32#include <bitset>
33 33
34UUID UUID::cur; 34UUID UUID::cur;
35static uint64_t seq_next_save; 35static uint64_t seq_next_save;
36static const uint64 UUID_GAP = 1<<19; 36static const uint64 UUID_GAP = 1<<19;
37uint32_t mapspace::smellcount = 10000;
37 38
38objectvec objects; 39objectvec objects;
39activevec actives; 40activevec actives;
40 41
41short freearr_x[SIZEOFFREE] = { 42short freearr_x[SIZEOFFREE] = {
… …
323 { 324 {
324 // see if we are in a container of sorts 325 // see if we are in a container of sorts
325 if (env) 326 if (env)
326 { 327 {
327 // the player inventory itself is always visible 328 // the player inventory itself is always visible
328 if (env->type == PLAYER) 329 if (env->is_player ())
329 return env; 330 return env;
330 331
331 // else a player could have our env open 332 // else a player could have our env open
332 object *envest = env->outer_env (); 333 object *envest = env->outer_env ();
333 334
… …
758 else if (action == UP_OBJ_INSERT) 759 else if (action == UP_OBJ_INSERT)
759 { 760 {
760 // this is likely overkill, TODO: revisit (schmorp) 761 // this is likely overkill, TODO: revisit (schmorp)
761 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW)) 762 if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
762 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC)) 763 || (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
763 || (op->type == PLAYER && !(m.flags_ & P_PLAYER)) 764 || (op->is_player () && !(m.flags_ & P_PLAYER))
764 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE)) 765 || (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
765 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE)) 766 || (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
766 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC)) 767 || (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
767 || (m.move_on | op->move_on ) != m.move_on 768 || (m.move_on | op->move_on ) != m.move_on
768 || (m.move_off | op->move_off ) != m.move_off 769 || (m.move_off | op->move_off ) != m.move_off
… …
1079 /* NO_FIX_PLAYER is set when a great many changes are being 1080 /* NO_FIX_PLAYER is set when a great many changes are being
1080 * made to players inventory. If set, avoiding the call 1081 * made to players inventory. If set, avoiding the call
1081 * to save cpu time. 1082 * to save cpu time.
1082 */ 1083 */
1083 if (pl) 1084 if (pl)
1084 if (pl->contr && !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)) 1085 if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1085 { 1086 {
1086 pl->update_stats (); 1087 pl->update_stats ();
1087 1088
1088 if (affects_los () && pl->is_on_map () && pl->map->darkness) 1089 if (glow_radius && pl->is_on_map ())
1089 update_all_los (pl->map, pl->x, pl->y); 1090 update_all_los (pl->map, pl->x, pl->y);
1090 } 1091 }
1091 } 1092 }
1092 else if (map) 1093 else if (map)
1093 { 1094 {
1094 map->dirty = true; 1095 map->dirty = true;
1095 mapspace &ms = this->ms (); 1096 mapspace &ms = this->ms ();
1096 1097
1097 if (object *pl = ms.player ()) 1098 if (object *pl = ms.player ())
1098 { 1099 {
1099 if (type == PLAYER) // this == pl(!) 1100 if (is_player ())
1100 { 1101 {
1102 if (!flag [FLAG_WIZPASS])
1103 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1104
1101 // leaving a spot always closes any open container on the ground 1105 // leaving a spot always closes any open container on the ground
1102 if (container && !container->env) 1106 if (container && !container->env)
1103 // this causes spurious floorbox updates, but it ensures 1107 // this causes spurious floorbox updates, but it ensures
1104 // that the CLOSE event is being sent. 1108 // that the CLOSE event is being sent.
1105 close_container (); 1109 close_container ();
… …
1165 } 1169 }
1166 1170
1167 last = tmp; 1171 last = tmp;
1168 } 1172 }
1169 1173
1170 if (map->darkness && affects_los ()) 1174 if (affects_los ())
1171 update_all_los (map, x, y); 1175 update_all_los (map, x, y);
1172 } 1176 }
1173} 1177}
1174 1178
1175/* 1179/*
… …
1282 1286
1283 /* Ideally, the caller figures this out. However, it complicates a lot 1287 /* Ideally, the caller figures this out. However, it complicates a lot
1284 * of areas of callers (eg, anything that uses find_free_spot would now 1288 * of areas of callers (eg, anything that uses find_free_spot would now
1285 * need extra work 1289 * need extra work
1286 */ 1290 */
1291 maptile *newmap = m;
1287 if (!xy_normalise (m, op->x, op->y)) 1292 if (!xy_normalise (newmap, op->x, op->y))
1288 { 1293 {
1289 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found 1294 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1290 return 0; 1295 return 0;
1291 } 1296 }
1292 1297
… …
1294 if (!insert_ob_in_map (more, m, originator, flag)) 1299 if (!insert_ob_in_map (more, m, originator, flag))
1295 return 0; 1300 return 0;
1296 1301
1297 CLEAR_FLAG (op, FLAG_REMOVED); 1302 CLEAR_FLAG (op, FLAG_REMOVED);
1298 1303
1299 op->map = m; 1304 op->map = newmap;
1300 mapspace &ms = op->ms (); 1305 mapspace &ms = op->ms ();
1301 1306
1302 /* this has to be done after we translate the coordinates. 1307 /* this has to be done after we translate the coordinates.
1303 */ 1308 */
1304 if (op->nrof && !(flag & INS_NO_MERGE)) 1309 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1422 op->below = top; 1427 op->below = top;
1423 *(op->above ? &op->above->below : &ms.top) = op; 1428 *(op->above ? &op->above->below : &ms.top) = op;
1424 } 1429 }
1425 } 1430 }
1426 1431
1427 if (op->type == PLAYER) 1432 if (op->is_player ())
1428 { 1433 {
1429 op->contr->do_los = 1; 1434 op->contr->do_los = 1;
1430 ++op->map->players; 1435 ++op->map->players;
1431 op->map->touch (); 1436 op->map->touch ();
1432 } 1437 }
… …
1447 * be far away from this change and not affected in any way - 1452 * be far away from this change and not affected in any way -
1448 * this should get redone to only look for players within range, 1453 * this should get redone to only look for players within range,
1449 * or just updating the P_UPTODATE for spaces within this area 1454 * or just updating the P_UPTODATE for spaces within this area
1450 * of effect may be sufficient. 1455 * of effect may be sufficient.
1451 */ 1456 */
1452 if (op->affects_los () && op->map->darkness) 1457 if (op->affects_los ())
1453 { 1458 {
1454 op->ms ().invalidate (); 1459 op->ms ().invalidate ();
1455 update_all_los (op->map, op->x, op->y); 1460 update_all_los (op->map, op->x, op->y);
1456 } 1461 }
1457 1462
… …
1656 1661
1657 adjust_weight (this, op->total_weight ()); 1662 adjust_weight (this, op->total_weight ());
1658 1663
1659inserted: 1664inserted:
1660 /* reset the light list and los of the players on the map */ 1665 /* reset the light list and los of the players on the map */
1661 if (op->glow_radius && is_on_map () && map->darkness) 1666 if (op->glow_radius && is_on_map ())
1662 { 1667 {
1663 update_stats (); 1668 update_stats ();
1664 update_all_los (map, x, y); 1669 update_all_los (map, x, y);
1665 } 1670 }
1666 else if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER]) 1671 else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1667 // if this is a player's inventory, update stats 1672 // if this is a player's inventory, update stats
1668 update_stats (); 1673 update_stats ();
1669 1674
1670 INVOKE_OBJECT (INSERT, this); 1675 INVOKE_OBJECT (INSERT, this);
1671 1676
… …
1756 { 1761 {
1757 1762
1758 float 1763 float
1759 diff = tmp->move_slow_penalty * fabs (op->speed); 1764 diff = tmp->move_slow_penalty * fabs (op->speed);
1760 1765
1761 if (op->type == PLAYER) 1766 if (op->is_player ())
1762 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1767 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1763 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1768 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1764 diff /= 4.0; 1769 diff /= 4.0;
1765 1770
1766 op->speed_left -= diff; 1771 op->speed_left -= diff;
… …
2092 if ((move_type & blocked) == move_type) 2097 if ((move_type & blocked) == move_type)
2093 max = maxfree[i]; 2098 max = maxfree[i];
2094 else if (mflags & P_IS_ALIVE) 2099 else if (mflags & P_IS_ALIVE)
2095 { 2100 {
2096 for (tmp = ms.bot; tmp; tmp = tmp->above) 2101 for (tmp = ms.bot; tmp; tmp = tmp->above)
2097 if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER) 2102 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2098 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2103 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2099 break; 2104 break;
2100 2105
2101 if (tmp) 2106 if (tmp)
2102 return freedir[i]; 2107 return freedir[i];
… …
2288int 2293int
2289can_pick (const object *who, const object *item) 2294can_pick (const object *who, const object *item)
2290{ 2295{
2291 return /*QUERY_FLAG(who,FLAG_WIZ)|| */ 2296 return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2292 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) && 2297 (item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2293 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3)); 2298 !QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2294} 2299}
2295 2300
2296/* 2301/*
2297 * create clone from object to another 2302 * create clone from object to another
2298 */ 2303 */
… …
2604 2609
2605 // find old force, or create new one 2610 // find old force, or create new one
2606 object *force = force_find (shstr_noise_force); 2611 object *force = force_find (shstr_noise_force);
2607 2612
2608 if (force) 2613 if (force)
2609 force->speed = 1.f / 4; // patch old speed up 2614 force->speed_left = -1.f; // patch old speed up
2610 else 2615 else
2611 force_add (shstr_noise_force, 4); 2616 {
2612} 2617 force = archetype::get (shstr_noise_force);
2613 2618
2619 force->slaying = shstr_noise_force;
2620 force->stats.food = 1;
2621 force->speed_left = -1.f;
2622
2623 force->set_speed (1.f / 4.f);
2624 force->flag [FLAG_IS_USED_UP] = true;
2625 force->flag [FLAG_APPLIED] = true;
2626
2627 insert (force);
2628 }
2629}
2630

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines