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.280 by root, Thu Jan 8 19:23:44 2009 UTC vs.
Revision 1.290 by sf-marcmagus, Sun Oct 11 05:43:35 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 ())
… …
431 object_freezer freezer; 431 object_freezer freezer;
432 op->write (freezer); 432 op->write (freezer);
433 return freezer.as_string (); 433 return freezer.as_string ();
434} 434}
435 435
436char *
437object::as_string ()
438{
439 return dump_object (this);
440}
441
436/* 442/*
437 * get_nearest_part(multi-object, object 2) returns the part of the 443 * get_nearest_part(multi-object, object 2) returns the part of the
438 * multi-object 1 which is closest to the second object. 444 * multi-object 1 which is closest to the second object.
439 * If it's not a multi-object, it is returned. 445 * If it's not a multi-object, it is returned.
440 */ 446 */
… …
555 update_stats (); 561 update_stats ();
556 562
557 new_draw_info_format (NDI_UNIQUE, 0, this, 563 new_draw_info_format (NDI_UNIQUE, 0, this,
558 "You try to balance all your items at once, " 564 "You try to balance all your items at once, "
559 "but the %s is just too much for your body. " 565 "but the %s is just too much for your body. "
560 "[You need to unapply some items first.]", &ob->name); 566 "[You need to unapply some items first - use the 'body' command to see "
567 "how many items you cna wera on a specific body part.]", &ob->name);
561 return false; 568 return false;
562 } 569 }
563 570
564 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name); 571 //new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
565 } 572 }
… …
792 799
793object::object () 800object::object ()
794{ 801{
795 SET_FLAG (this, FLAG_REMOVED); 802 SET_FLAG (this, FLAG_REMOVED);
796 803
797 expmul = 1.0; 804 //expmul = 1.0; declared const for the time being
798 face = blank_face; 805 face = blank_face;
799} 806}
800 807
801object::~object () 808object::~object ()
802{ 809{
… …
831{ 838{
832 /* If already on active list, don't do anything */ 839 /* If already on active list, don't do anything */
833 if (active) 840 if (active)
834 return; 841 return;
835 842
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 ()) 843 if (has_active_speed ())
844 {
845 if (flag [FLAG_FREED])
846 LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
847
840 actives.insert (this); 848 actives.insert (this);
849 }
841} 850}
842 851
843void 852void
844object::activate_recursive () 853object::activate_recursive ()
845{ 854{
… …
1297 1306
1298 if (object *more = op->more) 1307 if (object *more = op->more)
1299 if (!insert_ob_in_map (more, m, originator, flag)) 1308 if (!insert_ob_in_map (more, m, originator, flag))
1300 return 0; 1309 return 0;
1301 1310
1302 CLEAR_FLAG (op, FLAG_REMOVED); 1311 op->flag [FLAG_REMOVED] = false;
1303 1312 op->env = 0;
1304 op->map = newmap; 1313 op->map = newmap;
1314
1305 mapspace &ms = op->ms (); 1315 mapspace &ms = op->ms ();
1306 1316
1307 /* this has to be done after we translate the coordinates. 1317 /* this has to be done after we translate the coordinates.
1308 */ 1318 */
1309 if (op->nrof && !(flag & INS_NO_MERGE)) 1319 if (op->nrof && !(flag & INS_NO_MERGE))
… …
1330 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n"); 1340 LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1331 abort (); 1341 abort ();
1332 } 1342 }
1333 1343
1334 if (!originator->is_on_map ()) 1344 if (!originator->is_on_map ())
1345 {
1335 LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map", 1346 LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1336 op->debug_desc (), originator->debug_desc ()); 1347 op->debug_desc (), originator->debug_desc ());
1348 abort ();
1349 }
1337 1350
1338 op->above = originator; 1351 op->above = originator;
1339 op->below = originator->below; 1352 op->below = originator->below;
1340 originator->below = op; 1353 originator->below = op;
1341 1354
… …
1473 * blocked() and wall() work properly), and these flags are updated by 1486 * blocked() and wall() work properly), and these flags are updated by
1474 * update_object(). 1487 * update_object().
1475 */ 1488 */
1476 1489
1477 /* if this is not the head or flag has been passed, don't check walk on status */ 1490 /* if this is not the head or flag has been passed, don't check walk on status */
1478 if (!(flag & INS_NO_WALK_ON) && op->head_ () == op) 1491 if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1479 { 1492 {
1480 if (check_move_on (op, originator)) 1493 if (check_move_on (op, originator))
1481 return 0; 1494 return 0;
1482 1495
1483 /* If we are a multi part object, lets work our way through the check 1496 /* If we are a multi part object, lets work our way through the check
… …
1698 * on top. 1711 * on top.
1699 */ 1712 */
1700int 1713int
1701check_move_on (object *op, object *originator) 1714check_move_on (object *op, object *originator)
1702{ 1715{
1716 if (QUERY_FLAG (op, FLAG_NO_APPLY))
1717 return 0;
1718
1703 object *tmp; 1719 object *tmp;
1704 maptile *m = op->map; 1720 maptile *m = op->map;
1705 int x = op->x, y = op->y; 1721 int x = op->x, y = op->y;
1706 1722
1707 MoveType move_on, move_slow, move_block; 1723 mapspace &ms = m->at (x, y);
1708 1724
1709 if (QUERY_FLAG (op, FLAG_NO_APPLY)) 1725 ms.update ();
1710 return 0;
1711 1726
1712 move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y); 1727 MoveType move_on = ms.move_on;
1713 move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y); 1728 MoveType move_slow = ms.move_slow;
1714 move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y); 1729 MoveType move_block = ms.move_block;
1715 1730
1716 /* if nothing on this space will slow op down or be applied, 1731 /* if nothing on this space will slow op down or be applied,
1717 * no need to do checking below. have to make sure move_type 1732 * no need to do checking below. have to make sure move_type
1718 * is set, as lots of objects don't have it set - we treat that 1733 * is set, as lots of objects don't have it set - we treat that
1719 * as walking. 1734 * as walking.
… …
1730 return 0; 1745 return 0;
1731 1746
1732 /* The objects have to be checked from top to bottom. 1747 /* The objects have to be checked from top to bottom.
1733 * Hence, we first go to the top: 1748 * Hence, we first go to the top:
1734 */ 1749 */
1735 1750 for (object *next, *tmp = ms.top; tmp; tmp = next)
1736 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1737 {
1738 /* Trim the search when we find the first other spell effect
1739 * this helps performance so that if a space has 50 spell objects,
1740 * we don't need to check all of them.
1741 */
1742 if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1743 break;
1744 } 1751 {
1752 next = tmp->below;
1745 1753
1746 for (; tmp; tmp = tmp->below)
1747 {
1748 if (tmp == op) 1754 if (tmp == op)
1749 continue; /* Can't apply yourself */ 1755 continue; /* Can't apply yourself */
1750 1756
1751 /* Check to see if one of the movement types should be slowed down. 1757 /* Check to see if one of the movement types should be slowed down.
1752 * Second check makes sure that the movement types not being slowed 1758 * Second check makes sure that the movement types not being slowed
… …
1757 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1763 if (!QUERY_FLAG (op, FLAG_WIZPASS))
1758 { 1764 {
1759 if ((!op->move_type && tmp->move_slow & MOVE_WALK) || 1765 if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1760 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) 1766 ((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1761 { 1767 {
1762
1763 float
1764 diff = tmp->move_slow_penalty * fabs (op->speed); 1768 float diff = tmp->move_slow_penalty * fabs (op->speed);
1765 1769
1766 if (op->is_player ()) 1770 if (op->is_player ())
1767 if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) || 1771 if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1768 (QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN))) 1772 (tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1769 diff /= 4.0; 1773 diff /= 4.0;
1770 1774
1771 op->speed_left -= diff; 1775 op->speed_left -= diff;
1772 } 1776 }
1773 } 1777 }
… …
2493 container = 0; 2497 container = 0;
2494 2498
2495 // client needs item update to make it work, client bug requires this to be separate 2499 // client needs item update to make it work, client bug requires this to be separate
2496 esrv_update_item (UPD_FLAGS, this, old_container); 2500 esrv_update_item (UPD_FLAGS, this, old_container);
2497 2501
2498 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container)); 2502 new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2499 play_sound (sound_find ("chest_close")); 2503 play_sound (sound_find ("chest_close"));
2500 } 2504 }
2501 2505
2502 if (new_container) 2506 if (new_container)
2503 { 2507 {
… …
2513 closer->flag [FLAG_NO_MAP_SAVE] = 1; 2517 closer->flag [FLAG_NO_MAP_SAVE] = 1;
2514 new_container->insert (closer); 2518 new_container->insert (closer);
2515 } 2519 }
2516#endif 2520#endif
2517 2521
2518 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container)); 2522 new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2519 2523
2520 // make sure the container is available, client bug requires this to be separate 2524 // make sure the container is available, client bug requires this to be separate
2521 esrv_send_item (this, new_container); 2525 esrv_send_item (this, new_container);
2522 2526
2523 new_container->flag [FLAG_APPLIED] = true; 2527 new_container->flag [FLAG_APPLIED] = true;
… …
2543 return splay (tmp); 2547 return splay (tmp);
2544 2548
2545 return 0; 2549 return 0;
2546} 2550}
2547 2551
2552void
2553object::force_set_timer (int duration)
2554{
2555 this->duration = 1;
2556 this->speed_left = -1.f;
2557
2558 this->set_speed (duration ? 1.f / duration : 0.f);
2559}
2560
2548object * 2561object *
2549object::force_add (shstr_tmp name, int duration) 2562object::force_add (shstr_tmp name, int duration)
2550{ 2563{
2551 if (object *force = force_find (name)) 2564 if (object *force = force_find (name))
2552 force->destroy (); 2565 force->destroy ();
2553 2566
2554 object *force = get_archetype (FORCE_NAME); 2567 object *force = get_archetype (FORCE_NAME);
2555 2568
2556 force->slaying = name; 2569 force->slaying = name;
2557 force->stats.food = 1;
2558 force->speed_left = -1.f;
2559 2570
2560 force->set_speed (duration ? 1.f / duration : 0.f); 2571 force->force_set_timer (duration);
2561 force->flag [FLAG_IS_USED_UP] = true; 2572
2562 force->flag [FLAG_APPLIED] = true; 2573 force->flag [FLAG_APPLIED] = true;
2563 2574
2564 return insert (force); 2575 return insert (force);
2565} 2576}
2566 2577

Diff Legend

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