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

Comparing deliantra/server/common/treasure.C (file contents):
Revision 1.112 by root, Sat Apr 23 04:56:47 2011 UTC vs.
Revision 1.116 by root, Mon Oct 29 23:55:52 2012 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,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * 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 Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * 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>
23 */ 23 */
24 24
25/* TREASURE_DEBUG does some checking on the treasurelists after loading. 25/* TREASURE_DEBUG does some checking on the treasurelists after loading.
26 * It is useful for finding bugs in the treasures file. Since it only 26 * It is useful for finding bugs in the treasures file. Since it only
919 { 919 {
920 if (op->type == POTION) 920 if (op->type == POTION)
921 /* Handle healing and magic power potions */ 921 /* Handle healing and magic power potions */
922 if (op->stats.sp && !op->randomitems) 922 if (op->stats.sp && !op->randomitems)
923 { 923 {
924 object *tmp = get_archetype (spell_mapping [op->stats.sp]); 924 object *tmp = archetype::get (spell_mapping [op->stats.sp]);
925 insert_ob_in_ob (tmp, op); 925 insert_ob_in_ob (tmp, op);
926 op->stats.sp = 0; 926 op->stats.sp = 0;
927 } 927 }
928 } 928 }
929 else if (!op->title) /* Only modify object if not special */ 929 else if (!op->title) /* Only modify object if not special */
947 } 947 }
948 break; 948 break;
949 949
950 case POTION: 950 case POTION:
951 { 951 {
952 int too_many_tries = 0, is_special = 0; 952 int too_many_tries = 0;
953 953
954 /* Handle healing and magic power potions */ 954 /* Handle healing and magic power potions */
955 if (op->stats.sp && !op->randomitems) 955 if (op->stats.sp && !op->randomitems)
956 { 956 {
957 object *tmp = get_archetype (spell_mapping[op->stats.sp]); 957 object *tmp = archetype::get (spell_mapping[op->stats.sp]);
958 insert_ob_in_ob (tmp, op); 958 insert_ob_in_ob (tmp, op);
959 op->stats.sp = 0; 959 op->stats.sp = 0;
960 } 960 }
961 961
962 while (!(is_special = special_potion (op)) && !op->inv) 962 while (!special_potion (op) && !op->inv)
963 { 963 {
964 generate_artifact (op, difficulty); 964 generate_artifact (op, difficulty);
965 if (too_many_tries++ > 10) 965 if (too_many_tries++ > 10)
966 break; 966 break;
967 } 967 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines