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.50 by root, Fri Jan 19 18:06:51 2007 UTC vs.
Revision 1.57 by root, Sat Feb 10 01:52:25 2007 UTC

… …
24 24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 27 variable. */
28 28
29
30#include <global.h> 29#include <global.h>
31#include <loader.h> 30#include <loader.h>
32#include <sproto.h> 31#include <sproto.h>
33 32
34// future resource loader base class 33/////////////////////////////////////////////////////////////////////////////
35struct loader_base
36{
37 const char *filename;
38 virtual const char *type () const = 0;
39 34
40 virtual archetype *get_arch (const char *name); 35loader_base::~loader_base ()
41 virtual void put_arch (archetype *arch);
42
43 virtual object *get_object (const char *name);
44 virtual void put_object (object *op);
45
46 virtual player *get_player ();
47 virtual void put_player (player *pl);
48
49 virtual region *get_region (const char *name);
50 virtual void put_region (region *region);
51
52 virtual facetile *get_face (const char *name);
53 virtual void put_face (facetile *face);
54
55 virtual treasurelist *get_treasure (const char *name, bool one = false);
56 virtual void put_treasure (treasurelist *treasure);
57
58 virtual animation *get_animation (const char *name);
59 virtual void put_animation (animation *anim);
60};
61
62// future generic resource loader
63// handles generic stuff valid in most files, such as
64// animations, treasures, faces and so on
65struct loader_generic : loader_base
66{ 36{
67 const char *type () const = 0; 37}
68
69 region *get_region ();
70 void put_region (region *region);
71
72 facetile *get_face (const char *name);
73 void put_face (facetile *face);
74
75 treasurelist *get_treasure (const char *name, bool one = false);
76 void put_treasure (treasurelist *treasure);
77
78 animation *get_animation (const char *name);
79 void put_animation (animation *anim);
80};
81 38
82// the base class warns about and skips everything 39// the base class warns about and skips everything
83archetype * 40archetype *
84loader_base::get_arch (const char *name) 41loader_base::get_arch (const char *name)
85{ 42{
86 LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of type %s.\n", 43 LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of this type.\n",
87 filename, name, type ()); 44 filename, name);
88 45
89 return new archetype; 46 return new archetype;
90} 47}
91 48
92object * 49object *
93loader_base::get_object (const char *name) 50loader_base::get_object (const char *name)
94{ 51{
95 LOG (llevError, "%s: found object definition '%s', which is not allowed in files of type %s.\n", 52 LOG (llevError, "%s: found object definition '%s', which is not allowed in files of this type.\n",
96 filename, name, type ()); 53 filename, name);
97 54
98 return object::create (); 55 return object::create ();
99} 56}
100 57
101player * 58player *
102loader_base::get_player () 59loader_base::get_player ()
103{ 60{
104 LOG (llevError, "%s: found player definition, which is not allowed in files of type %s.\n", 61 LOG (llevError, "%s: found player definition, which is not allowed in files of this type.\n",
105 filename, type ()); 62 filename);
106 63
107 return player::create (); 64 return player::create ();
108} 65}
109 66
110region * 67region *
111loader_base::get_region (const char *name) 68loader_base::get_region (const char *name)
112{ 69{
113 LOG (llevError, "%s: found region definition '%s', which is not allowed in files of type %s.\n", 70 LOG (llevError, "%s: found region definition '%s', which is not allowed in files of this type.\n",
114 filename, name, type ()); 71 filename, name);
115 72
116 return new region; 73 return new region;
117} 74}
118 75
119facetile * 76facetile *
120loader_base::get_face (const char *name) 77loader_base::get_face (const char *name)
121{ 78{
122 LOG (llevError, "%s: found face definition '%s', which is not allowed in files of type %s.\n", 79 LOG (llevError, "%s: found face definition '%s', which is not allowed in files of this type.\n",
123 filename, name, type ()); 80 filename, name);
124 81
125 return new facetile; 82 return new facetile;
126} 83}
127 84
128treasurelist * 85treasurelist *
129loader_base::get_treasure (const char *name, bool one) 86loader_base::get_treasure (const char *name, bool one)
130{ 87{
131 LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of type %s.\n", 88 LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of this type.\n",
132 filename, name, type ()); 89 filename, name);
133 90
134 return new treasurelist;//D 91 return new treasurelist;//D
135} 92}
136 93
137animation * 94animation *
138loader_base::get_animation (const char *name) 95loader_base::get_animation (const char *name)
139{ 96{
140 LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of type %s.\n", 97 LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of this type.\n",
141 filename, name, type ()); 98 filename, name);
142 99
143 return new animation; 100 return new animation;
144} 101}
145 102
146void 103void
… …
182void 139void
183loader_base::put_animation (animation *anim) 140loader_base::put_animation (animation *anim)
184{ 141{
185 delete anim; 142 delete anim;
186} 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
191/////////////////////////////////////////////////////////////////////////////
187 192
188/* Maps the MOVE_* values to names */ 193/* Maps the MOVE_* values to names */
189static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 194static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
190 195
191/* This table is only necessary to convert objects that existed before the 196/* This table is only necessary to convert objects that existed before the
… …
416 * to check for objects to make sure there are no common errors. 421 * to check for objects to make sure there are no common errors.
417 */ 422 */
418static void 423static void
419check_loaded_object (object *op) 424check_loaded_object (object *op)
420{ 425{
421 int ip;
422
423 /* We do some specialised handling to handle legacy cases of name_pl. 426 /* We do some specialised handling to handle legacy cases of name_pl.
424 * If the object doesn't have a name_pl, we just use the object name - 427 * If the object doesn't have a name_pl, we just use the object name -
425 * this isn't perfect (things won't be properly pluralised), but works to 428 * this isn't perfect (things won't be properly pluralised), but works to
426 * that degree (5 heart is still quite understandable). But the case we 429 * that degree (5 heart is still quite understandable). But the case we
427 * also have to catch is if this object is not using the normal name for 430 * also have to catch is if this object is not using the normal name for
428 * the object. In that case, we also want to use the loaded name. 431 * the object. In that case, we also want to use the loaded name.
429 * Otherwise, what happens is that the the plural name will lose 432 * Otherwise, what happens is that the the plural name will lose
430 * information (appear as just 'hearts' and not 'goblins heart') 433 * information (appear as just 'hearts' and not 'goblins heart')
431 */ 434 */
432 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) 435 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl)
433 op->name_pl = NULL; 436 op->name_pl = 0;
434 437
435 if (!op->name_pl) 438 if (!op->name_pl)
436 op->name_pl = op->name; 439 op->name_pl = op->name;
437 440
438 /* objects now have a materialname. try to patch it in */ 441 /* objects now have a materialname. try to patch it in */
… …
441 if (op->map != NULL) 444 if (op->map != NULL)
442 set_materialname (op, op->map->difficulty, NULL); 445 set_materialname (op, op->map->difficulty, NULL);
443 else 446 else
444 set_materialname (op, 5, NULL); 447 set_materialname (op, 5, NULL);
445 } 448 }
449
446 /* only do these when program is first run - a bit 450 /* only do these when program is first run - a bit
447 * excessive to do this at every run - most of this is 451 * excessive to do this at every run - most of this is
448 * really just to catch any errors - program will still run, but 452 * really just to catch any errors - program will still run, but
449 * not in the ideal fashion. 453 * not in the ideal fashion.
450 */ 454 */
451 if ((op->type == WEAPON || op->type == BOW) && arch_init) 455 if ((op->type == WEAPON || op->type == BOW) && arch_init)
452 { 456 {
453 if (!op->skill) 457 if (!op->skill)
454 {
455 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 458 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
456 }
457 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || 459 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) ||
458 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 460 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
459 {
460 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); 461 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill);
461 }
462 } 462 }
463 463
464 /* We changed last_heal to gen_sp_armour, which is what it 464 /* We changed last_heal to gen_sp_armour, which is what it
465 * really does for many objects. Need to catch any in maps 465 * really does for many objects. Need to catch any in maps
466 * that may have an old value. 466 * that may have an old value.
467 */ 467 */
468 if ((op->type == WEAPON) || 468 if (op->type == WEAPON
469 (op->type == ARMOUR) || (op->type == HELMET) || 469 || op->type == ARMOUR || op->type == HELMET
470 (op->type == SHIELD) || (op->type == RING) || 470 || op->type == SHIELD || op->type == RING
471 (op->type == BOOTS) || (op->type == GLOVES) || 471 || op->type == BOOTS || op->type == GLOVES
472 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) 472 || op->type == AMULET || op->type == GIRDLE
473 || op->type == BRACERS || op->type == CLOAK)
473 { 474 {
474 if (op->last_heal) 475 if (op->last_heal)
475 { 476 {
476 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 477 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
477 op->gen_sp_armour = op->last_heal; 478 op->gen_sp_armour = op->last_heal;
478 op->last_heal = 0; 479 op->last_heal = 0;
479 } 480 }
480 481
481 ip = calc_item_power (op, 0); 482 int ip = calc_item_power (op, 0);
483
482 /* Legacy objects from before item power was in the game */ 484 /* Legacy objects from before item power was in the game */
483 if (!op->item_power && ip) 485 if (!op->item_power && ip)
484 { 486 {
485 if (ip > 3) 487 if (ip > 3)
486 {
487 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); 488 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip);
488 } 489
489 op->item_power = ip; 490 op->item_power = ip;
490 } 491 }
492
491 /* Check for possibly bogus values. Has to meet both these criteria - 493 /* Check for possibly bogus values. Has to meet both these criteria -
492 * something that has item_power 1 is probably just fine if our calculated 494 * something that has item_power 1 is probably just fine if our calculated
493 * value is 1 or 2 - these values are small enough that hard to be precise. 495 * value is 1 or 2 - these values are small enough that hard to be precise.
494 * similarly, it item_power is 0, the first check will always pass, 496 * similarly, it item_power is 0, the first check will always pass,
495 * but not the second one. 497 * but not the second one.
496 */ 498 */
497 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 499 if (ip > 2 * op->item_power && ip > (op->item_power + 3))
498 {
499 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); 500 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power);
500 }
501
502 } 501 }
502
503 /* Old spellcasting object - need to load in the appropiate object */ 503 /* Old spellcasting object - need to load in the appropiate object */
504 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || 504 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL ||
505 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 505 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
506 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) 506 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init)
507 { 507 {
508 object *tmp;
509
510 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 508 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'
511 * in that spell was stored in sp. 509 * in that spell was stored in sp.
512 */ 510 */
513 tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); 511 object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]);
514 insert_ob_in_ob (tmp, op); 512 insert_ob_in_ob (tmp, op);
515 op->randomitems = NULL; /* So another spell isn't created for this object */ 513 op->randomitems = NULL; /* So another spell isn't created for this object */
516 } 514 }
515
517 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 516 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
518
519 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) 517 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init)
520 { 518 {
521 object *tmp;
522
523 tmp = get_archetype_by_object_name (op->slaying); 519 object *tmp = get_archetype_by_object_name (op->slaying);
524 insert_ob_in_ob (tmp, op); 520 insert_ob_in_ob (tmp, op);
525 op->randomitems = NULL; /* So another spell isn't created for this object */ 521 op->randomitems = NULL; /* So another spell isn't created for this object */
526 /* without this, value is all screwed up */ 522 /* without this, value is all screwed up */
527 op->value = op->arch->clone.value * op->inv->value; 523 op->value = op->arch->clone.value * op->inv->value;
528 } 524 }
… …
564 { 560 {
565 op->move_type = MOVE_ALL; 561 op->move_type = MOVE_ALL;
566 op->stats.maxhp = 0; 562 op->stats.maxhp = 0;
567 } 563 }
568 else 564 else
569 {
570 op->move_type = MOVE_WALK; 565 op->move_type = MOVE_WALK;
571 }
572 } 566 }
573 } 567 }
574 568
575} 569}
576 570
… …
713 tmp = arch_to_object (arch); 707 tmp = arch_to_object (arch);
714 else 708 else
715 { 709 {
716 tmp = object::create (); 710 tmp = object::create ();
717 /* record the name of the broken object */ 711 /* record the name of the broken object */
712 //TODO: but do not log???
718 tmp->name = str; 713 tmp->name = str;
719 } 714 }
720 715
721 // decativate the object we, as we are still going 716 // decativate the object we, as we are still going
722 // to read the speed value. Objects should be activated 717 // to read the speed value. Objects should be activated
… …
780 op->other_arch = archetype::find (thawer.get_str ()); 775 op->other_arch = archetype::find (thawer.get_str ());
781 break; 776 break;
782 777
783 case KW_animation: 778 case KW_animation:
784 { 779 {
780 CLEAR_FLAG (op, FLAG_ANIMATE);
781 op->animation_id = 0;
782
785 const char *str = thawer.get_str (); 783 const char *str = thawer.get_str ();
786
787 if (!str)
788 {
789 op->animation_id = 0;
790 CLEAR_FLAG (op, FLAG_ANIMATE);
791 }
792 else if ((op->animation_id = find_animation (str))) 784 if (str && (op->animation_id = find_animation (str)))
793 SET_FLAG (op, FLAG_ANIMATE); 785 SET_FLAG (op, FLAG_ANIMATE);
794 } 786 }
795
796 break; 787 break;
797 788
798 case KW_last_heal: thawer.get (op->last_heal); break; 789 case KW_last_heal: thawer.get (op->last_heal); break;
799 case KW_last_sp: thawer.get (op->last_sp); break; 790 case KW_last_sp: thawer.get (op->last_sp); break;
800 case KW_last_grace: thawer.get (op->last_grace); break; 791 case KW_last_grace: thawer.get (op->last_grace); break;
… …
865 case KW_path_denied: thawer.get (op->path_denied); break; 856 case KW_path_denied: thawer.get (op->path_denied); break;
866 case KW_invisible: thawer.get (op->invisible); break; 857 case KW_invisible: thawer.get (op->invisible); break;
867 case KW_magic: thawer.get (op->magic); break; 858 case KW_magic: thawer.get (op->magic); break;
868 case KW_state: thawer.get (op->state); break; 859 case KW_state: thawer.get (op->state); break;
869 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; 860 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break;
870 case KW_material: thawer.get (op->material); break; 861 case KW_material: thawer.get (op->materials); break; //TODO: nuke
871 case KW_materialname: thawer.get (op->materialname); break; 862 case KW_materialname: thawer.get (op->materialname); break;
872 863
873 /* These are the new values */ 864 /* These are the new values */
874 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; 865 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break;
875 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; 866 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break;
… …
1137 add_button_link (op, op->map, thawer.get_sint32 ()); 1128 add_button_link (op, op->map, thawer.get_sint32 ());
1138 break; 1129 break;
1139 1130
1140 case KW_randomitems: 1131 case KW_randomitems:
1141 op->randomitems = find_treasurelist (thawer.get_str ()); 1132 op->randomitems = find_treasurelist (thawer.get_str ());
1133 //if (!op->randomitems)
1134 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", op->debug_desc (), thawer.get_str ());
1142 break; 1135 break;
1143 1136
1144 case KW_msg: 1137 case KW_msg:
1145 thawer.get_ml (KW_endmsg, op->msg); 1138 thawer.get_ml (KW_endmsg, op->msg);
1146 //TODO: allow longer messages 1139 //TODO: allow longer messages
… …
1189 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 1182 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1190 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D 1183 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1191 break; 1184 break;
1192 1185
1193 default: 1186 default:
1194 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1187 if (!thawer.parse_error (kw, "object", op->name))
1188 return false;
1195 break; 1189 break;
1196 } 1190 }
1197 } 1191 }
1198} 1192}
1199 1193
… …
1533 f.put (resist_save[i], op->resist[i]); 1527 f.put (resist_save[i], op->resist[i]);
1534 1528
1535 CMP_OUT (path_attuned); 1529 CMP_OUT (path_attuned);
1536 CMP_OUT (path_repelled); 1530 CMP_OUT (path_repelled);
1537 CMP_OUT (path_denied); 1531 CMP_OUT (path_denied);
1538 CMP_OUT (material); 1532 CMP_OUT2 (material, materials);//TODO: nuke
1539 CMP_OUT (materialname); 1533 CMP_OUT (materialname);
1540 CMP_OUT (value); 1534 CMP_OUT (value);
1541 CMP_OUT (carrying); 1535 CMP_OUT (carrying);
1542 CMP_OUT (weight); 1536 CMP_OUT (weight);
1543 CMP_OUT (invisible); 1537 CMP_OUT (invisible);

Diff Legend

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