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.50 by root, Thu Apr 19 16:23:46 2007 UTC vs.
Revision 1.73 by root, Sun Apr 20 05:24:55 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your 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 GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/* TREASURE_DEBUG does some checking on the treasurelists after loading. 24/* TREASURE_DEBUG does some checking on the treasurelists after loading.
26 * It is useful for finding bugs in the treasures file. Since it only 25 * It is useful for finding bugs in the treasures file. Since it only
27 * slows the startup some (and not actual game play), it is by default 26 * slows the startup some (and not actual game play), it is by default
… …
140 139
141 f.next (); 140 f.next ();
142 141
143 for (;;) 142 for (;;)
144 { 143 {
145 coroapi::cede_to_tick_every (10); 144 coroapi::cede_to_tick ();
146 145
147 switch (f.kw) 146 switch (f.kw)
148 { 147 {
149 case KW_arch: 148 case KW_arch:
150 t->item = archetype::get (f.get_str ()); 149 t->item = archetype::find (f.get_str ());
150
151 if (!t->item)
152 {
153 f.parse_warn ("treasure references unknown archetype");
154 t->item = archetype::empty;
155 }
156
151 break; 157 break;
152 158
153 case KW_list: f.get (t->name); break; 159 case KW_list: f.get (t->name); break;
154 case KW_change_name: f.get (t->change_arch.name); break; 160 case KW_change_name: f.get (t->change_arch.name); break;
155 case KW_change_title: f.get (t->change_arch.title); break; 161 case KW_change_title: f.get (t->change_arch.title); break;
… …
169 t->next = read_treasure (f); 175 t->next = read_treasure (f);
170 return t; 176 return t;
171 177
172 default: 178 default:
173 if (!f.parse_error ("treasurelist", t->name)) 179 if (!f.parse_error ("treasurelist", t->name))
174 return 0; 180 goto error;
175 181
176 return t; 182 return t;
177 } 183 }
178 184
179 f.next (); 185 f.next ();
180 } 186 }
187
188 // not reached
189
190error:
191 delete t;
192 return 0;
181} 193}
182 194
183/* 195/*
184 * Each treasure is parsed with the help of load_treasure(). 196 * Each treasure is parsed with the help of load_treasure().
185 */ 197 */
… …
197 209
198 /* This is a one of the many items on the list should be generated. 210 /* This is a one of the many items on the list should be generated.
199 * Add up the chance total, and check to make sure the yes & no 211 * Add up the chance total, and check to make sure the yes & no
200 * fields of the treasures are not being used. 212 * fields of the treasures are not being used.
201 */ 213 */
202 tl->total_chance = 0;
203
204 if (one) 214 if (one)
205 { 215 {
206 for (treasure *t = tl->items; t; t = t->next) 216 for (treasure *t = tl->items; t; t = t->next)
207 { 217 {
208 if (t->next_yes || t->next_no) 218 if (t->next_yes || t->next_no)
209 { 219 {
210 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->name : &t->name); 220 LOG (llevError, "Treasure %s is one item, but on treasure %s\n", &tl->name, t->item ? &t->item->archname : &t->name);
211 LOG (llevError, " the next_yes or next_no field is set\n"); 221 LOG (llevError, " the next_yes or next_no field is set\n");
212 } 222 }
213 223
214 tl->total_chance += t->chance; 224 tl->total_chance += t->chance;
215 } 225 }
… …
230 * start with equipment, but only their abilities). 240 * start with equipment, but only their abilities).
231 */ 241 */
232static void 242static void
233put_treasure (object *op, object *creator, int flags) 243put_treasure (object *op, object *creator, int flags)
234{ 244{
235 object *tmp; 245 if (flags & GT_ENVIRONMENT)
236 246 {
237 /* Bit of a hack - spells should never be put onto the map. The entire 247 /* Bit of a hack - spells should never be put onto the map. The entire
238 * treasure stuff is a problem - there is no clear idea of knowing 248 * treasure stuff is a problem - there is no clear idea of knowing
239 * this is the original object, or if this is an object that should be created 249 * this is the original object, or if this is an object that should be created
240 * by another object. 250 * by another object.
241 */ 251 */
242 if (flags & GT_ENVIRONMENT && op->type != SPELL) 252 //TODO: flag such as objects... as such (no drop, anybody?)
243 { 253 if (op->type == SPELL)
254 {
255 op->destroy ();
256 return;
257 }
258
259 op->expand_tail ();
260
261 if (op->blocked (creator->map, creator->x, creator->y))
262 op->destroy ();
263 else
264 {
244 SET_FLAG (op, FLAG_OBJ_ORIGINAL); 265 SET_FLAG (op, FLAG_OBJ_ORIGINAL);
245 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON); 266 op->insert_at (creator, creator, INS_NO_MERGE | INS_NO_WALK_ON);
267 }
246 } 268 }
247 else 269 else
248 { 270 {
249 op = creator->insert (op); 271 op = creator->insert (op);
250 272
251 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER)) 273 if ((flags & GT_APPLY) && QUERY_FLAG (creator, FLAG_MONSTER))
252 monster_check_apply (creator, op); 274 monster_check_apply (creator, op);
253 275
254 if ((flags & GT_UPDATE_INV) && (tmp = creator->in_player ())) 276 if (flags & GT_UPDATE_INV)
277 if (object *tmp = creator->in_player ())
255 esrv_send_item (tmp, op); 278 esrv_send_item (tmp, op);
256 } 279 }
257} 280}
258 281
259/* if there are change_xxx commands in the treasure, we include the changes 282/* if there are change_xxx commands in the treasure, we include the changes
260 * in the generated object 283 * in the generated object
… …
289 else 312 else
290 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name); 313 LOG (llevError, "create_all_treasures: undefined reference to treasurelist '%s'.\n", &t->name);
291 } 314 }
292 else 315 else
293 { 316 {
294 if (t->item && (t->item->clone.invisible != 0 || !(flag & GT_INVISIBLE))) 317 if (t->item && (t->item->invisible != 0 || !(flag & GT_INVISIBLE)))
295 { 318 {
296 object *tmp = arch_to_object (t->item); 319 object *tmp = arch_to_object (t->item);
297 320
298 if (t->nrof && tmp->nrof <= 1) 321 if (t->nrof && tmp->nrof <= 1)
299 tmp->nrof = rndm (t->nrof) + 1; 322 tmp->nrof = rndm (t->nrof) + 1;
… …
346 create_treasure (tl, op, flag, difficulty, tries); 369 create_treasure (tl, op, flag, difficulty, tries);
347 } 370 }
348 else if (t->nrof) 371 else if (t->nrof)
349 create_one_treasure (tl, op, flag, difficulty, tries); 372 create_one_treasure (tl, op, flag, difficulty, tries);
350 } 373 }
351 else if (t->item && (t->item->clone.invisible != 0 || flag != GT_INVISIBLE)) 374 else if (t->item && (t->item->invisible != 0 || flag != GT_INVISIBLE))
352 { 375 {
353 if (object *tmp = arch_to_object (t->item)) 376 if (object *tmp = arch_to_object (t->item))
354 { 377 {
355 if (t->nrof && tmp->nrof <= 1) 378 if (t->nrof && tmp->nrof <= 1)
356 tmp->nrof = rndm (t->nrof) + 1; 379 tmp->nrof = rndm (t->nrof) + 1;
… …
358 fix_generated_item (tmp, op, difficulty, t->magic, flag); 381 fix_generated_item (tmp, op, difficulty, t->magic, flag);
359 change_treasure (t, tmp); 382 change_treasure (t, tmp);
360 put_treasure (tmp, op, flag); 383 put_treasure (tmp, op, flag);
361 } 384 }
362 } 385 }
386}
387
388void
389object::create_treasure (treasurelist *tl, int flags)
390{
391 ::create_treasure (tl, this, flags, map ? map->difficulty : 0);
363} 392}
364 393
365/* This calls the appropriate treasure creation function. tries is passed 394/* This calls the appropriate treasure creation function. tries is passed
366 * to determine how many list transitions or attempts to create treasure 395 * to determine how many list transitions or attempts to create treasure
367 * have been made. It is really in place to prevent infinite loops with 396 * have been made. It is really in place to prevent infinite loops with
… …
378 407
379 if (tries++ > 100) 408 if (tries++ > 100)
380 { 409 {
381 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n"); 410 LOG (llevDebug, "createtreasure: tries exceeded 100, returning without making treasure\n");
382 return; 411 return;
412 }
413
414 if (op->flag [FLAG_TREASURE_ENV])
415 {
416 // do not generate items when there already is something above the object
417 if (op->flag [FLAG_IS_FLOOR] && op->above)
418 return;
419
420 flag |= GT_ENVIRONMENT;
383 } 421 }
384 422
385 if (tl->total_chance) 423 if (tl->total_chance)
386 create_one_treasure (tl, op, flag, difficulty, tries); 424 create_one_treasure (tl, op, flag, difficulty, tries);
387 else 425 else
… …
464 * Removed multiplicator, too many high-level items were generated on low-difficulty maps. 502 * Removed multiplicator, too many high-level items were generated on low-difficulty maps.
465 */ 503 */
466int 504int
467level_for_item (const object *op, int difficulty) 505level_for_item (const object *op, int difficulty)
468{ 506{
469 int olevel = 0;
470
471 if (!op->inv) 507 if (!op->inv)
472 { 508 {
473 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name); 509 LOG (llevError, "level_for_item: Object %s has no inventory!\n", &op->name);
474 return 0; 510 return 0;
475 } 511 }
476 512
477 olevel = (int) (op->inv->level + (double) difficulty * (1 - drand48 () * drand48 () * 2)); 513 int olevel = op->inv->level + int (difficulty * (1. - rndm () * rndm () * 2.));
478 514
479 if (olevel <= 0) 515 if (olevel <= 0)
480 olevel = rndm (1, MIN (op->inv->level, 1)); 516 olevel = rndm (1, op->inv->level);
481 517
482 if (olevel > MAXLEVEL) 518 return min (olevel, MAXLEVEL);
483 olevel = MAXLEVEL;
484
485 return olevel;
486} 519}
487 520
488/* 521/*
489 * Based upon the specified difficulty and upon the difftomagic_list array, 522 * Based upon the specified difficulty and upon the difftomagic_list array,
490 * a random magical bonus is returned. This is used when determine 523 * a random magical bonus is returned. This is used when determine
… …
546 579
547 op->magic = magic; 580 op->magic = magic;
548 if (op->arch) 581 if (op->arch)
549 { 582 {
550 if (op->type == ARMOUR) 583 if (op->type == ARMOUR)
551 ARMOUR_SPEED (op) = (ARMOUR_SPEED (&op->arch->clone) * (100 + magic * 10)) / 100; 584 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op->arch) * (100 + magic * 10)) / 100;
552 585
553 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */ 586 if (magic < 0 && !(rndm (3))) /* You can't just check the weight always */
554 magic = (-magic); 587 magic = (-magic);
555 op->weight = (op->arch->clone.weight * (100 - magic * 10)) / 100; 588 op->weight = (op->arch->weight * (100 - magic * 10)) / 100;
556 } 589 }
557 else 590 else
558 { 591 {
559 if (op->type == ARMOUR) 592 if (op->type == ARMOUR)
560 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100; 593 ARMOUR_SPEED (op) = (ARMOUR_SPEED (op) * (100 + magic * 10)) / 100;
… …
622 case 2: 655 case 2:
623 case 3: 656 case 3:
624 case 4: 657 case 4:
625 case 5: 658 case 5:
626 case 6: 659 case 6:
627 set_attr_value (&op->stats, r, (signed char) (bonus + get_attr_value (&op->stats, r))); 660 op->stats.stat (r) += bonus;
628 break; 661 break;
629 662
630 case 7: 663 case 7:
631 op->stats.dam += bonus; 664 op->stats.dam += bonus;
632 break; 665 break;
… …
796 ARG_INT (flags))) 829 ARG_INT (flags)))
797 return; 830 return;
798 831
799 if (!(flags & GT_MINIMAL)) 832 if (!(flags & GT_MINIMAL))
800 { 833 {
801 if (op->arch == crown_arch) 834 if (IS_ARCH (op->arch, crown))
802 { 835 {
803 set_magic (difficulty, op, max_magic, flags); 836 set_magic (difficulty, op, max_magic, flags);
804 num_enchantments = calc_item_power (op, 1); 837 num_enchantments = calc_item_power (op, 1);
805 generate_artifact (op, difficulty); 838 generate_artifact (op, difficulty);
806 } 839 }
… …
811 844
812 num_enchantments = calc_item_power (op, 1); 845 num_enchantments = calc_item_power (op, 1);
813 846
814 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT)) 847 if ((!was_magic && !rndm (CHANCE_FOR_ARTIFACT))
815 || op->type == HORN 848 || op->type == HORN
816 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, 849 || difficulty >= settings.max_level) /* high difficulties always generate an artifact, used for shop_floors or treasures */
817 * used for shop_floors or treasures */
818 generate_artifact (op, difficulty); 850 generate_artifact (op, difficulty);
819 } 851 }
820 852
821 /* Object was made an artifact. Calculate its item_power rating. 853 /* Object was made an artifact. Calculate its item_power rating.
822 * the item_power in the object is what the artfiact adds. 854 * the item_power in the object is what the artfiact adds.
… …
864 { 896 {
865 if (op->type == POTION) 897 if (op->type == POTION)
866 /* Handle healing and magic power potions */ 898 /* Handle healing and magic power potions */
867 if (op->stats.sp && !op->randomitems) 899 if (op->stats.sp && !op->randomitems)
868 { 900 {
869 object *tmp;
870
871 tmp = get_archetype (spell_mapping[op->stats.sp]); 901 object *tmp = get_archetype (spell_mapping [op->stats.sp]);
872 insert_ob_in_ob (tmp, op); 902 insert_ob_in_ob (tmp, op);
873 op->stats.sp = 0; 903 op->stats.sp = 0;
874 } 904 }
875 } 905 }
876 else if (!op->title) /* Only modify object if not special */ 906 else if (!op->title) /* Only modify object if not special */
… …
934 SET_FLAG (op, FLAG_CURSED); 964 SET_FLAG (op, FLAG_CURSED);
935 break; 965 break;
936 } 966 }
937 967
938 case AMULET: 968 case AMULET:
939 if (op->arch == amulet_arch) 969 if (IS_ARCH (op->arch, amulet))
940 op->value *= 5; /* Since it's not just decoration */ 970 op->value *= 5; /* Since it's not just decoration */
941 971
942 case RING: 972 case RING:
943 if (op->arch == NULL) 973 if (!op->arch) // wtf? schmorp
944 { 974 {
945 op->destroy (); 975 op->destroy ();
946 op = 0; 976 op = 0;
947 break; 977 break;
948 } 978 }
949 979
950 if (op->arch != ring_arch && op->arch != amulet_arch) /* It's a special artifact! */ 980 if (!IS_ARCH (op->arch, ring) && !IS_ARCH (op->arch, amulet)) /* It's a special artifact! */
951 break; 981 break;
952 982
953 if (!(flags & GT_ONLY_GOOD) && !(rndm (3))) 983 if (!(flags & GT_ONLY_GOOD) && !(rndm (3)))
954 SET_FLAG (op, FLAG_CURSED); 984 SET_FLAG (op, FLAG_CURSED);
955 985
… …
1108 * Allocate and return the pointer to an empty artifactlist structure. 1138 * Allocate and return the pointer to an empty artifactlist structure.
1109 */ 1139 */
1110static artifactlist * 1140static artifactlist *
1111get_empty_artifactlist (void) 1141get_empty_artifactlist (void)
1112{ 1142{
1113 return salloc0 <artifactlist> (); 1143 return salloc0<artifactlist> ();
1114} 1144}
1115 1145
1116/* 1146/*
1117 * Allocate and return the pointer to an empty artifact structure. 1147 * Allocate and return the pointer to an empty artifact structure.
1118 */ 1148 */
1119static artifact * 1149static artifact *
1120get_empty_artifact (void) 1150get_empty_artifact (void)
1121{ 1151{
1122 return salloc0 <artifact> (); 1152 return salloc0<artifact> ();
1123} 1153}
1124 1154
1125/* 1155/*
1126 * Searches the artifact lists and returns one that has the same type 1156 * Searches the artifact lists and returns one that has the same type
1127 * of objects on it. 1157 * of objects on it.
… …
1132 for (artifactlist *al = first_artifactlist; al; al = al->next) 1162 for (artifactlist *al = first_artifactlist; al; al = al->next)
1133 if (al->type == type) 1163 if (al->type == type)
1134 return al; 1164 return al;
1135 1165
1136 return 0; 1166 return 0;
1137}
1138
1139/*
1140 * For debugging purposes. Dumps all tables.
1141 */
1142void
1143dump_artifacts (void)
1144{
1145 artifactlist *al;
1146 artifact *art;
1147 linked_char *next;
1148
1149 fprintf (logfile, "\n");
1150 for (al = first_artifactlist; al != NULL; al = al->next)
1151 {
1152 fprintf (logfile, "Artifact has type %d, total_chance=%d\n", al->type, al->total_chance);
1153 for (art = al->items; art != NULL; art = art->next)
1154 {
1155 fprintf (logfile, "Artifact %-30s Difficulty %3d Chance %5d\n", &art->item->name, art->difficulty, art->chance);
1156 if (art->allowed != NULL)
1157 {
1158 fprintf (logfile, "\tallowed combinations:");
1159 for (next = art->allowed; next != NULL; next = next->next)
1160 fprintf (logfile, "%s,", &next->name);
1161 fprintf (logfile, "\n");
1162 }
1163 }
1164 }
1165 fprintf (logfile, "\n");
1166}
1167
1168/*
1169 * For debugging purposes. Dumps all treasures recursively (see below).
1170 */
1171void
1172dump_monster_treasure_rec (const char *name, treasure *t, int depth)
1173{
1174 treasurelist *tl;
1175 int i;
1176
1177 if (depth > 100)
1178 return;
1179
1180 while (t)
1181 {
1182 if (t->name)
1183 {
1184 for (i = 0; i < depth; i++)
1185 fprintf (logfile, " ");
1186
1187 fprintf (logfile, "{ (list: %s)\n", &t->name);
1188
1189 tl = treasurelist::find (t->name);
1190 if (tl)
1191 dump_monster_treasure_rec (name, tl->items, depth + 2);
1192
1193 for (i = 0; i < depth; i++)
1194 fprintf (logfile, " ");
1195
1196 fprintf (logfile, "} (end of list: %s)\n", &t->name);
1197 }
1198 else
1199 {
1200 for (i = 0; i < depth; i++)
1201 fprintf (logfile, " ");
1202
1203 if (t->item && t->item->clone.type == FLESH)
1204 fprintf (logfile, "%s's %s\n", name, &t->item->clone.name);
1205 else
1206 fprintf (logfile, "%s\n", &t->item->clone.name);
1207 }
1208
1209 if (t->next_yes)
1210 {
1211 for (i = 0; i < depth; i++)
1212 fprintf (logfile, " ");
1213
1214 fprintf (logfile, " (if yes)\n");
1215 dump_monster_treasure_rec (name, t->next_yes, depth + 1);
1216 }
1217
1218 if (t->next_no)
1219 {
1220 for (i = 0; i < depth; i++)
1221 fprintf (logfile, " ");
1222
1223 fprintf (logfile, " (if no)\n");
1224 dump_monster_treasure_rec (name, t->next_no, depth + 1);
1225 }
1226
1227 t = t->next;
1228 }
1229}
1230
1231/*
1232 * For debugging purposes. Dumps all treasures for a given monster.
1233 * Created originally by Raphael Quinet for debugging the alchemy code.
1234 */
1235void
1236dump_monster_treasure (const char *name)
1237{
1238 archetype *at;
1239 int found;
1240
1241 found = 0;
1242 fprintf (logfile, "\n");
1243
1244 for (at = first_archetype; at != NULL; at = at->next)
1245 if (!strcasecmp (at->clone.name, name) && at->clone.title == NULL)
1246 {
1247 fprintf (logfile, "treasures for %s (arch: %s)\n", &at->clone.name, &at->name);
1248 if (at->clone.randomitems != NULL)
1249 dump_monster_treasure_rec (at->clone.name, at->clone.randomitems->items, 1);
1250 else
1251 fprintf (logfile, "(nothing)\n");
1252
1253 fprintf (logfile, "\n");
1254 found++;
1255 }
1256
1257 if (found == 0)
1258 fprintf (logfile, "No objects have the name %s!\n\n", name);
1259} 1167}
1260 1168
1261/* 1169/*
1262 * Builds up the lists of artifacts from the file in the libdir. 1170 * Builds up the lists of artifacts from the file in the libdir.
1263 */ 1171 */
… …
1277 sprintf (filename, "%s/artifacts", settings.datadir); 1185 sprintf (filename, "%s/artifacts", settings.datadir);
1278 object_thawer f (filename); 1186 object_thawer f (filename);
1279 1187
1280 if (!f) 1188 if (!f)
1281 return; 1189 return;
1282
1283 f.next ();
1284 1190
1285 for (;;) 1191 for (;;)
1286 { 1192 {
1287 switch (f.kw) 1193 switch (f.kw)
1288 { 1194 {
… …
1392#endif 1298#endif
1393 op->face = change->face; 1299 op->face = change->face;
1394 } 1300 }
1395 1301
1396 for (i = 0; i < NUM_STATS; i++) 1302 for (i = 0; i < NUM_STATS; i++)
1397 change_attr_value (&(op->stats), i, get_attr_value (&(change->stats), i)); 1303 change_attr_value (&(op->stats), i, change->stats.stat (i));
1398 1304
1399 op->attacktype |= change->attacktype; 1305 op->attacktype |= change->attacktype;
1400 op->path_attuned |= change->path_attuned; 1306 op->path_attuned |= change->path_attuned;
1401 op->path_repelled |= change->path_repelled; 1307 op->path_repelled |= change->path_repelled;
1402 op->path_denied |= change->path_denied; 1308 op->path_denied |= change->path_denied;
… …
1566 if (change->msg) 1472 if (change->msg)
1567 op->msg = change->msg; 1473 op->msg = change->msg;
1568} 1474}
1569 1475
1570static int 1476static int
1571legal_artifact_combination (object *op, artifact * art) 1477legal_artifact_combination (object *op, artifact *art)
1572{ 1478{
1573 int neg, success = 0; 1479 int neg, success = 0;
1574 linked_char *tmp; 1480 linked_char *tmp;
1575 const char *name; 1481 const char *name;
1576 1482
1577 if (art->allowed == (linked_char *) NULL) 1483 if (!art->allowed)
1578 return 1; /* Ie, "all" */ 1484 return 1; /* Ie, "all" */
1485
1579 for (tmp = art->allowed; tmp; tmp = tmp->next) 1486 for (tmp = art->allowed; tmp; tmp = tmp->next)
1580 { 1487 {
1581#ifdef TREASURE_VERBOSE 1488#ifdef TREASURE_VERBOSE
1582 LOG (llevDebug, "legal_art: %s\n", &tmp->name); 1489 LOG (llevDebug, "legal_art: %s\n", &tmp->name);
1583#endif 1490#endif
… …
1585 name = tmp->name + 1, neg = 1; 1492 name = tmp->name + 1, neg = 1;
1586 else 1493 else
1587 name = tmp->name, neg = 0; 1494 name = tmp->name, neg = 0;
1588 1495
1589 /* If we match name, then return the opposite of 'neg' */ 1496 /* If we match name, then return the opposite of 'neg' */
1590 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->name))) 1497 if (!strcmp (name, op->name) || (op->arch && !strcmp (name, op->arch->archname)))
1591 return !neg; 1498 return !neg;
1592 1499
1593 /* Set success as true, since if the match was an inverse, it means 1500 /* Set success as true, since if the match was an inverse, it means
1594 * everything is allowed except what we match 1501 * everything is allowed except what we match
1595 */ 1502 */
1596 else if (neg) 1503 else if (neg)
1597 success = 1; 1504 success = 1;
1598 } 1505 }
1506
1599 return success; 1507 return success;
1600} 1508}
1601 1509
1602/* 1510/*
1603 * Fixes the given object, giving it the abilities and titles 1511 * Fixes the given object, giving it the abilities and titles

Diff Legend

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