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.49 by root, Fri Jan 19 17:54:15 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 virtual archetype *get_arch (const char *name);
38 virtual void put_arch (archetype *arch);
39 34
40 virtual object *get_object (const char *name); 35loader_base::~loader_base ()
41 virtual void put_object (object *op); 36{
37}
42 38
43 virtual player *get_player (); 39// the base class warns about and skips everything
44 virtual void put_player (player *pl); 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 45
46 virtual region *get_region (); 46 return new archetype;
47 virtual void put_region (region *region); 47}
48 48
49 virtual facetile *get_face (const char *name); 49object *
50 virtual void put_face (facetile *face); 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);
51 54
52 virtual treasurelist *get_treasure (const char *name, bool one = false); 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
53 virtual void put_treasure (treasurelist *treasure); 134loader_base::put_treasure (treasurelist *treasure)
54
55 virtual animation *get_animation (const char *name);
56 virtual void put_animation (animation *anim);
57};
58
59// future generic resource loader
60// handles generic stuff valid in most files, such as
61// animations, treasures, faces and so on
62struct loader_generic : loader_base
63{ 135{
64 virtual region *get_region (); 136 delete treasure;
65 virtual void put_region (region *region); 137}
66 138
67 virtual facetile *get_face (const char *name); 139void
68 virtual void put_face (facetile *face); 140loader_base::put_animation (animation *anim)
141{
142 delete anim;
143}
69 144
70 virtual treasurelist *get_treasure (const char *name, bool one = false); 145/////////////////////////////////////////////////////////////////////////////
71 virtual void put_treasure (treasurelist *treasure);
72 146
73 virtual animation *get_animation (const char *name); 147bool loader_base::parse (object_thawer &thawer)
74 virtual void put_animation (animation *anim); 148{
75}; 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/////////////////////////////////////////////////////////////////////////////
76 192
77/* Maps the MOVE_* values to names */ 193/* Maps the MOVE_* values to names */
78static 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 };
79 195
80/* 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
… …
305 * 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.
306 */ 422 */
307static void 423static void
308check_loaded_object (object *op) 424check_loaded_object (object *op)
309{ 425{
310 int ip;
311
312 /* 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.
313 * 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 -
314 * 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
315 * 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
316 * 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
317 * 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.
318 * Otherwise, what happens is that the the plural name will lose 432 * Otherwise, what happens is that the the plural name will lose
319 * information (appear as just 'hearts' and not 'goblins heart') 433 * information (appear as just 'hearts' and not 'goblins heart')
320 */ 434 */
321 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)
322 op->name_pl = NULL; 436 op->name_pl = 0;
323 437
324 if (!op->name_pl) 438 if (!op->name_pl)
325 op->name_pl = op->name; 439 op->name_pl = op->name;
326 440
327 /* objects now have a materialname. try to patch it in */ 441 /* objects now have a materialname. try to patch it in */
… …
330 if (op->map != NULL) 444 if (op->map != NULL)
331 set_materialname (op, op->map->difficulty, NULL); 445 set_materialname (op, op->map->difficulty, NULL);
332 else 446 else
333 set_materialname (op, 5, NULL); 447 set_materialname (op, 5, NULL);
334 } 448 }
449
335 /* only do these when program is first run - a bit 450 /* only do these when program is first run - a bit
336 * excessive to do this at every run - most of this is 451 * excessive to do this at every run - most of this is
337 * really just to catch any errors - program will still run, but 452 * really just to catch any errors - program will still run, but
338 * not in the ideal fashion. 453 * not in the ideal fashion.
339 */ 454 */
340 if ((op->type == WEAPON || op->type == BOW) && arch_init) 455 if ((op->type == WEAPON || op->type == BOW) && arch_init)
341 { 456 {
342 if (!op->skill) 457 if (!op->skill)
343 {
344 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 458 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
345 }
346 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) ||
347 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 460 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
348 {
349 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);
350 }
351 } 462 }
352 463
353 /* 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
354 * really does for many objects. Need to catch any in maps 465 * really does for many objects. Need to catch any in maps
355 * that may have an old value. 466 * that may have an old value.
356 */ 467 */
357 if ((op->type == WEAPON) || 468 if (op->type == WEAPON
358 (op->type == ARMOUR) || (op->type == HELMET) || 469 || op->type == ARMOUR || op->type == HELMET
359 (op->type == SHIELD) || (op->type == RING) || 470 || op->type == SHIELD || op->type == RING
360 (op->type == BOOTS) || (op->type == GLOVES) || 471 || op->type == BOOTS || op->type == GLOVES
361 (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)
362 { 474 {
363 if (op->last_heal) 475 if (op->last_heal)
364 { 476 {
365 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 ());
366 op->gen_sp_armour = op->last_heal; 478 op->gen_sp_armour = op->last_heal;
367 op->last_heal = 0; 479 op->last_heal = 0;
368 } 480 }
369 481
370 ip = calc_item_power (op, 0); 482 int ip = calc_item_power (op, 0);
483
371 /* Legacy objects from before item power was in the game */ 484 /* Legacy objects from before item power was in the game */
372 if (!op->item_power && ip) 485 if (!op->item_power && ip)
373 { 486 {
374 if (ip > 3) 487 if (ip > 3)
375 {
376 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);
377 } 489
378 op->item_power = ip; 490 op->item_power = ip;
379 } 491 }
492
380 /* Check for possibly bogus values. Has to meet both these criteria - 493 /* Check for possibly bogus values. Has to meet both these criteria -
381 * 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
382 * 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.
383 * 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,
384 * but not the second one. 497 * but not the second one.
385 */ 498 */
386 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 499 if (ip > 2 * op->item_power && ip > (op->item_power + 3))
387 {
388 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);
389 }
390
391 } 501 }
502
392 /* Old spellcasting object - need to load in the appropiate object */ 503 /* Old spellcasting object - need to load in the appropiate object */
393 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 ||
394 /* 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 */
395 ((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)
396 { 507 {
397 object *tmp;
398
399 /* 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'
400 * in that spell was stored in sp. 509 * in that spell was stored in sp.
401 */ 510 */
402 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]);
403 insert_ob_in_ob (tmp, op); 512 insert_ob_in_ob (tmp, op);
404 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 */
405 } 514 }
515
406 /* 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 */
407
408 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)
409 { 518 {
410 object *tmp;
411
412 tmp = get_archetype_by_object_name (op->slaying); 519 object *tmp = get_archetype_by_object_name (op->slaying);
413 insert_ob_in_ob (tmp, op); 520 insert_ob_in_ob (tmp, op);
414 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 */
415 /* without this, value is all screwed up */ 522 /* without this, value is all screwed up */
416 op->value = op->arch->clone.value * op->inv->value; 523 op->value = op->arch->clone.value * op->inv->value;
417 } 524 }
… …
453 { 560 {
454 op->move_type = MOVE_ALL; 561 op->move_type = MOVE_ALL;
455 op->stats.maxhp = 0; 562 op->stats.maxhp = 0;
456 } 563 }
457 else 564 else
458 {
459 op->move_type = MOVE_WALK; 565 op->move_type = MOVE_WALK;
460 }
461 } 566 }
462 } 567 }
463 568
464} 569}
465 570
… …
602 tmp = arch_to_object (arch); 707 tmp = arch_to_object (arch);
603 else 708 else
604 { 709 {
605 tmp = object::create (); 710 tmp = object::create ();
606 /* record the name of the broken object */ 711 /* record the name of the broken object */
712 //TODO: but do not log???
607 tmp->name = str; 713 tmp->name = str;
608 } 714 }
609 715
610 // decativate the object we, as we are still going 716 // decativate the object we, as we are still going
611 // to read the speed value. Objects should be activated 717 // to read the speed value. Objects should be activated
… …
669 op->other_arch = archetype::find (thawer.get_str ()); 775 op->other_arch = archetype::find (thawer.get_str ());
670 break; 776 break;
671 777
672 case KW_animation: 778 case KW_animation:
673 { 779 {
780 CLEAR_FLAG (op, FLAG_ANIMATE);
781 op->animation_id = 0;
782
674 const char *str = thawer.get_str (); 783 const char *str = thawer.get_str ();
675
676 if (!str)
677 {
678 op->animation_id = 0;
679 CLEAR_FLAG (op, FLAG_ANIMATE);
680 }
681 else if ((op->animation_id = find_animation (str))) 784 if (str && (op->animation_id = find_animation (str)))
682 SET_FLAG (op, FLAG_ANIMATE); 785 SET_FLAG (op, FLAG_ANIMATE);
683 } 786 }
684
685 break; 787 break;
686 788
687 case KW_last_heal: thawer.get (op->last_heal); break; 789 case KW_last_heal: thawer.get (op->last_heal); break;
688 case KW_last_sp: thawer.get (op->last_sp); break; 790 case KW_last_sp: thawer.get (op->last_sp); break;
689 case KW_last_grace: thawer.get (op->last_grace); break; 791 case KW_last_grace: thawer.get (op->last_grace); break;
… …
754 case KW_path_denied: thawer.get (op->path_denied); break; 856 case KW_path_denied: thawer.get (op->path_denied); break;
755 case KW_invisible: thawer.get (op->invisible); break; 857 case KW_invisible: thawer.get (op->invisible); break;
756 case KW_magic: thawer.get (op->magic); break; 858 case KW_magic: thawer.get (op->magic); break;
757 case KW_state: thawer.get (op->state); break; 859 case KW_state: thawer.get (op->state); break;
758 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;
759 case KW_material: thawer.get (op->material); break; 861 case KW_material: thawer.get (op->materials); break; //TODO: nuke
760 case KW_materialname: thawer.get (op->materialname); break; 862 case KW_materialname: thawer.get (op->materialname); break;
761 863
762 /* These are the new values */ 864 /* These are the new values */
763 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;
764 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;
… …
1026 add_button_link (op, op->map, thawer.get_sint32 ()); 1128 add_button_link (op, op->map, thawer.get_sint32 ());
1027 break; 1129 break;
1028 1130
1029 case KW_randomitems: 1131 case KW_randomitems:
1030 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 ());
1031 break; 1135 break;
1032 1136
1033 case KW_msg: 1137 case KW_msg:
1034 thawer.get_ml (KW_endmsg, op->msg); 1138 thawer.get_ml (KW_endmsg, op->msg);
1035 //TODO: allow longer messages 1139 //TODO: allow longer messages
… …
1078 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);
1079 //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
1080 break; 1184 break;
1081 1185
1082 default: 1186 default:
1083 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;
1084 break; 1189 break;
1085 } 1190 }
1086 } 1191 }
1087} 1192}
1088 1193
… …
1422 f.put (resist_save[i], op->resist[i]); 1527 f.put (resist_save[i], op->resist[i]);
1423 1528
1424 CMP_OUT (path_attuned); 1529 CMP_OUT (path_attuned);
1425 CMP_OUT (path_repelled); 1530 CMP_OUT (path_repelled);
1426 CMP_OUT (path_denied); 1531 CMP_OUT (path_denied);
1427 CMP_OUT (material); 1532 CMP_OUT2 (material, materials);//TODO: nuke
1428 CMP_OUT (materialname); 1533 CMP_OUT (materialname);
1429 CMP_OUT (value); 1534 CMP_OUT (value);
1430 CMP_OUT (carrying); 1535 CMP_OUT (carrying);
1431 CMP_OUT (weight); 1536 CMP_OUT (weight);
1432 CMP_OUT (invisible); 1537 CMP_OUT (invisible);

Diff Legend

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