… | |
… | |
250 | "spell_cause_rabies", /* 204 */ |
250 | "spell_cause_rabies", /* 204 */ |
251 | "spell_glyph", /* 205 */ |
251 | "spell_glyph", /* 205 */ |
252 | NULL |
252 | NULL |
253 | }; |
253 | }; |
254 | |
254 | |
255 | extern int arch_init; |
255 | extern bool loading_arch; |
256 | |
256 | |
257 | /* This function checks the object after it has been loaded (when we |
257 | /* This function checks the object after it has been loaded (when we |
258 | * get the 'end' in the input stream). This function can be used to |
258 | * get the 'end' in the input stream). This function can be used to |
259 | * deal with legacy objects where fields may have changed. It can also be used |
259 | * deal with legacy objects where fields may have changed. It can also be used |
260 | * to check for objects to make sure there are no common errors. |
260 | * to check for objects to make sure there are no common errors. |
… | |
… | |
289 | /* only do these when program is first run - a bit |
289 | /* only do these when program is first run - a bit |
290 | * excessive to do this at every run - most of this is |
290 | * excessive to do this at every run - most of this is |
291 | * really just to catch any errors - program will still run, but |
291 | * really just to catch any errors - program will still run, but |
292 | * not in the ideal fashion. |
292 | * not in the ideal fashion. |
293 | */ |
293 | */ |
294 | if ((op->type == WEAPON || op->type == BOW) && arch_init) |
294 | if ((op->type == WEAPON || op->type == BOW) && loading_arch) |
295 | { |
295 | { |
296 | if (!op->skill) |
296 | if (!op->skill) |
297 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
297 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
298 | else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || |
298 | else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || |
299 | (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) |
299 | (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) |
… | |
… | |
340 | } |
340 | } |
341 | |
341 | |
342 | /* Old spellcasting object - need to load in the appropiate object */ |
342 | /* Old spellcasting object - need to load in the appropiate object */ |
343 | if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || |
343 | if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || |
344 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
344 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
345 | ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) |
345 | ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !loading_arch) |
346 | { |
346 | { |
347 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
347 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
348 | * in that spell was stored in sp. |
348 | * in that spell was stored in sp. |
349 | */ |
349 | */ |
350 | object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); |
350 | object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); |
351 | insert_ob_in_ob (tmp, op); |
351 | insert_ob_in_ob (tmp, op); |
352 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
352 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
353 | } |
353 | } |
354 | |
354 | |
355 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
355 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
356 | if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) |
356 | if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !loading_arch) |
357 | { |
357 | { |
358 | object *tmp = get_archetype_by_object_name (op->slaying); |
358 | object *tmp = get_archetype_by_object_name (op->slaying); |
359 | insert_ob_in_ob (tmp, op); |
359 | insert_ob_in_ob (tmp, op); |
360 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
360 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
361 | /* without this, value is all screwed up */ |
361 | /* without this, value is all screwed up */ |
… | |
… | |
418 | { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH }, |
418 | { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH }, |
419 | { "fly_low" , MOVE_FLY_LOW }, |
419 | { "fly_low" , MOVE_FLY_LOW }, |
420 | { "fly_high", MOVE_FLY_HIGH }, |
420 | { "fly_high", MOVE_FLY_HIGH }, |
421 | { "swim" , MOVE_SWIM }, |
421 | { "swim" , MOVE_SWIM }, |
422 | { "boat" , MOVE_BOAT }, |
422 | { "boat" , MOVE_BOAT }, |
|
|
423 | { "ship" , MOVE_SHIP }, |
423 | { "all" , MOVE_ALL }, |
424 | { "all" , MOVE_ALL }, |
424 | }; |
425 | }; |
425 | |
426 | |
426 | if (!str) |
427 | if (!str) |
427 | { |
428 | { |
… | |
… | |
473 | CLEAR_FLAG (op, flag) \ |
474 | CLEAR_FLAG (op, flag) \ |
474 | |
475 | |
475 | bool |
476 | bool |
476 | object::parse_kv (object_thawer &f) |
477 | object::parse_kv (object_thawer &f) |
477 | { |
478 | { |
478 | assert (f.kw == KW_object || f.kw == KW_arch); |
|
|
479 | |
|
|
480 | if (f.kw == KW_object) |
|
|
481 | f.get (name); // preset name from object name |
|
|
482 | |
|
|
483 | f.next (); |
|
|
484 | |
|
|
485 | object *op_inv = inv; |
479 | object *op_inv = inv; |
486 | |
480 | |
487 | for (;;) |
481 | for (;;) |
488 | { |
482 | { |
489 | switch (f.kw) |
483 | switch (f.kw) |
… | |
… | |
551 | } |
545 | } |
552 | } |
546 | } |
553 | continue; |
547 | continue; |
554 | |
548 | |
555 | case KW_other_arch: |
549 | case KW_other_arch: |
|
|
550 | other_arch = |
|
|
551 | loading_arch |
|
|
552 | ? archetype::get (f.get_str ()) |
556 | other_arch = archetype::find (f.get_str ()); |
553 | : archetype::find (f.get_str ()); |
|
|
554 | |
|
|
555 | if (!other_arch) |
|
|
556 | LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); |
557 | break; |
557 | break; |
558 | |
558 | |
559 | case KW_animation: |
559 | case KW_animation: |
560 | { |
560 | { |
561 | CLEAR_FLAG (this, FLAG_ANIMATE); |
561 | CLEAR_FLAG (this, FLAG_ANIMATE); |
… | |
… | |
908 | case KW_connected: |
908 | case KW_connected: |
909 | add_button_link (this, map, f.get_sint32 ()); |
909 | add_button_link (this, map, f.get_sint32 ()); |
910 | break; |
910 | break; |
911 | |
911 | |
912 | case KW_randomitems: |
912 | case KW_randomitems: |
913 | randomitems = find_treasurelist (f.get_str ()); |
913 | if (f.get_str ()) |
|
|
914 | { |
|
|
915 | randomitems = |
|
|
916 | loading_arch |
|
|
917 | ? treasurelist::get (f.get_str ()) |
|
|
918 | : treasurelist::find (f.get_str ()); |
|
|
919 | |
914 | //if (!randomitems) |
920 | if (!randomitems) |
915 | // LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); |
921 | LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); |
|
|
922 | } |
916 | break; |
923 | break; |
917 | |
924 | |
918 | case KW_msg: |
925 | case KW_msg: |
919 | f.get_ml (KW_endmsg, msg); |
926 | f.get_ml (KW_endmsg, msg); |
920 | //TODO: allow longer messages |
927 | //TODO: allow longer messages |
… | |
… | |
941 | break; |
948 | break; |
942 | |
949 | |
943 | case KW_end: |
950 | case KW_end: |
944 | check_loaded_object (this); |
951 | check_loaded_object (this); |
945 | |
952 | |
946 | if (!arch_init) |
953 | if (!loading_arch) |
947 | instantiate (); |
954 | instantiate (); |
948 | |
955 | |
949 | f.next (); |
956 | f.next (); |
950 | return true; |
957 | return true; |
951 | |
958 | |
… | |
… | |
977 | arch = archetype::find ("earthwall"); |
984 | arch = archetype::find ("earthwall"); |
978 | } |
985 | } |
979 | |
986 | |
980 | assert (arch); //D maybe use exception handling of sorts? |
987 | assert (arch); //D maybe use exception handling of sorts? |
981 | |
988 | |
|
|
989 | f.next (); |
|
|
990 | |
982 | object *op = object::create (); |
991 | object *op = object::create (); |
983 | |
992 | |
984 | op->map = map; |
993 | op->map = map; |
985 | op->arch = arch; |
|
|
986 | arch->clone.copy_to (op); |
994 | arch->clone.copy_to (op); |
987 | // copy_to activates, this should be fixed properly |
995 | // copy_to activates, this should be fixed properly |
988 | op->deactivate (); |
996 | op->deactivate (); |
989 | |
997 | |
990 | if (!op->parse_kv (f)) |
998 | if (!op->parse_kv (f)) |
991 | { |
999 | { |
992 | delete op; |
1000 | op->destroy (true); |
993 | return 0; |
1001 | return 0; |
994 | } |
1002 | } |
995 | |
1003 | |
996 | return op; |
1004 | return op; |
997 | } |
1005 | } |
… | |
… | |
1005 | int |
1013 | int |
1006 | set_variable (object *op, char *buf) |
1014 | set_variable (object *op, char *buf) |
1007 | { |
1015 | { |
1008 | object_thawer f (buf, (AV *)0); |
1016 | object_thawer f (buf, (AV *)0); |
1009 | |
1017 | |
1010 | f.kw = KW_arch; // special hack so that parse_kv skips |
1018 | f.next (); |
1011 | return op->parse_kv (f); |
1019 | return op->parse_kv (f); |
1012 | } |
1020 | } |
1013 | |
1021 | |
1014 | /* This returns a string of the integer movement type */ |
1022 | /* This returns a string of the integer movement type */ |
1015 | #if 0 |
1023 | #if 0 |
… | |
… | |
1387 | return true; |
1395 | return true; |
1388 | } |
1396 | } |
1389 | |
1397 | |
1390 | ///////////////////////////////////////////////////////////////////////////// |
1398 | ///////////////////////////////////////////////////////////////////////////// |
1391 | |
1399 | |
|
|
1400 | // generic resource file load, |
|
|
1401 | // currently supports: region, treasures, archetypes |
1392 | bool load_resource_file (const char *filename) |
1402 | bool load_resource_file (const char *filename) |
1393 | { |
1403 | { |
1394 | object_thawer f (filename); |
1404 | object_thawer f (filename); |
|
|
1405 | |
|
|
1406 | bool success = false; |
|
|
1407 | bool seen_arch = false; |
1395 | |
1408 | |
1396 | f.next (); |
1409 | f.next (); |
1397 | |
1410 | |
1398 | for (;;) |
1411 | for (;;) |
1399 | { |
1412 | { |
1400 | switch (f.kw) |
1413 | switch (f.kw) |
1401 | { |
1414 | { |
1402 | case KW_region: |
1415 | case KW_region: |
1403 | if (!region::read (f)) |
1416 | if (!region::read (f)) |
1404 | return false; |
1417 | goto finish; |
|
|
1418 | break; |
|
|
1419 | |
|
|
1420 | case KW_treasure: |
|
|
1421 | case KW_treasureone: |
|
|
1422 | if (!treasurelist::read (f)) |
|
|
1423 | goto finish; |
|
|
1424 | break; |
|
|
1425 | |
|
|
1426 | case KW_object: |
|
|
1427 | seen_arch = true; |
|
|
1428 | if (!archetype::read (f)) |
|
|
1429 | goto finish; |
1405 | break; |
1430 | break; |
1406 | |
1431 | |
1407 | case KW_EOF: |
1432 | case KW_EOF: |
1408 | return true; |
1433 | success = true; |
|
|
1434 | goto finish; |
1409 | |
1435 | |
1410 | default: |
1436 | default: |
1411 | if (!f.parse_error ("resource file")) |
1437 | if (!f.parse_error ("resource file")) |
1412 | return false; |
1438 | goto finish; |
1413 | } |
1439 | } |
1414 | |
|
|
1415 | f.next (); |
|
|
1416 | } |
1440 | } |
|
|
1441 | |
|
|
1442 | finish: |
|
|
1443 | if (seen_arch) |
|
|
1444 | init_archetype_pointers (); |
|
|
1445 | |
|
|
1446 | return success; |
1417 | } |
1447 | } |
1418 | |
1448 | |