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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.59 by root, Fri Feb 16 19:43:40 2007 UTC vs.
Revision 1.74 by root, Sat Apr 28 18:18:04 2007 UTC

… …
29#include <global.h> 29#include <global.h>
30#include <loader.h> 30#include <loader.h>
31#include <sproto.h> 31#include <sproto.h>
32 32
33///////////////////////////////////////////////////////////////////////////// 33/////////////////////////////////////////////////////////////////////////////
34
35/* Maps the MOVE_* values to names */
36static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
37 34
38/* This table is only necessary to convert objects that existed before the 35/* This table is only necessary to convert objects that existed before the
39 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
40 * to go through every mapping looking for every potion, rod, wand, etc 37 * to go through every mapping looking for every potion, rod, wand, etc
41 * that had a sp set and update to the new value. So this maps the 38 * that had a sp set and update to the new value. So this maps the
… …
253 "spell_cause_rabies", /* 204 */ 250 "spell_cause_rabies", /* 204 */
254 "spell_glyph", /* 205 */ 251 "spell_glyph", /* 205 */
255 NULL 252 NULL
256}; 253};
257 254
258extern int arch_init; 255extern bool loading_arch;
259 256
260/* 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
261 * 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
262 * 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
263 * 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.
… …
292 /* only do these when program is first run - a bit 289 /* only do these when program is first run - a bit
293 * excessive to do this at every run - most of this is 290 * excessive to do this at every run - most of this is
294 * really just to catch any errors - program will still run, but 291 * really just to catch any errors - program will still run, but
295 * not in the ideal fashion. 292 * not in the ideal fashion.
296 */ 293 */
297 if ((op->type == WEAPON || op->type == BOW) && arch_init) 294 if ((op->type == WEAPON || op->type == BOW) && loading_arch)
298 { 295 {
299 if (!op->skill) 296 if (!op->skill)
300 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 297 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
301 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) ||
302 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 299 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
… …
343 } 340 }
344 341
345 /* Old spellcasting object - need to load in the appropiate object */ 342 /* Old spellcasting object - need to load in the appropiate object */
346 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 ||
347 /* 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 */
348 ((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)
349 { 346 {
350 /* 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'
351 * in that spell was stored in sp. 348 * in that spell was stored in sp.
352 */ 349 */
353 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]);
354 insert_ob_in_ob (tmp, op); 351 insert_ob_in_ob (tmp, op);
355 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 */
356 } 353 }
357 354
358 /* 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 */
359 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)
360 { 357 {
361 object *tmp = get_archetype_by_object_name (op->slaying); 358 object *tmp = get_archetype_by_object_name (op->slaying);
362 insert_ob_in_ob (tmp, op); 359 insert_ob_in_ob (tmp, op);
363 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 */
364 /* without this, value is all screwed up */ 361 /* without this, value is all screwed up */
… …
409 } 406 }
410 407
411} 408}
412 409
413static void 410static void
414set_move (MoveType & mt, const char *str) 411set_move (MoveType &mt, const char *str)
415{ 412{
413 static const struct flagstr {
414 const char *name;
415 MoveType flags;
416 } move_flags[] = {
417 { "walk" , MOVE_WALK },
418 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
419 { "fly_low" , MOVE_FLY_LOW },
420 { "fly_high", MOVE_FLY_HIGH },
421 { "swim" , MOVE_SWIM },
422 { "boat" , MOVE_BOAT },
423 { "ship" , MOVE_SHIP },
424 { "all" , MOVE_ALL },
425 };
426
416 if (!str) 427 if (!str)
417 { 428 {
418 mt = 0; 429 mt = 0;
419 return; 430 return;
420 } 431 }
… …
427 438
428 mt = 0; 439 mt = 0;
429 440
430 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 441 for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
431 { 442 {
432 if (!strcasecmp (str, "all")) 443 bool negate = 0;
433 mt |= MOVE_ALL; 444
434 else 445 if (*str == '-')
435 { 446 {
436 int i, negate = 0; 447 negate = 1;
448 str++;
449 }
437 450
438 if (*str == '-') 451 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f)
452 {
453 if (!strcmp (f->name, str))
439 { 454 {
440 negate = 1;
441 str++;
442 }
443
444 for (i = 0; move_name[i]; i++)
445 {
446 if (!strcasecmp (move_name[i], str))
447 {
448 if (negate) 455 if (negate)
449 mt &= ~(1 << i); 456 mt &= ~f->flags;
450 else
451 mt |= (1 << i);
452
453 break;
454 }
455 }
456
457 if (!move_name[i])
458 {
459 /* fly is a special case - covers both fly_low and
460 * fly_high - since it doesn't match to a specific
461 * single bit, have to special case it.
462 */
463 if (!strcasecmp (str, "flying"))
464 {
465 if (negate)
466 mt &= ~MOVE_FLYING;
467 else
468 mt |= MOVE_FLYING;
469 }
470 else 457 else
471 LOG (llevDebug, "common/loader.l: set_move - unknown move string '%s'\n", str); 458 mt |= f->flags;
459
460 goto next;
472 } 461 }
473 } 462 }
463
464 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str);
465
466next: ;
474 } 467 }
475} 468}
476 469
477#define GET_FLAG(op,flag) \ 470#define GET_FLAG(op,flag) \
478 if (f.get_sint32 ()) \ 471 if (f.get_sint32 ()) \
… …
481 CLEAR_FLAG (op, flag) \ 474 CLEAR_FLAG (op, flag) \
482 475
483bool 476bool
484object::parse_kv (object_thawer &f) 477object::parse_kv (object_thawer &f)
485{ 478{
486 assert (f.kw == KW_object || f.kw == KW_arch);
487
488 if (f.kw == KW_object)
489 f.get (name); // preset name from object name
490
491 f.next ();
492
493 object *op_inv = inv; 479 object *op_inv = inv;
494 480
495 for (;;) 481 for (;;)
496 { 482 {
497 switch (f.kw) 483 switch (f.kw)
… …
559 } 545 }
560 } 546 }
561 continue; 547 continue;
562 548
563 case KW_other_arch: 549 case KW_other_arch:
550 other_arch =
551 loading_arch
552 ? archetype::get (f.get_str ())
564 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 ());
565 break; 557 break;
566 558
567 case KW_animation: 559 case KW_animation:
568 { 560 {
569 CLEAR_FLAG (this, FLAG_ANIMATE); 561 CLEAR_FLAG (this, FLAG_ANIMATE);
… …
595 move_slow |= MOVE_WALK; 587 move_slow |= MOVE_WALK;
596 f.get (move_slow_penalty); 588 f.get (move_slow_penalty);
597 break; 589 break;
598 590
599 case KW_face: 591 case KW_face:
600 face = &new_faces[FindFace (f.get_str (), 0)]; 592 face = face_find (f.get_str ());
601 break; 593 break;
602 594
603 case KW_x: f.get (x); break; 595 case KW_x: f.get (x); break;
604 case KW_y: f.get (y); break; 596 case KW_y: f.get (y); break;
605 597
… …
841 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break; 833 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
842 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break; 834 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
843 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 835 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
844 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 836 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
845 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 837 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
838 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
839 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
846 840
847 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 841 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
848 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 842 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
849 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 843 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
850 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 844 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
886 case KW_glow_radius: f.get (glow_radius); break; 880 case KW_glow_radius: f.get (glow_radius); break;
887 case KW_weapontype: f.get (weapontype); break; 881 case KW_weapontype: f.get (weapontype); break;
888 case KW_tooltype: f.get (tooltype); break; 882 case KW_tooltype: f.get (tooltype); break;
889 case KW_casting_time: f.get (casting_time); break; 883 case KW_casting_time: f.get (casting_time); break;
890 case KW_elevation: f.get (elevation); break; 884 case KW_elevation: f.get (elevation); break;
891 case KW_smoothlevel: f.get (smoothlevel); break; 885 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
892 case KW_client_type: f.get (client_type); break; 886 case KW_client_type: f.get (client_type); break;
893 case KW_duration: f.get (duration); break; 887 case KW_duration: f.get (duration); break;
894 case KW_range: f.get (range); break; 888 case KW_range: f.get (range); break;
895 case KW_range_modifier: f.get (range_modifier); break; 889 case KW_range_modifier: f.get (range_modifier); break;
896 case KW_dam_modifier: f.get (dam_modifier); break; 890 case KW_dam_modifier: f.get (dam_modifier); break;
… …
916 case KW_connected: 910 case KW_connected:
917 add_button_link (this, map, f.get_sint32 ()); 911 add_button_link (this, map, f.get_sint32 ());
918 break; 912 break;
919 913
920 case KW_randomitems: 914 case KW_randomitems:
921 randomitems = find_treasurelist (f.get_str ()); 915 if (f.get_str ())
916 {
917 randomitems =
918 loading_arch
919 ? treasurelist::get (f.get_str ())
920 : treasurelist::find (f.get_str ());
921
922 //if (!randomitems) 922 if (!randomitems)
923 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 923 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
924 }
924 break; 925 break;
925 926
926 case KW_msg: 927 case KW_msg:
927 f.get_ml (KW_endmsg, msg); 928 f.get_ml (KW_endmsg, msg);
928 //TODO: allow longer messages 929 //TODO: allow longer messages
… …
949 break; 950 break;
950 951
951 case KW_end: 952 case KW_end:
952 check_loaded_object (this); 953 check_loaded_object (this);
953 954
954 if (!arch_init) 955 if (!loading_arch)
955 instantiate (); 956 instantiate ();
956 957
957 f.next (); 958 f.next ();
958 return true; 959 return true;
959 960
… …
971 f.next (); 972 f.next ();
972 } 973 }
973} 974}
974 975
975object * 976object *
976object::read (object_thawer &f) 977object::read (object_thawer &f, maptile *map)
977{ 978{
978 assert (f.kw == KW_arch); 979 assert (f.kw == KW_arch);
979 980
980 archetype *arch = archetype::find (f.get_str ()); 981 archetype *arch = archetype::find (f.get_str ());
982
983 if (!arch)
984 {
985 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
986 arch = archetype::find ("earthwall");
987 }
988
981 assert (arch); //D maybe use exception handling of sorts? 989 assert (arch); //D maybe use exception handling of sorts?
982 990
991 f.next ();
992
983 object *op = object::create (); 993 object *op = object::create ();
984 994
985 op->arch = arch; 995 op->map = map;
986 arch->clone.copy_to (op); 996 arch->clone.copy_to (op);
987 // copy_to activates, this should be fixed properly 997 // copy_to activates, this should be fixed properly
988 op->deactivate (); 998 op->deactivate ();
989 999
990 if (!op->parse_kv (f)) 1000 if (!op->parse_kv (f))
991 { 1001 {
992 delete op; 1002 op->destroy (true);
993 return 0; 1003 return 0;
994 } 1004 }
995 1005
996 return op; 1006 return op;
997} 1007}
… …
1005int 1015int
1006set_variable (object *op, char *buf) 1016set_variable (object *op, char *buf)
1007{ 1017{
1008 object_thawer f (buf, (AV *)0); 1018 object_thawer f (buf, (AV *)0);
1009 1019
1020 f.next ();
1010 return op->parse_kv (f); 1021 return op->parse_kv (f);
1011} 1022}
1012 1023
1013/* This returns a string of the integer movement type */ 1024/* This returns a string of the integer movement type */
1014#if 0 1025#if 0
… …
1095 KW_monster, 1106 KW_monster,
1096 KW_friendly, 1107 KW_friendly,
1097 KW_generator, 1108 KW_generator,
1098 KW_is_thrown, 1109 KW_is_thrown,
1099 KW_auto_apply, 1110 KW_auto_apply,
1100 KW_NULL, // was KW_treasure 1111 KW_treasure_env,
1101 KW_player_sold, 1112 KW_player_sold,
1102 /* 20 */ 1113 /* 20 */
1103 KW_see_invisible, 1114 KW_see_invisible,
1104 KW_can_roll, 1115 KW_can_roll,
1105 KW_overlay_floor, 1116 KW_overlay_floor,
… …
1166 KW_can_use_skill, 1177 KW_can_use_skill,
1167 KW_been_applied, 1178 KW_been_applied,
1168 /* 80 */ 1179 /* 80 */
1169 KW_has_ready_scroll, 1180 KW_has_ready_scroll,
1170 KW_can_use_rod, 1181 KW_can_use_rod,
1171 KW_NULL, 1182 KW_precious,
1172 KW_can_use_horn, 1183 KW_can_use_horn,
1173 KW_make_invisible, 1184 KW_make_invisible,
1174 KW_inv_locked, 1185 KW_inv_locked,
1175 KW_is_wooded, 1186 KW_is_wooded,
1176 KW_is_hilly, 1187 KW_is_hilly,
… …
1242 f.put (KW_msg, KW_endmsg, op->msg); 1253 f.put (KW_msg, KW_endmsg, op->msg);
1243 if (op->lore != tmp->lore) 1254 if (op->lore != tmp->lore)
1244 f.put (KW_lore, KW_endlore, op->lore); 1255 f.put (KW_lore, KW_endlore, op->lore);
1245 1256
1246 CMP_OUT (other_arch); 1257 CMP_OUT (other_arch);
1247 CMP_OUT (face); 1258
1259 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
1248 1260
1249 if (op->animation_id != tmp->animation_id) 1261 if (op->animation_id != tmp->animation_id)
1250 if (op->animation_id) 1262 if (op->animation_id)
1251 { 1263 {
1252 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1264 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
… …
1385 return true; 1397 return true;
1386} 1398}
1387 1399
1388///////////////////////////////////////////////////////////////////////////// 1400/////////////////////////////////////////////////////////////////////////////
1389 1401
1402// generic resource file load,
1403// currently supports: region, treasures, archetypes
1390bool load_resource_file (const char *filename) 1404bool load_resource_file (const char *filename)
1391{ 1405{
1392 object_thawer f (filename); 1406 object_thawer f (filename);
1407
1408 bool success = false;
1409 bool seen_arch = false;
1393 1410
1394 f.next (); 1411 f.next ();
1395 1412
1396 for (;;) 1413 for (;;)
1397 { 1414 {
1398 switch (f.kw) 1415 switch (f.kw)
1399 { 1416 {
1400 case KW_region: 1417 case KW_region:
1401 if (!region::read (f)) 1418 if (!region::read (f))
1402 return false; 1419 goto finish;
1420 break;
1421
1422 case KW_treasure:
1423 case KW_treasureone:
1424 if (!treasurelist::read (f))
1425 goto finish;
1426 break;
1427
1428 case KW_object:
1429 seen_arch = true;
1430 if (!archetype::read (f))
1431 goto finish;
1403 break; 1432 break;
1404 1433
1405 case KW_EOF: 1434 case KW_EOF:
1406 return true; 1435 success = true;
1436 goto finish;
1407 1437
1408 default: 1438 default:
1409 if (!f.parse_error ("resource file")) 1439 if (!f.parse_error ("resource file"))
1410 return false; 1440 goto finish;
1441
1442 f.next ();
1443 break;
1411 } 1444 }
1412
1413 f.next ();
1414 } 1445 }
1446
1447finish:
1448 if (seen_arch)
1449 init_archetype_pointers ();
1450
1451 return success;
1415} 1452}
1416 1453

Diff Legend

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