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.55 by root, Thu Feb 8 03:09:31 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
35loader_base::~loader_base ()
36{
37}
38
39// the base class warns about and skips everything
40archetype *
41loader_base::get_arch (const char *name)
42{
43 LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of this type.\n",
44 filename, name);
45
46 return new archetype;
47}
48
49object *
50loader_base::get_object (const char *name)
51{
52 LOG (llevError, "%s: found object definition '%s', which is not allowed in files of this type.\n",
53 filename, name);
54
55 return object::create ();
56}
57
58player *
59loader_base::get_player ()
60{
61 LOG (llevError, "%s: found player definition, which is not allowed in files of this type.\n",
62 filename);
63
64 return player::create ();
65}
66
67region *
68loader_base::get_region (const char *name)
69{
70 LOG (llevError, "%s: found region definition '%s', which is not allowed in files of this type.\n",
71 filename, name);
72
73 return new region;
74}
75
76facetile *
77loader_base::get_face (const char *name)
78{
79 LOG (llevError, "%s: found face definition '%s', which is not allowed in files of this type.\n",
80 filename, name);
81
82 return new facetile;
83}
84
85treasurelist *
86loader_base::get_treasure (const char *name, bool one)
87{
88 LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of this type.\n",
89 filename, name);
90
91 return new treasurelist;//D
92}
93
94animation *
95loader_base::get_animation (const char *name)
96{
97 LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of this type.\n",
98 filename, name);
99
100 return new animation;
101}
102
103void
104loader_base::put_arch (archetype *arch)
105{
106 delete arch;
107}
108
109void
110loader_base::put_object (object *op)
111{
112 op->destroy ();
113}
114
115void
116loader_base::put_player (player *pl)
117{
118 delete pl;
119}
120
121void
122loader_base::put_region (region *region)
123{
124 delete region;
125}
126
127void
128loader_base::put_face (facetile *face)
129{
130 delete face;
131}
132
133void
134loader_base::put_treasure (treasurelist *treasure)
135{
136 delete treasure;
137}
138
139void
140loader_base::put_animation (animation *anim)
141{
142 delete anim;
143}
144
145/////////////////////////////////////////////////////////////////////////////
146
147bool loader_base::parse (object_thawer &thawer)
148{
149 for (;;)
150 {
151 keyword kw = thawer.get_kv ();
152
153 switch (kw)
154 {
155 case KW_region:
156 {
157 region *rgn = get_region (thawer.get_str ());
158
159 if (!parse_region (thawer, rgn))
160 {
161 delete rgn;
162 return false;
163 }
164
165 put_region (rgn);
166 }
167 break;
168
169 case KW_EOF:
170 return true;
171
172 default:
173 if (!thawer.parse_error (kw, "resource file"))
174 return false;
175 }
176 }
177}
178
179bool loader_base::load (const char *filename)
180{
181 this->filename = filename;
182
183 object_thawer fp (filename);
184
185 if (!fp)
186 return false;
187
188 return parse (fp);
189}
190 32
191///////////////////////////////////////////////////////////////////////////// 33/////////////////////////////////////////////////////////////////////////////
192 34
193/* Maps the MOVE_* values to names */ 35/* Maps the MOVE_* values to names */
194static 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 };
… …
421 * 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.
422 */ 264 */
423static void 265static void
424check_loaded_object (object *op) 266check_loaded_object (object *op)
425{ 267{
426 int ip;
427
428 /* 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.
429 * 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 -
430 * 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
431 * 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
432 * 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
433 * 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.
434 * Otherwise, what happens is that the the plural name will lose 274 * Otherwise, what happens is that the the plural name will lose
435 * information (appear as just 'hearts' and not 'goblins heart') 275 * information (appear as just 'hearts' and not 'goblins heart')
436 */ 276 */
437 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)
438 op->name_pl = NULL; 278 op->name_pl = 0;
439 279
440 if (!op->name_pl) 280 if (!op->name_pl)
441 op->name_pl = op->name; 281 op->name_pl = op->name;
442 282
443 /* objects now have a materialname. try to patch it in */ 283 /* objects now have a materialname. try to patch it in */
… …
446 if (op->map != NULL) 286 if (op->map != NULL)
447 set_materialname (op, op->map->difficulty, NULL); 287 set_materialname (op, op->map->difficulty, NULL);
448 else 288 else
449 set_materialname (op, 5, NULL); 289 set_materialname (op, 5, NULL);
450 } 290 }
291
451 /* only do these when program is first run - a bit 292 /* only do these when program is first run - a bit
452 * excessive to do this at every run - most of this is 293 * excessive to do this at every run - most of this is
453 * really just to catch any errors - program will still run, but 294 * really just to catch any errors - program will still run, but
454 * not in the ideal fashion. 295 * not in the ideal fashion.
455 */ 296 */
456 if ((op->type == WEAPON || op->type == BOW) && arch_init) 297 if ((op->type == WEAPON || op->type == BOW) && arch_init)
457 { 298 {
458 if (!op->skill) 299 if (!op->skill)
459 {
460 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 300 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
461 }
462 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) ||
463 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 302 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
464 {
465 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);
466 }
467 } 304 }
468 305
469 /* 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
470 * really does for many objects. Need to catch any in maps 307 * really does for many objects. Need to catch any in maps
471 * that may have an old value. 308 * that may have an old value.
472 */ 309 */
473 if ((op->type == WEAPON) || 310 if (op->type == WEAPON
474 (op->type == ARMOUR) || (op->type == HELMET) || 311 || op->type == ARMOUR || op->type == HELMET
475 (op->type == SHIELD) || (op->type == RING) || 312 || op->type == SHIELD || op->type == RING
476 (op->type == BOOTS) || (op->type == GLOVES) || 313 || op->type == BOOTS || op->type == GLOVES
477 (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)
478 { 316 {
479 if (op->last_heal) 317 if (op->last_heal)
480 { 318 {
481 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 ());
482 op->gen_sp_armour = op->last_heal; 320 op->gen_sp_armour = op->last_heal;
483 op->last_heal = 0; 321 op->last_heal = 0;
484 } 322 }
485 323
486 ip = calc_item_power (op, 0); 324 int ip = calc_item_power (op, 0);
325
487 /* Legacy objects from before item power was in the game */ 326 /* Legacy objects from before item power was in the game */
488 if (!op->item_power && ip) 327 if (!op->item_power && ip)
489 { 328 {
490 if (ip > 3) 329 if (ip > 3)
491 {
492 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);
493 } 331
494 op->item_power = ip; 332 op->item_power = ip;
495 } 333 }
334
496 /* Check for possibly bogus values. Has to meet both these criteria - 335 /* Check for possibly bogus values. Has to meet both these criteria -
497 * 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
498 * 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.
499 * 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,
500 * but not the second one. 339 * but not the second one.
501 */ 340 */
502 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 341 if (ip > 2 * op->item_power && ip > (op->item_power + 3))
503 {
504 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);
505 }
506
507 } 343 }
344
508 /* Old spellcasting object - need to load in the appropiate object */ 345 /* Old spellcasting object - need to load in the appropiate object */
509 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 ||
510 /* 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 */
511 ((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)
512 { 349 {
513 object *tmp;
514
515 /* 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'
516 * in that spell was stored in sp. 351 * in that spell was stored in sp.
517 */ 352 */
518 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]);
519 insert_ob_in_ob (tmp, op); 354 insert_ob_in_ob (tmp, op);
520 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 */
521 } 356 }
357
522 /* 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 */
523
524 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)
525 { 360 {
526 object *tmp;
527
528 tmp = get_archetype_by_object_name (op->slaying); 361 object *tmp = get_archetype_by_object_name (op->slaying);
529 insert_ob_in_ob (tmp, op); 362 insert_ob_in_ob (tmp, op);
530 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 */
531 /* without this, value is all screwed up */ 364 /* without this, value is all screwed up */
532 op->value = op->arch->clone.value * op->inv->value; 365 op->value = op->arch->clone.value * op->inv->value;
533 } 366 }
… …
569 { 402 {
570 op->move_type = MOVE_ALL; 403 op->move_type = MOVE_ALL;
571 op->stats.maxhp = 0; 404 op->stats.maxhp = 0;
572 } 405 }
573 else 406 else
574 {
575 op->move_type = MOVE_WALK; 407 op->move_type = MOVE_WALK;
576 }
577 } 408 }
578 } 409 }
579 410
580} 411}
581 412
… …
655 bool ismore = 0; 486 bool ismore = 0;
656 object *op_inv = op->inv; 487 object *op_inv = op->inv;
657 488
658 for (;;) 489 for (;;)
659 { 490 {
660 keyword kw = thawer.get_kv (); 491 switch (thawer.get_kv ())
661
662 switch (kw)
663 { 492 {
664 case KW_Object: // uppercase alias 493 case KW_Object: // uppercase alias
665 case KW_object: 494 case KW_object:
666 thawer.get (op->name); 495 thawer.get (op->name);
667 496
… …
718 tmp = arch_to_object (arch); 547 tmp = arch_to_object (arch);
719 else 548 else
720 { 549 {
721 tmp = object::create (); 550 tmp = object::create ();
722 /* record the name of the broken object */ 551 /* record the name of the broken object */
552 //TODO: but do not log???
723 tmp->name = str; 553 tmp->name = str;
724 } 554 }
725 555
726 // decativate the object we, as we are still going 556 // decativate the object we, as we are still going
727 // to read the speed value. Objects should be activated 557 // to read the speed value. Objects should be activated
… …
785 op->other_arch = archetype::find (thawer.get_str ()); 615 op->other_arch = archetype::find (thawer.get_str ());
786 break; 616 break;
787 617
788 case KW_animation: 618 case KW_animation:
789 { 619 {
620 CLEAR_FLAG (op, FLAG_ANIMATE);
621 op->animation_id = 0;
622
790 const char *str = thawer.get_str (); 623 const char *str = thawer.get_str ();
791
792 if (!str)
793 {
794 op->animation_id = 0;
795 CLEAR_FLAG (op, FLAG_ANIMATE);
796 }
797 else if ((op->animation_id = find_animation (str))) 624 if (str && (op->animation_id = find_animation (str)))
798 SET_FLAG (op, FLAG_ANIMATE); 625 SET_FLAG (op, FLAG_ANIMATE);
799 } 626 }
800
801 break; 627 break;
802 628
803 case KW_last_heal: thawer.get (op->last_heal); break; 629 case KW_last_heal: thawer.get (op->last_heal); break;
804 case KW_last_sp: thawer.get (op->last_sp); break; 630 case KW_last_sp: thawer.get (op->last_sp); break;
805 case KW_last_grace: thawer.get (op->last_grace); break; 631 case KW_last_grace: thawer.get (op->last_grace); break;
… …
1191 1017
1192 case KW_EOF: 1018 case KW_EOF:
1193 return LL_EOF; 1019 return LL_EOF;
1194 1020
1195 case KW_ERROR: 1021 case KW_ERROR:
1196 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 1022 set_ob_key_value (op, thawer.kw_str, thawer.value, true);
1197 //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
1198 break; 1024 break;
1199 1025
1200 default: 1026 default:
1201 if (!thawer.parse_error (kw, "object", op->name)) 1027 if (!thawer.parse_error ("object", op->name))
1202 return false; 1028 return false;
1203 break; 1029 break;
1204 } 1030 }
1205 } 1031 }
1206} 1032}
… …
1628 1454
1629 fp.put (op); 1455 fp.put (op);
1630 fp.put (KW_end); 1456 fp.put (KW_end);
1631} 1457}
1632 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