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.102 by root, Mon Jan 1 17:34:11 2007 UTC vs.
Revision 1.107 by pippijn, Sat Jan 6 14:42:29 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
8 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
… …
733void 734void
734object::activate_recursive () 735object::activate_recursive ()
735{ 736{
736 activate (); 737 activate ();
737 738
738 for (object *op = inv; op; op = op->above) 739 for (object *op = inv; op; op = op->below)
739 op->activate_recursive (); 740 op->activate_recursive ();
740} 741}
741 742
742/* This function removes object 'op' from the list of active 743/* This function removes object 'op' from the list of active
743 * objects. 744 * objects.
… …
772} 773}
773 774
774void 775void
775object::deactivate_recursive () 776object::deactivate_recursive ()
776{ 777{
777 for (object *op = inv; op; op = op->above) 778 for (object *op = inv; op; op = op->below)
778 op->deactivate_recursive (); 779 op->deactivate_recursive ();
779 780
780 deactivate (); 781 deactivate ();
782}
783
784void
785object::set_flag_inv (int flag, int value)
786{
787 for (object *op = inv; op; op = op->below)
788 {
789 op->flag [flag] = value;
790 op->set_flag_inv (flag, value);
791 }
781} 792}
782 793
783/* 794/*
784 * Remove and free all objects in the inventory of the given object. 795 * Remove and free all objects in the inventory of the given object.
785 * object.c ? 796 * object.c ?
… …
870 freed_map->name = "/internal/freed_objects_map"; 881 freed_map->name = "/internal/freed_objects_map";
871 freed_map->width = 3; 882 freed_map->width = 3;
872 freed_map->height = 3; 883 freed_map->height = 3;
873 884
874 freed_map->alloc (); 885 freed_map->alloc ();
886 freed_map->in_memory = MAP_IN_MEMORY;
875 } 887 }
876 888
877 map = freed_map; 889 map = freed_map;
878 x = 1; 890 x = 1;
879 y = 1; 891 y = 1;
… …
1203 { 1215 {
1204 /* The part may be on a different map. */ 1216 /* The part may be on a different map. */
1205 1217
1206 object *more = op->more; 1218 object *more = op->more;
1207 1219
1208 /* We really need the caller to normalize coordinates - if 1220 /* We really need the caller to normalise coordinates - if
1209 * we set the map, that doesn't work if the location is within 1221 * we set the map, that doesn't work if the location is within
1210 * a map and this is straddling an edge. So only if coordinate 1222 * a map and this is straddling an edge. So only if coordinate
1211 * is clear wrong do we normalize it. 1223 * is clear wrong do we normalise it.
1212 */ 1224 */
1213 if (OUT_OF_REAL_MAP (more->map, more->x, more->y)) 1225 if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1214 more->map = get_map_from_coord (m, &more->x, &more->y); 1226 more->map = get_map_from_coord (m, &more->x, &more->y);
1215 else if (!more->map) 1227 else if (!more->map)
1216 { 1228 {
… …
1443{ 1455{
1444 object *tmp, *tmp1; 1456 object *tmp, *tmp1;
1445 1457
1446 /* first search for itself and remove any old instances */ 1458 /* first search for itself and remove any old instances */
1447 1459
1448 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1460 for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1449 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1461 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1450 tmp->destroy (); 1462 tmp->destroy ();
1451 1463
1452 tmp1 = arch_to_object (archetype::find (arch_string)); 1464 tmp1 = arch_to_object (archetype::find (arch_string));
1453 1465
… …
1776 1788
1777 /* The objects have to be checked from top to bottom. 1789 /* The objects have to be checked from top to bottom.
1778 * Hence, we first go to the top: 1790 * Hence, we first go to the top:
1779 */ 1791 */
1780 1792
1781 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above) 1793 for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1782 { 1794 {
1783 /* Trim the search when we find the first other spell effect 1795 /* Trim the search when we find the first other spell effect
1784 * this helps performance so that if a space has 50 spell objects, 1796 * this helps performance so that if a space has 50 spell objects,
1785 * we don't need to check all of them. 1797 * we don't need to check all of them.
1786 */ 1798 */
… …
1844 * The first matching object is returned, or NULL if none. 1856 * The first matching object is returned, or NULL if none.
1845 */ 1857 */
1846object * 1858object *
1847present_arch (const archetype *at, maptile *m, int x, int y) 1859present_arch (const archetype *at, maptile *m, int x, int y)
1848{ 1860{
1849 if (m == NULL || out_of_map (m, x, y)) 1861 if (!m || out_of_map (m, x, y))
1850 { 1862 {
1851 LOG (llevError, "Present_arch called outside map.\n"); 1863 LOG (llevError, "Present_arch called outside map.\n");
1852 return NULL; 1864 return NULL;
1853 } 1865 }
1854 1866
1855 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1867 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1856 if (tmp->arch == at) 1868 if (tmp->arch == at)
1857 return tmp; 1869 return tmp;
1858 1870
1859 return NULL; 1871 return NULL;
1860} 1872}
… …
1871 { 1883 {
1872 LOG (llevError, "Present called outside map.\n"); 1884 LOG (llevError, "Present called outside map.\n");
1873 return NULL; 1885 return NULL;
1874 } 1886 }
1875 1887
1876 for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above) 1888 for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877 if (tmp->type == type) 1889 if (tmp->type == type)
1878 return tmp; 1890 return tmp;
1879 1891
1880 return NULL; 1892 return NULL;
1881} 1893}

Diff Legend

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