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.51 by root, Thu Feb 1 17:29:16 2007 UTC vs.
Revision 1.58 by root, Thu Feb 15 21:07:48 2007 UTC

… …
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 32
33// resource loader pure base class 33/////////////////////////////////////////////////////////////////////////////
34struct loader_base
35{
36 const char *filename;
37 virtual const char *type () const = 0;
38
39 virtual archetype *get_arch (const char *name);
40 virtual void put_arch (archetype *arch);
41
42 virtual object *get_object (const char *name);
43 virtual void put_object (object *op);
44
45 virtual player *get_player ();
46 virtual void put_player (player *pl);
47
48 virtual region *get_region (const char *name);
49 virtual void put_region (region *region);
50
51 virtual facetile *get_face (const char *name);
52 virtual void put_face (facetile *face);
53
54 virtual treasurelist *get_treasure (const char *name, bool one = false);
55 virtual void put_treasure (treasurelist *treasure);
56
57 virtual animation *get_animation (const char *name);
58 virtual void put_animation (animation *anim);
59};
60
61// pure base class for default archetype loader
62struct loader_arch : virtual loader_base {
63 archetype *get_arch (const char *name);
64 void put_arch (archetype *arch);
65};
66
67// pure base class for default object loader
68struct loader_object : virtual loader_base {
69 object *get_object (const char *name);
70 void put_object (object *op);
71};
72
73// pure base class for default player loader
74struct loader_player : virtual loader_base {
75 virtual player *get_player ();
76 virtual void put_player (player *pl);
77};
78
79// pure base class for default region loader
80struct loader_region : virtual loader_base {
81 region *get_region ();
82 void put_region (region *region);
83};
84
85// pure base class for default face loader
86struct loader_face : virtual loader_base {
87 facetile *get_face (const char *name);
88 void put_face (facetile *face);
89};
90
91// pure base class for default treasure loader
92struct loader_treasure : virtual loader_base {
93 treasurelist *get_treasure (const char *name, bool one = false);
94 void put_treasure (treasurelist *treasure);
95};
96
97// pure base class for default animation loader
98struct loader_animation : virtual loader_base {
99 animation *get_animation (const char *name);
100 void put_animation (animation *anim);
101};
102
103// future generic resource loader
104// handles generic stuff valid in most files, such as
105// animations, treasures, faces and so on
106struct loader_generic
107: virtual loader_base,
108 loader_object, loader_player,
109 loader_region, loader_face,
110 loader_treasure, loader_animation
111{
112 const char *type () const = 0;
113};
114
115// the base class warns about and skips everything
116archetype *
117loader_base::get_arch (const char *name)
118{
119 LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of type %s.\n",
120 filename, name, type ());
121
122 return new archetype;
123}
124
125object *
126loader_base::get_object (const char *name)
127{
128 LOG (llevError, "%s: found object definition '%s', which is not allowed in files of type %s.\n",
129 filename, name, type ());
130
131 return object::create ();
132}
133
134player *
135loader_base::get_player ()
136{
137 LOG (llevError, "%s: found player definition, which is not allowed in files of type %s.\n",
138 filename, type ());
139
140 return player::create ();
141}
142
143region *
144loader_base::get_region (const char *name)
145{
146 LOG (llevError, "%s: found region definition '%s', which is not allowed in files of type %s.\n",
147 filename, name, type ());
148
149 return new region;
150}
151
152facetile *
153loader_base::get_face (const char *name)
154{
155 LOG (llevError, "%s: found face definition '%s', which is not allowed in files of type %s.\n",
156 filename, name, type ());
157
158 return new facetile;
159}
160
161treasurelist *
162loader_base::get_treasure (const char *name, bool one)
163{
164 LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of type %s.\n",
165 filename, name, type ());
166
167 return new treasurelist;//D
168}
169
170animation *
171loader_base::get_animation (const char *name)
172{
173 LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of type %s.\n",
174 filename, name, type ());
175
176 return new animation;
177}
178
179void
180loader_base::put_arch (archetype *arch)
181{
182 delete arch;
183}
184
185void
186loader_base::put_object (object *op)
187{
188 op->destroy ();
189}
190
191void
192loader_base::put_player (player *pl)
193{
194 delete pl;
195}
196
197void
198loader_base::put_region (region *region)
199{
200 delete region;
201}
202
203void
204loader_base::put_face (facetile *face)
205{
206 delete face;
207}
208
209void
210loader_base::put_treasure (treasurelist *treasure)
211{
212 delete treasure;
213}
214
215void
216loader_base::put_animation (animation *anim)
217{
218 delete anim;
219}
220 34
221/* Maps the MOVE_* values to names */ 35/* Maps the MOVE_* values to names */
222static 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 };
223 37
224/* This table is only necessary to convert objects that existed before the 38/* This table is only necessary to convert objects that existed before the
… …
449 * 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.
450 */ 264 */
451static void 265static void
452check_loaded_object (object *op) 266check_loaded_object (object *op)
453{ 267{
454 int ip;
455
456 /* 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.
457 * 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 -
458 * 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
459 * 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
460 * 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
461 * 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.
462 * Otherwise, what happens is that the the plural name will lose 274 * Otherwise, what happens is that the the plural name will lose
463 * information (appear as just 'hearts' and not 'goblins heart') 275 * information (appear as just 'hearts' and not 'goblins heart')
464 */ 276 */
465 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)
466 op->name_pl = NULL; 278 op->name_pl = 0;
467 279
468 if (!op->name_pl) 280 if (!op->name_pl)
469 op->name_pl = op->name; 281 op->name_pl = op->name;
470 282
471 /* objects now have a materialname. try to patch it in */ 283 /* objects now have a materialname. try to patch it in */
… …
474 if (op->map != NULL) 286 if (op->map != NULL)
475 set_materialname (op, op->map->difficulty, NULL); 287 set_materialname (op, op->map->difficulty, NULL);
476 else 288 else
477 set_materialname (op, 5, NULL); 289 set_materialname (op, 5, NULL);
478 } 290 }
291
479 /* only do these when program is first run - a bit 292 /* only do these when program is first run - a bit
480 * excessive to do this at every run - most of this is 293 * excessive to do this at every run - most of this is
481 * really just to catch any errors - program will still run, but 294 * really just to catch any errors - program will still run, but
482 * not in the ideal fashion. 295 * not in the ideal fashion.
483 */ 296 */
484 if ((op->type == WEAPON || op->type == BOW) && arch_init) 297 if ((op->type == WEAPON || op->type == BOW) && arch_init)
485 { 298 {
486 if (!op->skill) 299 if (!op->skill)
487 {
488 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 300 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
489 }
490 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) ||
491 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 302 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
492 {
493 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);
494 }
495 } 304 }
496 305
497 /* 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
498 * really does for many objects. Need to catch any in maps 307 * really does for many objects. Need to catch any in maps
499 * that may have an old value. 308 * that may have an old value.
500 */ 309 */
501 if ((op->type == WEAPON) || 310 if (op->type == WEAPON
502 (op->type == ARMOUR) || (op->type == HELMET) || 311 || op->type == ARMOUR || op->type == HELMET
503 (op->type == SHIELD) || (op->type == RING) || 312 || op->type == SHIELD || op->type == RING
504 (op->type == BOOTS) || (op->type == GLOVES) || 313 || op->type == BOOTS || op->type == GLOVES
505 (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)
506 { 316 {
507 if (op->last_heal) 317 if (op->last_heal)
508 { 318 {
509 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 ());
510 op->gen_sp_armour = op->last_heal; 320 op->gen_sp_armour = op->last_heal;
511 op->last_heal = 0; 321 op->last_heal = 0;
512 } 322 }
513 323
514 ip = calc_item_power (op, 0); 324 int ip = calc_item_power (op, 0);
325
515 /* Legacy objects from before item power was in the game */ 326 /* Legacy objects from before item power was in the game */
516 if (!op->item_power && ip) 327 if (!op->item_power && ip)
517 { 328 {
518 if (ip > 3) 329 if (ip > 3)
519 {
520 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);
521 } 331
522 op->item_power = ip; 332 op->item_power = ip;
523 } 333 }
334
524 /* Check for possibly bogus values. Has to meet both these criteria - 335 /* Check for possibly bogus values. Has to meet both these criteria -
525 * 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
526 * 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.
527 * 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,
528 * but not the second one. 339 * but not the second one.
529 */ 340 */
530 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 341 if (ip > 2 * op->item_power && ip > (op->item_power + 3))
531 {
532 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);
533 }
534
535 } 343 }
344
536 /* Old spellcasting object - need to load in the appropiate object */ 345 /* Old spellcasting object - need to load in the appropiate object */
537 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 ||
538 /* 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 */
539 ((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)
540 { 349 {
541 object *tmp;
542
543 /* 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'
544 * in that spell was stored in sp. 351 * in that spell was stored in sp.
545 */ 352 */
546 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]);
547 insert_ob_in_ob (tmp, op); 354 insert_ob_in_ob (tmp, op);
548 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 */
549 } 356 }
357
550 /* 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 */
551
552 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)
553 { 360 {
554 object *tmp;
555
556 tmp = get_archetype_by_object_name (op->slaying); 361 object *tmp = get_archetype_by_object_name (op->slaying);
557 insert_ob_in_ob (tmp, op); 362 insert_ob_in_ob (tmp, op);
558 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 */
559 /* without this, value is all screwed up */ 364 /* without this, value is all screwed up */
560 op->value = op->arch->clone.value * op->inv->value; 365 op->value = op->arch->clone.value * op->inv->value;
561 } 366 }
… …
597 { 402 {
598 op->move_type = MOVE_ALL; 403 op->move_type = MOVE_ALL;
599 op->stats.maxhp = 0; 404 op->stats.maxhp = 0;
600 } 405 }
601 else 406 else
602 {
603 op->move_type = MOVE_WALK; 407 op->move_type = MOVE_WALK;
604 }
605 } 408 }
606 } 409 }
607 410
608} 411}
609 412
… …
683 bool ismore = 0; 486 bool ismore = 0;
684 object *op_inv = op->inv; 487 object *op_inv = op->inv;
685 488
686 for (;;) 489 for (;;)
687 { 490 {
688 keyword kw = thawer.get_kv (); 491 switch (thawer.get_kv ())
689
690 switch (kw)
691 { 492 {
692 case KW_Object: // uppercase alias 493 case KW_Object: // uppercase alias
693 case KW_object: 494 case KW_object:
694 thawer.get (op->name); 495 thawer.get (op->name);
695 496
… …
746 tmp = arch_to_object (arch); 547 tmp = arch_to_object (arch);
747 else 548 else
748 { 549 {
749 tmp = object::create (); 550 tmp = object::create ();
750 /* record the name of the broken object */ 551 /* record the name of the broken object */
552 //TODO: but do not log???
751 tmp->name = str; 553 tmp->name = str;
752 } 554 }
753 555
754 // decativate the object we, as we are still going 556 // decativate the object we, as we are still going
755 // to read the speed value. Objects should be activated 557 // to read the speed value. Objects should be activated
… …
813 op->other_arch = archetype::find (thawer.get_str ()); 615 op->other_arch = archetype::find (thawer.get_str ());
814 break; 616 break;
815 617
816 case KW_animation: 618 case KW_animation:
817 { 619 {
620 CLEAR_FLAG (op, FLAG_ANIMATE);
621 op->animation_id = 0;
622
818 const char *str = thawer.get_str (); 623 const char *str = thawer.get_str ();
819
820 if (!str)
821 {
822 op->animation_id = 0;
823 CLEAR_FLAG (op, FLAG_ANIMATE);
824 }
825 else if ((op->animation_id = find_animation (str))) 624 if (str && (op->animation_id = find_animation (str)))
826 SET_FLAG (op, FLAG_ANIMATE); 625 SET_FLAG (op, FLAG_ANIMATE);
827 } 626 }
828
829 break; 627 break;
830 628
831 case KW_last_heal: thawer.get (op->last_heal); break; 629 case KW_last_heal: thawer.get (op->last_heal); break;
832 case KW_last_sp: thawer.get (op->last_sp); break; 630 case KW_last_sp: thawer.get (op->last_sp); break;
833 case KW_last_grace: thawer.get (op->last_grace); break; 631 case KW_last_grace: thawer.get (op->last_grace); break;
… …
898 case KW_path_denied: thawer.get (op->path_denied); break; 696 case KW_path_denied: thawer.get (op->path_denied); break;
899 case KW_invisible: thawer.get (op->invisible); break; 697 case KW_invisible: thawer.get (op->invisible); break;
900 case KW_magic: thawer.get (op->magic); break; 698 case KW_magic: thawer.get (op->magic); break;
901 case KW_state: thawer.get (op->state); break; 699 case KW_state: thawer.get (op->state); break;
902 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;
903 case KW_material: thawer.get (op->material); break; 701 case KW_material: thawer.get (op->materials); break; //TODO: nuke
904 case KW_materialname: thawer.get (op->materialname); break; 702 case KW_materialname: thawer.get (op->materialname); break;
905 703
906 /* These are the new values */ 704 /* These are the new values */
907 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;
908 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;
… …
1170 add_button_link (op, op->map, thawer.get_sint32 ()); 968 add_button_link (op, op->map, thawer.get_sint32 ());
1171 break; 969 break;
1172 970
1173 case KW_randomitems: 971 case KW_randomitems:
1174 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 ());
1175 break; 975 break;
1176 976
1177 case KW_msg: 977 case KW_msg:
1178 thawer.get_ml (KW_endmsg, op->msg); 978 thawer.get_ml (KW_endmsg, op->msg);
1179 //TODO: allow longer messages 979 //TODO: allow longer messages
… …
1217 1017
1218 case KW_EOF: 1018 case KW_EOF:
1219 return LL_EOF; 1019 return LL_EOF;
1220 1020
1221 case KW_ERROR: 1021 case KW_ERROR:
1222 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 1022 set_ob_key_value (op, thawer.kw_str, thawer.value, true);
1223 //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
1224 break; 1024 break;
1225 1025
1226 default: 1026 default:
1227 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1027 if (!thawer.parse_error ("object", op->name))
1028 return false;
1228 break; 1029 break;
1229 } 1030 }
1230 } 1031 }
1231} 1032}
1232 1033
… …
1566 f.put (resist_save[i], op->resist[i]); 1367 f.put (resist_save[i], op->resist[i]);
1567 1368
1568 CMP_OUT (path_attuned); 1369 CMP_OUT (path_attuned);
1569 CMP_OUT (path_repelled); 1370 CMP_OUT (path_repelled);
1570 CMP_OUT (path_denied); 1371 CMP_OUT (path_denied);
1571 CMP_OUT (material); 1372 CMP_OUT2 (material, materials);//TODO: nuke
1572 CMP_OUT (materialname); 1373 CMP_OUT (materialname);
1573 CMP_OUT (value); 1374 CMP_OUT (value);
1574 CMP_OUT (carrying); 1375 CMP_OUT (carrying);
1575 CMP_OUT (weight); 1376 CMP_OUT (weight);
1576 CMP_OUT (invisible); 1377 CMP_OUT (invisible);
… …
1653 1454
1654 fp.put (op); 1455 fp.put (op);
1655 fp.put (KW_end); 1456 fp.put (KW_end);
1656} 1457}
1657 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