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

Comparing deliantra/server/random_maps/treasure.C (file contents):
Revision 1.42 by root, Thu Sep 25 04:35:50 2008 UTC vs.
Revision 1.45 by root, Mon Oct 12 14:00:58 2009 UTC

3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 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 it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* placing treasure in maps, where appropriate. */ 25/* placing treasure in maps, where appropriate. */
669} 670}
670 671
671void 672void
672remove_monsters (int x, int y, maptile *map) 673remove_monsters (int x, int y, maptile *map)
673{ 674{
674 object *tmp;
675
676 for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above) 675 for (object *tmp = GET_MAP_OB (map, x, y); tmp; )
677 if (QUERY_FLAG (tmp, FLAG_ALIVE))
678 { 676 {
679 if (tmp->head) 677 object *next = tmp->above;
680 tmp = tmp->head; 678
681 tmp->remove (); 679 if (tmp->flag [FLAG_ALIVE])
682 tmp->destroy (); 680 tmp->head_ ()->destroy ();
683 tmp = GET_MAP_OB (map, x, y); 681
684 if (tmp == NULL) 682 tmp = next;
685 break;
686 }; 683 }
687} 684}
688 685
689/* surrounds the point x,y by doors, so as to enclose something, like 686/* surrounds the point x,y by doors, so as to enclose something, like
690 a chest. It only goes as far as the 8 squares surrounding, and 687 a chest. It only goes as far as the 8 squares surrounding, and
691 it'll remove any monsters it finds.*/ 688 it'll remove any monsters it finds.*/
820 817
821 /* lock the doors and hide the keys. */ 818 /* lock the doors and hide the keys. */
822 819
823 if (opts & DOORED) 820 if (opts & DOORED)
824 { 821 {
825 for (i = 0, door = doorlist[0]; doorlist[i] != NULL; i++) 822 for (i = 0, door = doorlist[0]; doorlist[i]; i++)
826 { 823 {
827 object *new_door = get_archetype (shstr_locked_door1); 824 object *new_door = get_archetype (shstr_locked_door1);
828 825
829 door = doorlist[i]; 826 door = doorlist[i];
830 new_door->face = door->face; 827 new_door->face = door->face;
831 new_door->x = door->x; 828 new_door->x = door->x;
832 new_door->y = door->y; 829 new_door->y = door->y;
833 door->remove ();
834 door->destroy (); 830 door->destroy ();
835 doorlist[i] = new_door; 831 doorlist[i] = new_door;
836 insert_ob_in_map (new_door, map, NULL, 0); 832 insert_ob_in_map (new_door, map, NULL, 0);
837 new_door->slaying = format ("RMG-%d-%d", (int)rmg_rndm (1000000000), (int)rmg_rndm (1000000000)); 833 new_door->slaying = format ("RMG-%d-%d", (int)rmg_rndm (1000000000), (int)rmg_rndm (1000000000));
838 keyplace (map, new_door->x, new_door->y, new_door->slaying, NO_PASS_DOORS, 2, RP); 834 keyplace (map, new_door->x, new_door->y, new_door->slaying, NO_PASS_DOORS, 2, RP);
855 retrofit_joined_wall (map, door->x, door->y - 1, 0, RP); 851 retrofit_joined_wall (map, door->x, door->y - 1, 0, RP);
856 retrofit_joined_wall (map, door->x, door->y + 1, 0, RP); 852 retrofit_joined_wall (map, door->x, door->y + 1, 0, RP);
857 853
858 door->face = wallface->face; 854 door->face = wallface->face;
859 855
860 if (!QUERY_FLAG (wallface, FLAG_REMOVED))
861 wallface->remove ();
862
863 wallface->destroy (); 856 wallface->destroy ();
864 } 857 }
865 } 858 }
866 } 859 }
867} 860}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines