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.52 by root, Thu Feb 1 19:15:38 2007 UTC vs.
Revision 1.58 by root, Thu Feb 15 21:07:48 2007 UTC

… …
27 variable. */ 27 variable. */
28 28
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
33/////////////////////////////////////////////////////////////////////////////
34
35// the base class warns about and skips everything
36archetype *
37loader_base::get_arch (const char *name)
38{
39 LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of this type.\n",
40 filename, name);
41
42 return new archetype;
43}
44
45object *
46loader_base::get_object (const char *name)
47{
48 LOG (llevError, "%s: found object definition '%s', which is not allowed in files of this type.\n",
49 filename, name);
50
51 return object::create ();
52}
53
54player *
55loader_base::get_player ()
56{
57 LOG (llevError, "%s: found player definition, which is not allowed in files of this type.\n",
58 filename);
59
60 return player::create ();
61}
62
63region *
64loader_base::get_region (const char *name)
65{
66 LOG (llevError, "%s: found region definition '%s', which is not allowed in files of this type.\n",
67 filename, name);
68
69 return new region;
70}
71
72facetile *
73loader_base::get_face (const char *name)
74{
75 LOG (llevError, "%s: found face definition '%s', which is not allowed in files of this type.\n",
76 filename, name);
77
78 return new facetile;
79}
80
81treasurelist *
82loader_base::get_treasure (const char *name, bool one)
83{
84 LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of this type.\n",
85 filename, name);
86
87 return new treasurelist;//D
88}
89
90animation *
91loader_base::get_animation (const char *name)
92{
93 LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of this type.\n",
94 filename, name);
95
96 return new animation;
97}
98
99void
100loader_base::put_arch (archetype *arch)
101{
102 delete arch;
103}
104
105void
106loader_base::put_object (object *op)
107{
108 op->destroy ();
109}
110
111void
112loader_base::put_player (player *pl)
113{
114 delete pl;
115}
116
117void
118loader_base::put_region (region *region)
119{
120 delete region;
121}
122
123void
124loader_base::put_face (facetile *face)
125{
126 delete face;
127}
128
129void
130loader_base::put_treasure (treasurelist *treasure)
131{
132 delete treasure;
133}
134
135void
136loader_base::put_animation (animation *anim)
137{
138 delete anim;
139}
140
141/////////////////////////////////////////////////////////////////////////////
142
143bool loader_base::parse (object_thawer &thawer)
144{
145 for (;;)
146 {
147 keyword kw = thawer.get_kv ();
148
149 switch (kw)
150 {
151 case KW_region:
152 {
153 region *rgn = get_region (thawer.get_str ());
154
155 if (!parse_region (thawer, rgn))
156 {
157 delete rgn;
158 return false;
159 }
160
161 put_region (rgn);
162 }
163 break;
164
165 case KW_EOF:
166 return true;
167
168 default:
169 if (!thawer.parse_error (kw, "resource file"))
170 return false;
171 }
172 }
173}
174
175bool loader_base::load (const char *filename)
176{
177 this->filename = filename;
178
179 object_thawer fp (filename);
180
181 if (!fp)
182 return false;
183
184 return parse (fp);
185}
186 32
187///////////////////////////////////////////////////////////////////////////// 33/////////////////////////////////////////////////////////////////////////////
188 34
189/* Maps the MOVE_* values to names */ 35/* Maps the MOVE_* values to names */
190static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 36static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
… …
417 * to check for objects to make sure there are no common errors. 263 * to check for objects to make sure there are no common errors.
418 */ 264 */
419static void 265static void
420check_loaded_object (object *op) 266check_loaded_object (object *op)
421{ 267{
422 int ip;
423
424 /* We do some specialised handling to handle legacy cases of name_pl. 268 /* We do some specialised handling to handle legacy cases of name_pl.
425 * If the object doesn't have a name_pl, we just use the object name - 269 * If the object doesn't have a name_pl, we just use the object name -
426 * this isn't perfect (things won't be properly pluralised), but works to 270 * this isn't perfect (things won't be properly pluralised), but works to
427 * that degree (5 heart is still quite understandable). But the case we 271 * that degree (5 heart is still quite understandable). But the case we
428 * also have to catch is if this object is not using the normal name for 272 * also have to catch is if this object is not using the normal name for
429 * the object. In that case, we also want to use the loaded name. 273 * the object. In that case, we also want to use the loaded name.
430 * Otherwise, what happens is that the the plural name will lose 274 * Otherwise, what happens is that the the plural name will lose
431 * information (appear as just 'hearts' and not 'goblins heart') 275 * information (appear as just 'hearts' and not 'goblins heart')
432 */ 276 */
433 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) 277 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl)
434 op->name_pl = NULL; 278 op->name_pl = 0;
435 279
436 if (!op->name_pl) 280 if (!op->name_pl)
437 op->name_pl = op->name; 281 op->name_pl = op->name;
438 282
439 /* objects now have a materialname. try to patch it in */ 283 /* objects now have a materialname. try to patch it in */
… …
442 if (op->map != NULL) 286 if (op->map != NULL)
443 set_materialname (op, op->map->difficulty, NULL); 287 set_materialname (op, op->map->difficulty, NULL);
444 else 288 else
445 set_materialname (op, 5, NULL); 289 set_materialname (op, 5, NULL);
446 } 290 }
291
447 /* only do these when program is first run - a bit 292 /* only do these when program is first run - a bit
448 * excessive to do this at every run - most of this is 293 * excessive to do this at every run - most of this is
449 * really just to catch any errors - program will still run, but 294 * really just to catch any errors - program will still run, but
450 * not in the ideal fashion. 295 * not in the ideal fashion.
451 */ 296 */
452 if ((op->type == WEAPON || op->type == BOW) && arch_init) 297 if ((op->type == WEAPON || op->type == BOW) && arch_init)
453 { 298 {
454 if (!op->skill) 299 if (!op->skill)
455 {
456 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 300 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
457 }
458 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || 301 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) ||
459 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 302 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
460 {
461 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); 303 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill);
462 }
463 } 304 }
464 305
465 /* We changed last_heal to gen_sp_armour, which is what it 306 /* We changed last_heal to gen_sp_armour, which is what it
466 * really does for many objects. Need to catch any in maps 307 * really does for many objects. Need to catch any in maps
467 * that may have an old value. 308 * that may have an old value.
468 */ 309 */
469 if ((op->type == WEAPON) || 310 if (op->type == WEAPON
470 (op->type == ARMOUR) || (op->type == HELMET) || 311 || op->type == ARMOUR || op->type == HELMET
471 (op->type == SHIELD) || (op->type == RING) || 312 || op->type == SHIELD || op->type == RING
472 (op->type == BOOTS) || (op->type == GLOVES) || 313 || op->type == BOOTS || op->type == GLOVES
473 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) 314 || op->type == AMULET || op->type == GIRDLE
315 || op->type == BRACERS || op->type == CLOAK)
474 { 316 {
475 if (op->last_heal) 317 if (op->last_heal)
476 { 318 {
477 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 319 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
478 op->gen_sp_armour = op->last_heal; 320 op->gen_sp_armour = op->last_heal;
479 op->last_heal = 0; 321 op->last_heal = 0;
480 } 322 }
481 323
482 ip = calc_item_power (op, 0); 324 int ip = calc_item_power (op, 0);
325
483 /* Legacy objects from before item power was in the game */ 326 /* Legacy objects from before item power was in the game */
484 if (!op->item_power && ip) 327 if (!op->item_power && ip)
485 { 328 {
486 if (ip > 3) 329 if (ip > 3)
487 {
488 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); 330 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip);
489 } 331
490 op->item_power = ip; 332 op->item_power = ip;
491 } 333 }
334
492 /* Check for possibly bogus values. Has to meet both these criteria - 335 /* Check for possibly bogus values. Has to meet both these criteria -
493 * something that has item_power 1 is probably just fine if our calculated 336 * something that has item_power 1 is probably just fine if our calculated
494 * value is 1 or 2 - these values are small enough that hard to be precise. 337 * value is 1 or 2 - these values are small enough that hard to be precise.
495 * similarly, it item_power is 0, the first check will always pass, 338 * similarly, it item_power is 0, the first check will always pass,
496 * but not the second one. 339 * but not the second one.
497 */ 340 */
498 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 341 if (ip > 2 * op->item_power && ip > (op->item_power + 3))
499 {
500 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); 342 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power);
501 }
502
503 } 343 }
344
504 /* Old spellcasting object - need to load in the appropiate object */ 345 /* Old spellcasting object - need to load in the appropiate object */
505 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || 346 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL ||
506 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 347 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
507 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) 348 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init)
508 { 349 {
509 object *tmp;
510
511 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 350 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'
512 * in that spell was stored in sp. 351 * in that spell was stored in sp.
513 */ 352 */
514 tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); 353 object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]);
515 insert_ob_in_ob (tmp, op); 354 insert_ob_in_ob (tmp, op);
516 op->randomitems = NULL; /* So another spell isn't created for this object */ 355 op->randomitems = NULL; /* So another spell isn't created for this object */
517 } 356 }
357
518 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 358 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
519
520 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) 359 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init)
521 { 360 {
522 object *tmp;
523
524 tmp = get_archetype_by_object_name (op->slaying); 361 object *tmp = get_archetype_by_object_name (op->slaying);
525 insert_ob_in_ob (tmp, op); 362 insert_ob_in_ob (tmp, op);
526 op->randomitems = NULL; /* So another spell isn't created for this object */ 363 op->randomitems = NULL; /* So another spell isn't created for this object */
527 /* without this, value is all screwed up */ 364 /* without this, value is all screwed up */
528 op->value = op->arch->clone.value * op->inv->value; 365 op->value = op->arch->clone.value * op->inv->value;
529 } 366 }
… …
565 { 402 {
566 op->move_type = MOVE_ALL; 403 op->move_type = MOVE_ALL;
567 op->stats.maxhp = 0; 404 op->stats.maxhp = 0;
568 } 405 }
569 else 406 else
570 {
571 op->move_type = MOVE_WALK; 407 op->move_type = MOVE_WALK;
572 }
573 } 408 }
574 } 409 }
575 410
576} 411}
577 412
… …
651 bool ismore = 0; 486 bool ismore = 0;
652 object *op_inv = op->inv; 487 object *op_inv = op->inv;
653 488
654 for (;;) 489 for (;;)
655 { 490 {
656 keyword kw = thawer.get_kv (); 491 switch (thawer.get_kv ())
657
658 switch (kw)
659 { 492 {
660 case KW_Object: // uppercase alias 493 case KW_Object: // uppercase alias
661 case KW_object: 494 case KW_object:
662 thawer.get (op->name); 495 thawer.get (op->name);
663 496
… …
714 tmp = arch_to_object (arch); 547 tmp = arch_to_object (arch);
715 else 548 else
716 { 549 {
717 tmp = object::create (); 550 tmp = object::create ();
718 /* record the name of the broken object */ 551 /* record the name of the broken object */
552 //TODO: but do not log???
719 tmp->name = str; 553 tmp->name = str;
720 } 554 }
721 555
722 // decativate the object we, as we are still going 556 // decativate the object we, as we are still going
723 // to read the speed value. Objects should be activated 557 // to read the speed value. Objects should be activated
… …
781 op->other_arch = archetype::find (thawer.get_str ()); 615 op->other_arch = archetype::find (thawer.get_str ());
782 break; 616 break;
783 617
784 case KW_animation: 618 case KW_animation:
785 { 619 {
620 CLEAR_FLAG (op, FLAG_ANIMATE);
621 op->animation_id = 0;
622
786 const char *str = thawer.get_str (); 623 const char *str = thawer.get_str ();
787
788 if (!str)
789 {
790 op->animation_id = 0;
791 CLEAR_FLAG (op, FLAG_ANIMATE);
792 }
793 else if ((op->animation_id = find_animation (str))) 624 if (str && (op->animation_id = find_animation (str)))
794 SET_FLAG (op, FLAG_ANIMATE); 625 SET_FLAG (op, FLAG_ANIMATE);
795 } 626 }
796
797 break; 627 break;
798 628
799 case KW_last_heal: thawer.get (op->last_heal); break; 629 case KW_last_heal: thawer.get (op->last_heal); break;
800 case KW_last_sp: thawer.get (op->last_sp); break; 630 case KW_last_sp: thawer.get (op->last_sp); break;
801 case KW_last_grace: thawer.get (op->last_grace); break; 631 case KW_last_grace: thawer.get (op->last_grace); break;
… …
866 case KW_path_denied: thawer.get (op->path_denied); break; 696 case KW_path_denied: thawer.get (op->path_denied); break;
867 case KW_invisible: thawer.get (op->invisible); break; 697 case KW_invisible: thawer.get (op->invisible); break;
868 case KW_magic: thawer.get (op->magic); break; 698 case KW_magic: thawer.get (op->magic); break;
869 case KW_state: thawer.get (op->state); break; 699 case KW_state: thawer.get (op->state); break;
870 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; 700 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break;
871 case KW_material: thawer.get (op->material); break; 701 case KW_material: thawer.get (op->materials); break; //TODO: nuke
872 case KW_materialname: thawer.get (op->materialname); break; 702 case KW_materialname: thawer.get (op->materialname); break;
873 703
874 /* These are the new values */ 704 /* These are the new values */
875 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; 705 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break;
876 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; 706 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break;
… …
1138 add_button_link (op, op->map, thawer.get_sint32 ()); 968 add_button_link (op, op->map, thawer.get_sint32 ());
1139 break; 969 break;
1140 970
1141 case KW_randomitems: 971 case KW_randomitems:
1142 op->randomitems = find_treasurelist (thawer.get_str ()); 972 op->randomitems = find_treasurelist (thawer.get_str ());
973 //if (!op->randomitems)
974 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", op->debug_desc (), thawer.get_str ());
1143 break; 975 break;
1144 976
1145 case KW_msg: 977 case KW_msg:
1146 thawer.get_ml (KW_endmsg, op->msg); 978 thawer.get_ml (KW_endmsg, op->msg);
1147 //TODO: allow longer messages 979 //TODO: allow longer messages
… …
1185 1017
1186 case KW_EOF: 1018 case KW_EOF:
1187 return LL_EOF; 1019 return LL_EOF;
1188 1020
1189 case KW_ERROR: 1021 case KW_ERROR:
1190 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 1022 set_ob_key_value (op, thawer.kw_str, thawer.value, true);
1191 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D 1023 //fprintf (stderr, "addkv(%s,%s)\n", thawer.kw_str, thawer.value);//D
1192 break; 1024 break;
1193 1025
1194 default: 1026 default:
1195 if (!thawer.parse_error (kw, "object", op->name)) 1027 if (!thawer.parse_error ("object", op->name))
1196 return false; 1028 return false;
1197 break; 1029 break;
1198 } 1030 }
1199 } 1031 }
1200} 1032}
… …
1535 f.put (resist_save[i], op->resist[i]); 1367 f.put (resist_save[i], op->resist[i]);
1536 1368
1537 CMP_OUT (path_attuned); 1369 CMP_OUT (path_attuned);
1538 CMP_OUT (path_repelled); 1370 CMP_OUT (path_repelled);
1539 CMP_OUT (path_denied); 1371 CMP_OUT (path_denied);
1540 CMP_OUT (material); 1372 CMP_OUT2 (material, materials);//TODO: nuke
1541 CMP_OUT (materialname); 1373 CMP_OUT (materialname);
1542 CMP_OUT (value); 1374 CMP_OUT (value);
1543 CMP_OUT (carrying); 1375 CMP_OUT (carrying);
1544 CMP_OUT (weight); 1376 CMP_OUT (weight);
1545 CMP_OUT (invisible); 1377 CMP_OUT (invisible);
… …
1622 1454
1623 fp.put (op); 1455 fp.put (op);
1624 fp.put (KW_end); 1456 fp.put (KW_end);
1625} 1457}
1626 1458
1459/////////////////////////////////////////////////////////////////////////////
1460
1461bool load_resource_file (const char *filename)
1462{
1463 object_thawer f (filename);
1464
1465 f.next_kv ();
1466
1467 for (;;)
1468 {
1469 switch (f.kw)
1470 {
1471 case KW_region:
1472 if (!region::load (f))
1473 return false;
1474 break;
1475
1476 case KW_EOF:
1477 return true;
1478
1479 default:
1480 if (!f.parse_error ("resource file"))
1481 return false;
1482 }
1483
1484 f.next_kv ();
1485 }
1486}
1487

Diff Legend

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