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.71 by root, Tue Apr 15 03:16:02 2008 UTC vs.
Revision 1.72 by root, Sun Apr 20 00:44:12 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,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
… …
144 coroapi::cede_to_tick (); 144 coroapi::cede_to_tick ();
145 145
146 switch (f.kw) 146 switch (f.kw)
147 { 147 {
148 case KW_arch: 148 case KW_arch:
149 t->item = archetype::get (f.get_str ()); 149 t->item = archetype::find (f.get_str ());
150 if (!t->item)
151 {
152 f.parse_warn ("treasure references unknown archetype");
153 goto error;
154 }
155
150 break; 156 break;
151 157
152 case KW_list: f.get (t->name); break; 158 case KW_list: f.get (t->name); break;
153 case KW_change_name: f.get (t->change_arch.name); break; 159 case KW_change_name: f.get (t->change_arch.name); break;
154 case KW_change_title: f.get (t->change_arch.title); break; 160 case KW_change_title: f.get (t->change_arch.title); break;
… …
168 t->next = read_treasure (f); 174 t->next = read_treasure (f);
169 return t; 175 return t;
170 176
171 default: 177 default:
172 if (!f.parse_error ("treasurelist", t->name)) 178 if (!f.parse_error ("treasurelist", t->name))
173 return 0; 179 goto error;
174 180
175 return t; 181 return t;
176 } 182 }
177 183
178 f.next (); 184 f.next ();
179 } 185 }
186
187 // not reached
188
189error:
190 delete t;
191 return 0;
180} 192}
181 193
182/* 194/*
183 * Each treasure is parsed with the help of load_treasure(). 195 * Each treasure is parsed with the help of load_treasure().
184 */ 196 */
… …
816 ARG_INT (flags))) 828 ARG_INT (flags)))
817 return; 829 return;
818 830
819 if (!(flags & GT_MINIMAL)) 831 if (!(flags & GT_MINIMAL))
820 { 832 {
821 if (op->arch == crown_arch) 833 if (IS_ARCH (op->arch, crown))
822 { 834 {
823 set_magic (difficulty, op, max_magic, flags); 835 set_magic (difficulty, op, max_magic, flags);
824 num_enchantments = calc_item_power (op, 1); 836 num_enchantments = calc_item_power (op, 1);
825 generate_artifact (op, difficulty); 837 generate_artifact (op, difficulty);
826 } 838 }
… …
831 843
832 num_enchantments = calc_item_power (op, 1); 844 num_enchantments = calc_item_power (op, 1);
833 845
834 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT)) 846 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
835 || op->type == HORN 847 || op->type == HORN
836 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 848 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
837 * used for shop_floors or treasures */
838 generate_artifact (op, difficulty); 849 generate_artifact (op, difficulty);
839 } 850 }
840 851
841 /* Object was made an artifact. Calculate its item_power rating. 852 /* Object was made an artifact. Calculate its item_power rating.
842 * the item_power in the object is what the artfiact adds. 853 * the item_power in the object is what the artfiact adds.
… …
884 { 895 {
885 if (op->type == POTION) 896 if (op->type == POTION)
886 /* Handle healing and magic power potions */ 897 /* Handle healing and magic power potions */
887 if (op->stats.sp && !op->randomitems) 898 if (op->stats.sp && !op->randomitems)
888 { 899 {
889 object *tmp;
890
891 tmp = get_archetype (spell_mapping[op->stats.sp]); 900 object *tmp = get_archetype (spell_mapping [op->stats.sp]);
892 insert_ob_in_ob (tmp, op); 901 insert_ob_in_ob (tmp, op);
893 op->stats.sp = 0; 902 op->stats.sp = 0;
894 } 903 }
895 } 904 }
896 else if (!op->title) /* Only modify object if not special */ 905 else if (!op->title) /* Only modify object if not special */
… …
954 SET_FLAG (op, FLAG_CURSED); 963 SET_FLAG (op, FLAG_CURSED);
955 break; 964 break;
956 } 965 }
957 966
958 case AMULET: 967 case AMULET:
959 if (op->arch == amulet_arch) 968 if (IS_ARCH (op->arch, amulet))
960 op->value *= 5; /* Since it's not just decoration */ 969 op->value *= 5; /* Since it's not just decoration */
961 970
962 case RING: 971 case RING:
963 if (op->arch == NULL) 972 if (!op->arch) // wtf? schmorp
964 { 973 {
965 op->destroy (); 974 op->destroy ();
966 op = 0; 975 op = 0;
967 break; 976 break;
968 } 977 }
969 978
970 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 979 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
971 break; 980 break;
972 981
973 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 982 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
974 SET_FLAG (op, FLAG_CURSED); 983 SET_FLAG (op, FLAG_CURSED);
975 984

Diff Legend

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