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.272 by root, Sat Dec 27 04:09:58 2008 UTC vs.
Revision 1.288 by root, Sat Oct 3 22:36:08 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
… …
328 // the player inventory itself is always visible 328 // the player inventory itself is always visible
329 if (env->is_player ()) 329 if (env->is_player ())
330 return env; 330 return env;
331 331
332 // else a player could have our env open 332 // else a player could have our env open
333 object *envest = env->outer_env (); 333 object *envest = env->outer_env_or_self ();
334 334
335 // the player itself is always on a map, so we will find him here 335 // the player itself is always on a map, so we will find him here
336 // even if our inv is in a player. 336 // even if our inv is in a player.
337 if (envest->is_on_map ()) 337 if (envest->is_on_map ())
338 if (object *pl = envest->ms ().player ()) 338 if (object *pl = envest->ms ().player ())
… …
555 update_stats (); 555 update_stats ();
556 556
557 new_draw_info_format (NDI_UNIQUE, 0, this, 557 new_draw_info_format (NDI_UNIQUE, 0, this,
558 "You try to balance all your items at once, " 558 "You try to balance all your items at once, "
559 "but the %s is just too much for your body. " 559 "but the %s is just too much for your body. "
560 "[You need to unapply some items first.]", &ob->name); 560 "[You need to unapply some items first - use the 'body' command to see "
561 "how many items you cna wera on a specific body part.]", &ob->name);
561 return false; 562 return false;
562 } 563 }
563 564
564 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 565 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
565 } 566 }
… …
792 793
793object::object () 794object::object ()
794{ 795{
795 SET_FLAG (this, FLAG_REMOVED); 796 SET_FLAG (this, FLAG_REMOVED);
796 797
797 expmul = 1.0; 798 //expmul = 1.0; declared const for the time being
798 face = blank_face; 799 face = blank_face;
799} 800}
800 801
801object::~object () 802object::~object ()
802{ 803{
… …
831{ 832{
832 /* If already on active list, don't do anything */ 833 /* If already on active list, don't do anything */
833 if (active) 834 if (active)
834 return; 835 return;
835 836
836 if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
837 if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
838
839 if (has_active_speed ()) 837 if (has_active_speed ())
838 {
839 if (flag [FLAG_FREED])
840 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
841
840 actives.insert (this); 842 actives.insert (this);
843 }
841} 844}
842 845
843void 846void
844object::activate_recursive () 847object::activate_recursive ()
845{ 848{
… …
963 966
964void 967void
965object::do_destroy () 968object::do_destroy ()
966{ 969{
967 if (flag [FLAG_IS_LINKED]) 970 if (flag [FLAG_IS_LINKED])
968 remove_button_link (this); 971 remove_link ();
969 972
970 if (flag [FLAG_FRIENDLY]) 973 if (flag [FLAG_FRIENDLY])
971 remove_friendly_object (this); 974 remove_friendly_object (this);
972 975
973 remove (); 976 remove ();
… …
1097 1100
1098 if (object *pl = ms.player ()) 1101 if (object *pl = ms.player ())
1099 { 1102 {
1100 if (is_player ()) 1103 if (is_player ())
1101 { 1104 {
1105 if (!flag [FLAG_WIZPASS])
1102 ms.smell = ++mapspace::smellcount; // remember the smell of the player 1106 ms.smell = ++mapspace::smellcount; // remember the smell of the player
1103 1107
1104 // leaving a spot always closes any open container on the ground 1108 // leaving a spot always closes any open container on the ground
1105 if (container && !container->env) 1109 if (container && !container->env)
1106 // this causes spurious floorbox updates, but it ensures 1110 // this causes spurious floorbox updates, but it ensures
1107 // that the CLOSE event is being sent. 1111 // that the CLOSE event is being sent.
… …
1285 1289
1286 /* Ideally, the caller figures this out. However, it complicates a lot 1290 /* Ideally, the caller figures this out. However, it complicates a lot
1287 * of areas of callers (eg, anything that uses find_free_spot would now 1291 * of areas of callers (eg, anything that uses find_free_spot would now
1288 * need extra work 1292 * need extra work
1289 */ 1293 */
1294 maptile *newmap = m;
1290 if (!xy_normalise (m, op->x, op->y)) 1295 if (!xy_normalise (newmap, op->x, op->y))
1291 { 1296 {
1292 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found 1297 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1293 return 0; 1298 return 0;
1294 } 1299 }
1295 1300
1296 if (object *more = op->more) 1301 if (object *more = op->more)
1297 if (!insert_ob_in_map (more, m, originator, flag)) 1302 if (!insert_ob_in_map (more, m, originator, flag))
1298 return 0; 1303 return 0;
1299 1304
1300 CLEAR_FLAG (op, FLAG_REMOVED); 1305 op->flag [FLAG_REMOVED] = false;
1301 1306 op->env = 0;
1302 op->map = m; 1307 op->map = newmap;
1308
1303 mapspace &ms = op->ms (); 1309 mapspace &ms = op->ms ();
1304 1310
1305 /* this has to be done after we translate the coordinates. 1311 /* this has to be done after we translate the coordinates.
1306 */ 1312 */
1307 if (op->nrof && !(flag & INS_NO_MERGE)) 1313 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1328 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1334 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1329 abort (); 1335 abort ();
1330 } 1336 }
1331 1337
1332 if (!originator->is_on_map ()) 1338 if (!originator->is_on_map ())
1339 {
1333 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", 1340 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1334 op->debug_desc (), originator->debug_desc ()); 1341 op->debug_desc (), originator->debug_desc ());
1342 abort ();
1343 }
1335 1344
1336 op->above = originator; 1345 op->above = originator;
1337 op->below = originator->below; 1346 op->below = originator->below;
1338 originator->below = op; 1347 originator->below = op;
1339 1348
… …
1471 * blocked() and wall() work properly), and these flags are updated by 1480 * blocked() and wall() work properly), and these flags are updated by
1472 * update_object(). 1481 * update_object().
1473 */ 1482 */
1474 1483
1475 /* if this is not the head or flag has been passed, don't check walk on status */ 1484 /* if this is not the head or flag has been passed, don't check walk on status */
1476 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1485 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1477 { 1486 {
1478 if (check_move_on (op, originator)) 1487 if (check_move_on (op, originator))
1479 return 0; 1488 return 0;
1480 1489
1481 /* If we are a multi part object, lets work our way through the check 1490 /* If we are a multi part object, lets work our way through the check
… …
1492/* this function inserts an object in the map, but if it 1501/* this function inserts an object in the map, but if it
1493 * finds an object of its own type, it'll remove that one first. 1502 * finds an object of its own type, it'll remove that one first.
1494 * op is the object to insert it under: supplies x and the map. 1503 * op is the object to insert it under: supplies x and the map.
1495 */ 1504 */
1496void 1505void
1497replace_insert_ob_in_map (const char *arch_string, object *op) 1506replace_insert_ob_in_map (shstr_tmp archname, object *op)
1498{ 1507{
1499 /* first search for itself and remove any old instances */ 1508 /* first search for itself and remove any old instances */
1500 1509
1501 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1510 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1502 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1511 if (tmp->arch->archname == archname) /* same archetype */
1503 tmp->destroy (); 1512 tmp->destroy ();
1504 1513
1505 object *tmp = arch_to_object (archetype::find (arch_string)); 1514 object *tmp = arch_to_object (archetype::find (archname));
1506 1515
1507 tmp->x = op->x; 1516 tmp->x = op->x;
1508 tmp->y = op->y; 1517 tmp->y = op->y;
1509 1518
1510 insert_ob_in_map (tmp, op->map, op, 0); 1519 insert_ob_in_map (tmp, op->map, op, 0);
… …
1696 * on top. 1705 * on top.
1697 */ 1706 */
1698int 1707int
1699check_move_on (object *op, object *originator) 1708check_move_on (object *op, object *originator)
1700{ 1709{
1710 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1711 return 0;
1712
1701 object *tmp; 1713 object *tmp;
1702 maptile *m = op->map; 1714 maptile *m = op->map;
1703 int x = op->x, y = op->y; 1715 int x = op->x, y = op->y;
1704 1716
1705 MoveType move_on, move_slow, move_block; 1717 mapspace &ms = m->at (x, y);
1706 1718
1707 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1719 ms.update ();
1708 return 0;
1709 1720
1710 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1721 MoveType move_on = ms.move_on;
1711 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1722 MoveType move_slow = ms.move_slow;
1712 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1723 MoveType move_block = ms.move_block;
1713 1724
1714 /* if nothing on this space will slow op down or be applied, 1725 /* if nothing on this space will slow op down or be applied,
1715 * no need to do checking below. have to make sure move_type 1726 * no need to do checking below. have to make sure move_type
1716 * is set, as lots of objects don't have it set - we treat that 1727 * is set, as lots of objects don't have it set - we treat that
1717 * as walking. 1728 * as walking.
… …
1728 return 0; 1739 return 0;
1729 1740
1730 /* The objects have to be checked from top to bottom. 1741 /* The objects have to be checked from top to bottom.
1731 * Hence, we first go to the top: 1742 * Hence, we first go to the top:
1732 */ 1743 */
1733 1744 for (object *next, *tmp = ms.top; tmp; tmp = next)
1734 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1735 {
1736 /* Trim the search when we find the first other spell effect
1737 * this helps performance so that if a space has 50 spell objects,
1738 * we don't need to check all of them.
1739 */
1740 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1741 break;
1742 } 1745 {
1746 next = tmp->below;
1743 1747
1744 for (; tmp; tmp = tmp->below)
1745 {
1746 if (tmp == op) 1748 if (tmp == op)
1747 continue; /* Can't apply yourself */ 1749 continue; /* Can't apply yourself */
1748 1750
1749 /* Check to see if one of the movement types should be slowed down. 1751 /* Check to see if one of the movement types should be slowed down.
1750 * Second check makes sure that the movement types not being slowed 1752 * Second check makes sure that the movement types not being slowed
… …
1755 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1757 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1756 { 1758 {
1757 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1759 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1758 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1760 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1759 { 1761 {
1760
1761 float
1762 diff = tmp->move_slow_penalty * fabs (op->speed); 1762 float diff = tmp->move_slow_penalty * fabs (op->speed);
1763 1763
1764 if (op->is_player ()) 1764 if (op->is_player ())
1765 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1765 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1766 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1766 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1767 diff /= 4.0; 1767 diff /= 4.0;
1768 1768
1769 op->speed_left -= diff; 1769 op->speed_left -= diff;
1770 } 1770 }
1771 } 1771 }
… …
2055 * there is capable of. 2055 * there is capable of.
2056 */ 2056 */
2057int 2057int
2058find_dir (maptile *m, int x, int y, object *exclude) 2058find_dir (maptile *m, int x, int y, object *exclude)
2059{ 2059{
2060 int i, max = SIZEOFFREE, mflags; 2060 int max = SIZEOFFREE, mflags;
2061
2062 sint16 nx, ny;
2063 object *tmp;
2064 maptile *mp;
2065
2066 MoveType blocked, move_type; 2061 MoveType move_type;
2067 2062
2068 if (exclude && exclude->head_ () != exclude) 2063 if (exclude && exclude->head_ () != exclude)
2069 { 2064 {
2070 exclude = exclude->head; 2065 exclude = exclude->head;
2071 move_type = exclude->move_type; 2066 move_type = exclude->move_type;
… …
2074 { 2069 {
2075 /* If we don't have anything, presume it can use all movement types. */ 2070 /* If we don't have anything, presume it can use all movement types. */
2076 move_type = MOVE_ALL; 2071 move_type = MOVE_ALL;
2077 } 2072 }
2078 2073
2079 for (i = 1; i < max; i++) 2074 for (int i = 1; i < max; i++)
2080 { 2075 {
2081 mp = m; 2076 mapxy pos (m, x, y);
2082 nx = x + freearr_x[i]; 2077 pos.move (i);
2083 ny = y + freearr_y[i];
2084 2078
2085 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2079 if (!pos.normalise ())
2086
2087 if (mflags & P_OUT_OF_MAP)
2088 max = maxfree[i]; 2080 max = maxfree[i];
2089 else 2081 else
2090 { 2082 {
2091 mapspace &ms = mp->at (nx, ny); 2083 mapspace &ms = *pos;
2092 2084
2093 blocked = ms.move_block;
2094
2095 if ((move_type & blocked) == move_type) 2085 if ((move_type & ms.move_block) == move_type)
2096 max = maxfree[i]; 2086 max = maxfree [i];
2097 else if (mflags & P_IS_ALIVE) 2087 else if (ms.flags () & P_IS_ALIVE)
2098 { 2088 {
2099 for (tmp = ms.bot; tmp; tmp = tmp->above) 2089 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2100 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) 2090 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2101 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2091 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2102 break;
2103
2104 if (tmp)
2105 return freedir[i]; 2092 return freedir [i];
2106 } 2093 }
2107 } 2094 }
2108 } 2095 }
2109 2096
2110 return 0; 2097 return 0;
… …
2185 * This basically means that if direction is 15, then it could either go 2172 * This basically means that if direction is 15, then it could either go
2186 * direction 4, 14, or 16 to get back to where we are. 2173 * direction 4, 14, or 16 to get back to where we are.
2187 * Moved from spell_util.c to object.c with the other related direction 2174 * Moved from spell_util.c to object.c with the other related direction
2188 * functions. 2175 * functions.
2189 */ 2176 */
2190int reduction_dir[SIZEOFFREE][3] = { 2177const int reduction_dir[SIZEOFFREE][3] = {
2191 {0, 0, 0}, /* 0 */ 2178 {0, 0, 0}, /* 0 */
2192 {0, 0, 0}, /* 1 */ 2179 {0, 0, 0}, /* 1 */
2193 {0, 0, 0}, /* 2 */ 2180 {0, 0, 0}, /* 2 */
2194 {0, 0, 0}, /* 3 */ 2181 {0, 0, 0}, /* 3 */
2195 {0, 0, 0}, /* 4 */ 2182 {0, 0, 0}, /* 4 */
… …
2333 return tmp; 2320 return tmp;
2334 2321
2335 return 0; 2322 return 0;
2336} 2323}
2337 2324
2338const shstr & 2325shstr_tmp
2339object::kv_get (const shstr &key) const 2326object::kv_get (shstr_tmp key) const
2340{ 2327{
2341 for (key_value *kv = key_values; kv; kv = kv->next) 2328 for (key_value *kv = key_values; kv; kv = kv->next)
2342 if (kv->key == key) 2329 if (kv->key == key)
2343 return kv->value; 2330 return kv->value;
2344 2331
2345 return shstr_null; 2332 return shstr ();
2346} 2333}
2347 2334
2348void 2335void
2349object::kv_set (const shstr &key, const shstr &value) 2336object::kv_set (shstr_tmp key, shstr_tmp value)
2350{ 2337{
2351 for (key_value *kv = key_values; kv; kv = kv->next) 2338 for (key_value *kv = key_values; kv; kv = kv->next)
2352 if (kv->key == key) 2339 if (kv->key == key)
2353 { 2340 {
2354 kv->value = value; 2341 kv->value = value;
… …
2363 2350
2364 key_values = kv; 2351 key_values = kv;
2365} 2352}
2366 2353
2367void 2354void
2368object::kv_del (const shstr &key) 2355object::kv_del (shstr_tmp key)
2369{ 2356{
2370 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2357 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2371 if ((*kvp)->key == key) 2358 if ((*kvp)->key == key)
2372 { 2359 {
2373 key_value *kv = *kvp; 2360 key_value *kv = *kvp;
… …
2504 container = 0; 2491 container = 0;
2505 2492
2506 // client needs item update to make it work, client bug requires this to be separate 2493 // client needs item update to make it work, client bug requires this to be separate
2507 esrv_update_item (UPD_FLAGS, this, old_container); 2494 esrv_update_item (UPD_FLAGS, this, old_container);
2508 2495
2509 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2496 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2510 play_sound (sound_find ("chest_close")); 2497 play_sound (sound_find ("chest_close"));
2511 } 2498 }
2512 2499
2513 if (new_container) 2500 if (new_container)
2514 { 2501 {
… …
2524 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2511 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2525 new_container->insert (closer); 2512 new_container->insert (closer);
2526 } 2513 }
2527#endif 2514#endif
2528 2515
2529 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2516 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2530 2517
2531 // make sure the container is available, client bug requires this to be separate 2518 // make sure the container is available, client bug requires this to be separate
2532 esrv_send_item (this, new_container); 2519 esrv_send_item (this, new_container);
2533 2520
2534 new_container->flag [FLAG_APPLIED] = true; 2521 new_container->flag [FLAG_APPLIED] = true;
… …
2542// else if (!old_container->env && contr && contr->ns) 2529// else if (!old_container->env && contr && contr->ns)
2543// contr->ns->floorbox_reset (); 2530// contr->ns->floorbox_reset ();
2544} 2531}
2545 2532
2546object * 2533object *
2547object::force_find (const shstr name) 2534object::force_find (shstr_tmp name)
2548{ 2535{
2549 /* cycle through his inventory to look for the MARK we want to 2536 /* cycle through his inventory to look for the MARK we want to
2550 * place 2537 * place
2551 */ 2538 */
2552 for (object *tmp = inv; tmp; tmp = tmp->below) 2539 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
2555 2542
2556 return 0; 2543 return 0;
2557} 2544}
2558 2545
2559object * 2546object *
2560object::force_add (const shstr name, int duration) 2547object::force_add (shstr_tmp name, int duration)
2561{ 2548{
2562 if (object *force = force_find (name)) 2549 if (object *force = force_find (name))
2563 force->destroy (); 2550 force->destroy ();
2564 2551
2565 object *force = get_archetype (FORCE_NAME); 2552 object *force = get_archetype (FORCE_NAME);
… …
2574 2561
2575 return insert (force); 2562 return insert (force);
2576} 2563}
2577 2564
2578void 2565void
2579object::play_sound (faceidx sound) 2566object::play_sound (faceidx sound) const
2580{ 2567{
2581 if (!sound) 2568 if (!sound)
2582 return; 2569 return;
2583 2570
2584 if (flag [FLAG_REMOVED]) 2571 if (is_on_map ())
2585 return;
2586
2587 if (env)
2588 {
2589 if (object *pl = in_player ())
2590 pl->contr->play_sound (sound);
2591 }
2592 else
2593 map->play_sound (sound, x, y); 2572 map->play_sound (sound, x, y);
2573 else if (object *pl = in_player ())
2574 pl->contr->play_sound (sound);
2575}
2576
2577void
2578object::say_msg (const char *msg) const
2579{
2580 if (is_on_map ())
2581 map->say_msg (msg, x, y);
2582 else if (object *pl = in_player ())
2583 pl->contr->play_sound (sound);
2594} 2584}
2595 2585
2596void 2586void
2597object::make_noise () 2587object::make_noise ()
2598{ 2588{

Diff Legend

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