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.273 by root, Sat Dec 27 04:15:56 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 ();
1286 1289
1287 /* Ideally, the caller figures this out. However, it complicates a lot 1290 /* Ideally, the caller figures this out. However, it complicates a lot
1288 * 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
1289 * need extra work 1292 * need extra work
1290 */ 1293 */
1294 maptile *newmap = m;
1291 if (!xy_normalise (m, op->x, op->y)) 1295 if (!xy_normalise (newmap, op->x, op->y))
1292 { 1296 {
1293 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found 1297 op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1294 return 0; 1298 return 0;
1295 } 1299 }
1296 1300
1297 if (object *more = op->more) 1301 if (object *more = op->more)
1298 if (!insert_ob_in_map (more, m, originator, flag)) 1302 if (!insert_ob_in_map (more, m, originator, flag))
1299 return 0; 1303 return 0;
1300 1304
1301 CLEAR_FLAG (op, FLAG_REMOVED); 1305 op->flag [FLAG_REMOVED] = false;
1302 1306 op->env = 0;
1303 op->map = m; 1307 op->map = newmap;
1308
1304 mapspace &ms = op->ms (); 1309 mapspace &ms = op->ms ();
1305 1310
1306 /* this has to be done after we translate the coordinates. 1311 /* this has to be done after we translate the coordinates.
1307 */ 1312 */
1308 if (op->nrof && !(flag & INS_NO_MERGE)) 1313 if (op->nrof && !(flag & INS_NO_MERGE))
1329 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");
1330 abort (); 1335 abort ();
1331 } 1336 }
1332 1337
1333 if (!originator->is_on_map ()) 1338 if (!originator->is_on_map ())
1339 {
1334 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",
1335 op->debug_desc (), originator->debug_desc ()); 1341 op->debug_desc (), originator->debug_desc ());
1342 abort ();
1343 }
1336 1344
1337 op->above = originator; 1345 op->above = originator;
1338 op->below = originator->below; 1346 op->below = originator->below;
1339 originator->below = op; 1347 originator->below = op;
1340 1348
1472 * blocked() and wall() work properly), and these flags are updated by 1480 * blocked() and wall() work properly), and these flags are updated by
1473 * update_object(). 1481 * update_object().
1474 */ 1482 */
1475 1483
1476 /* 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 */
1477 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1485 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1478 { 1486 {
1479 if (check_move_on (op, originator)) 1487 if (check_move_on (op, originator))
1480 return 0; 1488 return 0;
1481 1489
1482 /* 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
1493/* this function inserts an object in the map, but if it 1501/* this function inserts an object in the map, but if it
1494 * 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.
1495 * 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.
1496 */ 1504 */
1497void 1505void
1498replace_insert_ob_in_map (const char *arch_string, object *op) 1506replace_insert_ob_in_map (shstr_tmp archname, object *op)
1499{ 1507{
1500 /* first search for itself and remove any old instances */ 1508 /* first search for itself and remove any old instances */
1501 1509
1502 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above) 1510 for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1503 if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */ 1511 if (tmp->arch->archname == archname) /* same archetype */
1504 tmp->destroy (); 1512 tmp->destroy ();
1505 1513
1506 object *tmp = arch_to_object (archetype::find (arch_string)); 1514 object *tmp = arch_to_object (archetype::find (archname));
1507 1515
1508 tmp->x = op->x; 1516 tmp->x = op->x;
1509 tmp->y = op->y; 1517 tmp->y = op->y;
1510 1518
1511 insert_ob_in_map (tmp, op->map, op, 0); 1519 insert_ob_in_map (tmp, op->map, op, 0);
1697 * on top. 1705 * on top.
1698 */ 1706 */
1699int 1707int
1700check_move_on (object *op, object *originator) 1708check_move_on (object *op, object *originator)
1701{ 1709{
1710 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1711 return 0;
1712
1702 object *tmp; 1713 object *tmp;
1703 maptile *m = op->map; 1714 maptile *m = op->map;
1704 int x = op->x, y = op->y; 1715 int x = op->x, y = op->y;
1705 1716
1706 MoveType move_on, move_slow, move_block; 1717 mapspace &ms = m->at (x, y);
1707 1718
1708 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1719 ms.update ();
1709 return 0;
1710 1720
1711 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1721 MoveType move_on = ms.move_on;
1712 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1722 MoveType move_slow = ms.move_slow;
1713 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1723 MoveType move_block = ms.move_block;
1714 1724
1715 /* 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,
1716 * 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
1717 * 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
1718 * as walking. 1728 * as walking.
1729 return 0; 1739 return 0;
1730 1740
1731 /* The objects have to be checked from top to bottom. 1741 /* The objects have to be checked from top to bottom.
1732 * Hence, we first go to the top: 1742 * Hence, we first go to the top:
1733 */ 1743 */
1734 1744 for (object *next, *tmp = ms.top; tmp; tmp = next)
1735 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1736 {
1737 /* Trim the search when we find the first other spell effect
1738 * this helps performance so that if a space has 50 spell objects,
1739 * we don't need to check all of them.
1740 */
1741 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1742 break;
1743 } 1745 {
1746 next = tmp->below;
1744 1747
1745 for (; tmp; tmp = tmp->below)
1746 {
1747 if (tmp == op) 1748 if (tmp == op)
1748 continue; /* Can't apply yourself */ 1749 continue; /* Can't apply yourself */
1749 1750
1750 /* 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.
1751 * Second check makes sure that the movement types not being slowed 1752 * Second check makes sure that the movement types not being slowed
1756 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1757 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1757 { 1758 {
1758 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1759 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1759 ((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))
1760 { 1761 {
1761
1762 float
1763 diff = tmp->move_slow_penalty * fabs (op->speed); 1762 float diff = tmp->move_slow_penalty * fabs (op->speed);
1764 1763
1765 if (op->is_player ()) 1764 if (op->is_player ())
1766 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)) ||
1767 (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)))
1768 diff /= 4.0; 1767 diff /= 4.0;
1769 1768
1770 op->speed_left -= diff; 1769 op->speed_left -= diff;
1771 } 1770 }
1772 } 1771 }
2056 * there is capable of. 2055 * there is capable of.
2057 */ 2056 */
2058int 2057int
2059find_dir (maptile *m, int x, int y, object *exclude) 2058find_dir (maptile *m, int x, int y, object *exclude)
2060{ 2059{
2061 int i, max = SIZEOFFREE, mflags; 2060 int max = SIZEOFFREE, mflags;
2062
2063 sint16 nx, ny;
2064 object *tmp;
2065 maptile *mp;
2066
2067 MoveType blocked, move_type; 2061 MoveType move_type;
2068 2062
2069 if (exclude && exclude->head_ () != exclude) 2063 if (exclude && exclude->head_ () != exclude)
2070 { 2064 {
2071 exclude = exclude->head; 2065 exclude = exclude->head;
2072 move_type = exclude->move_type; 2066 move_type = exclude->move_type;
2075 { 2069 {
2076 /* 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. */
2077 move_type = MOVE_ALL; 2071 move_type = MOVE_ALL;
2078 } 2072 }
2079 2073
2080 for (i = 1; i < max; i++) 2074 for (int i = 1; i < max; i++)
2081 { 2075 {
2082 mp = m; 2076 mapxy pos (m, x, y);
2083 nx = x + freearr_x[i]; 2077 pos.move (i);
2084 ny = y + freearr_y[i];
2085 2078
2086 mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny); 2079 if (!pos.normalise ())
2087
2088 if (mflags & P_OUT_OF_MAP)
2089 max = maxfree[i]; 2080 max = maxfree[i];
2090 else 2081 else
2091 { 2082 {
2092 mapspace &ms = mp->at (nx, ny); 2083 mapspace &ms = *pos;
2093 2084
2094 blocked = ms.move_block;
2095
2096 if ((move_type & blocked) == move_type) 2085 if ((move_type & ms.move_block) == move_type)
2097 max = maxfree[i]; 2086 max = maxfree [i];
2098 else if (mflags & P_IS_ALIVE) 2087 else if (ms.flags () & P_IS_ALIVE)
2099 { 2088 {
2100 for (tmp = ms.bot; tmp; tmp = tmp->above) 2089 for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2101 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ()) 2090 if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2102 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude))) 2091 && (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2103 break;
2104
2105 if (tmp)
2106 return freedir[i]; 2092 return freedir [i];
2107 } 2093 }
2108 } 2094 }
2109 } 2095 }
2110 2096
2111 return 0; 2097 return 0;
2186 * 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
2187 * 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.
2188 * 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
2189 * functions. 2175 * functions.
2190 */ 2176 */
2191int reduction_dir[SIZEOFFREE][3] = { 2177const int reduction_dir[SIZEOFFREE][3] = {
2192 {0, 0, 0}, /* 0 */ 2178 {0, 0, 0}, /* 0 */
2193 {0, 0, 0}, /* 1 */ 2179 {0, 0, 0}, /* 1 */
2194 {0, 0, 0}, /* 2 */ 2180 {0, 0, 0}, /* 2 */
2195 {0, 0, 0}, /* 3 */ 2181 {0, 0, 0}, /* 3 */
2196 {0, 0, 0}, /* 4 */ 2182 {0, 0, 0}, /* 4 */
2334 return tmp; 2320 return tmp;
2335 2321
2336 return 0; 2322 return 0;
2337} 2323}
2338 2324
2339const shstr & 2325shstr_tmp
2340object::kv_get (const shstr &key) const 2326object::kv_get (shstr_tmp key) const
2341{ 2327{
2342 for (key_value *kv = key_values; kv; kv = kv->next) 2328 for (key_value *kv = key_values; kv; kv = kv->next)
2343 if (kv->key == key) 2329 if (kv->key == key)
2344 return kv->value; 2330 return kv->value;
2345 2331
2346 return shstr_null; 2332 return shstr ();
2347} 2333}
2348 2334
2349void 2335void
2350object::kv_set (const shstr &key, const shstr &value) 2336object::kv_set (shstr_tmp key, shstr_tmp value)
2351{ 2337{
2352 for (key_value *kv = key_values; kv; kv = kv->next) 2338 for (key_value *kv = key_values; kv; kv = kv->next)
2353 if (kv->key == key) 2339 if (kv->key == key)
2354 { 2340 {
2355 kv->value = value; 2341 kv->value = value;
2364 2350
2365 key_values = kv; 2351 key_values = kv;
2366} 2352}
2367 2353
2368void 2354void
2369object::kv_del (const shstr &key) 2355object::kv_del (shstr_tmp key)
2370{ 2356{
2371 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next) 2357 for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2372 if ((*kvp)->key == key) 2358 if ((*kvp)->key == key)
2373 { 2359 {
2374 key_value *kv = *kvp; 2360 key_value *kv = *kvp;
2505 container = 0; 2491 container = 0;
2506 2492
2507 // 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
2508 esrv_update_item (UPD_FLAGS, this, old_container); 2494 esrv_update_item (UPD_FLAGS, this, old_container);
2509 2495
2510 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 ());
2511 play_sound (sound_find ("chest_close")); 2497 play_sound (sound_find ("chest_close"));
2512 } 2498 }
2513 2499
2514 if (new_container) 2500 if (new_container)
2515 { 2501 {
2525 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2511 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2526 new_container->insert (closer); 2512 new_container->insert (closer);
2527 } 2513 }
2528#endif 2514#endif
2529 2515
2530 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 ());
2531 2517
2532 // 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
2533 esrv_send_item (this, new_container); 2519 esrv_send_item (this, new_container);
2534 2520
2535 new_container->flag [FLAG_APPLIED] = true; 2521 new_container->flag [FLAG_APPLIED] = true;
2543// else if (!old_container->env && contr && contr->ns) 2529// else if (!old_container->env && contr && contr->ns)
2544// contr->ns->floorbox_reset (); 2530// contr->ns->floorbox_reset ();
2545} 2531}
2546 2532
2547object * 2533object *
2548object::force_find (const shstr name) 2534object::force_find (shstr_tmp name)
2549{ 2535{
2550 /* 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
2551 * place 2537 * place
2552 */ 2538 */
2553 for (object *tmp = inv; tmp; tmp = tmp->below) 2539 for (object *tmp = inv; tmp; tmp = tmp->below)
2556 2542
2557 return 0; 2543 return 0;
2558} 2544}
2559 2545
2560object * 2546object *
2561object::force_add (const shstr name, int duration) 2547object::force_add (shstr_tmp name, int duration)
2562{ 2548{
2563 if (object *force = force_find (name)) 2549 if (object *force = force_find (name))
2564 force->destroy (); 2550 force->destroy ();
2565 2551
2566 object *force = get_archetype (FORCE_NAME); 2552 object *force = get_archetype (FORCE_NAME);
2575 2561
2576 return insert (force); 2562 return insert (force);
2577} 2563}
2578 2564
2579void 2565void
2580object::play_sound (faceidx sound) 2566object::play_sound (faceidx sound) const
2581{ 2567{
2582 if (!sound) 2568 if (!sound)
2583 return; 2569 return;
2584 2570
2585 if (flag [FLAG_REMOVED]) 2571 if (is_on_map ())
2586 return;
2587
2588 if (env)
2589 {
2590 if (object *pl = in_player ())
2591 pl->contr->play_sound (sound);
2592 }
2593 else
2594 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);
2595} 2584}
2596 2585
2597void 2586void
2598object::make_noise () 2587object::make_noise ()
2599{ 2588{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines