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.47 by root, Thu Jan 18 19:42:09 2007 UTC vs.
Revision 1.58 by root, Thu Feb 15 21:07:48 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>
32
33/////////////////////////////////////////////////////////////////////////////
33 34
34/* Maps the MOVE_* values to names */ 35/* Maps the MOVE_* values to names */
35static 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 };
36 37
37/* 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
… …
262 * 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.
263 */ 264 */
264static void 265static void
265check_loaded_object (object *op) 266check_loaded_object (object *op)
266{ 267{
267 int ip;
268
269 /* 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.
270 * 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 -
271 * 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
272 * 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
273 * 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
274 * 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.
275 * Otherwise, what happens is that the the plural name will lose 274 * Otherwise, what happens is that the the plural name will lose
276 * information (appear as just 'hearts' and not 'goblins heart') 275 * information (appear as just 'hearts' and not 'goblins heart')
277 */ 276 */
278 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)
279 op->name_pl = NULL; 278 op->name_pl = 0;
280 279
281 if (!op->name_pl) 280 if (!op->name_pl)
282 op->name_pl = op->name; 281 op->name_pl = op->name;
283 282
284 /* objects now have a materialname. try to patch it in */ 283 /* objects now have a materialname. try to patch it in */
… …
287 if (op->map != NULL) 286 if (op->map != NULL)
288 set_materialname (op, op->map->difficulty, NULL); 287 set_materialname (op, op->map->difficulty, NULL);
289 else 288 else
290 set_materialname (op, 5, NULL); 289 set_materialname (op, 5, NULL);
291 } 290 }
291
292 /* only do these when program is first run - a bit 292 /* only do these when program is first run - a bit
293 * excessive to do this at every run - most of this is 293 * excessive to do this at every run - most of this is
294 * really just to catch any errors - program will still run, but 294 * really just to catch any errors - program will still run, but
295 * not in the ideal fashion. 295 * not in the ideal fashion.
296 */ 296 */
297 if ((op->type == WEAPON || op->type == BOW) && arch_init) 297 if ((op->type == WEAPON || op->type == BOW) && arch_init)
298 { 298 {
299 if (!op->skill) 299 if (!op->skill)
300 {
301 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 300 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
302 }
303 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) ||
304 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 302 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
305 {
306 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);
307 }
308 } 304 }
309 305
310 /* 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
311 * really does for many objects. Need to catch any in maps 307 * really does for many objects. Need to catch any in maps
312 * that may have an old value. 308 * that may have an old value.
313 */ 309 */
314 if ((op->type == WEAPON) || 310 if (op->type == WEAPON
315 (op->type == ARMOUR) || (op->type == HELMET) || 311 || op->type == ARMOUR || op->type == HELMET
316 (op->type == SHIELD) || (op->type == RING) || 312 || op->type == SHIELD || op->type == RING
317 (op->type == BOOTS) || (op->type == GLOVES) || 313 || op->type == BOOTS || op->type == GLOVES
318 (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)
319 { 316 {
320 if (op->last_heal) 317 if (op->last_heal)
321 { 318 {
322 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 ());
323 op->gen_sp_armour = op->last_heal; 320 op->gen_sp_armour = op->last_heal;
324 op->last_heal = 0; 321 op->last_heal = 0;
325 } 322 }
326 323
327 ip = calc_item_power (op, 0); 324 int ip = calc_item_power (op, 0);
325
328 /* Legacy objects from before item power was in the game */ 326 /* Legacy objects from before item power was in the game */
329 if (!op->item_power && ip) 327 if (!op->item_power && ip)
330 { 328 {
331 if (ip > 3) 329 if (ip > 3)
332 {
333 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);
334 } 331
335 op->item_power = ip; 332 op->item_power = ip;
336 } 333 }
334
337 /* Check for possibly bogus values. Has to meet both these criteria - 335 /* Check for possibly bogus values. Has to meet both these criteria -
338 * 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
339 * 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.
340 * 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,
341 * but not the second one. 339 * but not the second one.
342 */ 340 */
343 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 341 if (ip > 2 * op->item_power && ip > (op->item_power + 3))
344 {
345 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);
346 }
347
348 } 343 }
344
349 /* Old spellcasting object - need to load in the appropiate object */ 345 /* Old spellcasting object - need to load in the appropiate object */
350 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 ||
351 /* 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 */
352 ((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)
353 { 349 {
354 object *tmp;
355
356 /* 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'
357 * in that spell was stored in sp. 351 * in that spell was stored in sp.
358 */ 352 */
359 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]);
360 insert_ob_in_ob (tmp, op); 354 insert_ob_in_ob (tmp, op);
361 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 */
362 } 356 }
357
363 /* 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 */
364
365 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)
366 { 360 {
367 object *tmp;
368
369 tmp = get_archetype_by_object_name (op->slaying); 361 object *tmp = get_archetype_by_object_name (op->slaying);
370 insert_ob_in_ob (tmp, op); 362 insert_ob_in_ob (tmp, op);
371 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 */
372 /* without this, value is all screwed up */ 364 /* without this, value is all screwed up */
373 op->value = op->arch->clone.value * op->inv->value; 365 op->value = op->arch->clone.value * op->inv->value;
374 } 366 }
375 367
376 if (QUERY_FLAG (op, FLAG_MONSTER)) 368 if (QUERY_FLAG (op, FLAG_MONSTER))
377 { 369 {
378 if (op->stats.hp > op->stats.maxhp) 370 if (op->stats.hp > op->stats.maxhp)
371 {
379 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 372 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);
373 op->stats.maxhp = op->stats.hp;
374 }
380 375
381 /* The archs just need to be updated for this */ 376 /* The archs just need to be updated for this */
382 if (op->move_type == 0) 377 if (op->move_type == 0)
383 op->move_type = MOVE_WALK; 378 op->move_type = MOVE_WALK;
384 } 379 }
… …
407 { 402 {
408 op->move_type = MOVE_ALL; 403 op->move_type = MOVE_ALL;
409 op->stats.maxhp = 0; 404 op->stats.maxhp = 0;
410 } 405 }
411 else 406 else
412 {
413 op->move_type = MOVE_WALK; 407 op->move_type = MOVE_WALK;
414 }
415 } 408 }
416 } 409 }
417 410
418} 411}
419 412
… …
493 bool ismore = 0; 486 bool ismore = 0;
494 object *op_inv = op->inv; 487 object *op_inv = op->inv;
495 488
496 for (;;) 489 for (;;)
497 { 490 {
498 keyword kw = thawer.get_kv (); 491 switch (thawer.get_kv ())
499
500 switch (kw)
501 { 492 {
502 case KW_Object: // uppercase alias 493 case KW_Object: // uppercase alias
503 case KW_object: 494 case KW_object:
504 thawer.get (op->name); 495 thawer.get (op->name);
505 496
… …
556 tmp = arch_to_object (arch); 547 tmp = arch_to_object (arch);
557 else 548 else
558 { 549 {
559 tmp = object::create (); 550 tmp = object::create ();
560 /* record the name of the broken object */ 551 /* record the name of the broken object */
552 //TODO: but do not log???
561 tmp->name = str; 553 tmp->name = str;
562 } 554 }
563 555
564 // decativate the object we, as we are still going 556 // decativate the object we, as we are still going
565 // to read the speed value. Objects should be activated 557 // to read the speed value. Objects should be activated
… …
623 op->other_arch = archetype::find (thawer.get_str ()); 615 op->other_arch = archetype::find (thawer.get_str ());
624 break; 616 break;
625 617
626 case KW_animation: 618 case KW_animation:
627 { 619 {
620 CLEAR_FLAG (op, FLAG_ANIMATE);
621 op->animation_id = 0;
622
628 const char *str = thawer.get_str (); 623 const char *str = thawer.get_str ();
629
630 if (!str)
631 {
632 op->animation_id = 0;
633 CLEAR_FLAG (op, FLAG_ANIMATE);
634 }
635 else if ((op->animation_id = find_animation (str))) 624 if (str && (op->animation_id = find_animation (str)))
636 SET_FLAG (op, FLAG_ANIMATE); 625 SET_FLAG (op, FLAG_ANIMATE);
637 } 626 }
638
639 break; 627 break;
640 628
641 case KW_last_heal: thawer.get (op->last_heal); break; 629 case KW_last_heal: thawer.get (op->last_heal); break;
642 case KW_last_sp: thawer.get (op->last_sp); break; 630 case KW_last_sp: thawer.get (op->last_sp); break;
643 case KW_last_grace: thawer.get (op->last_grace); break; 631 case KW_last_grace: thawer.get (op->last_grace); break;
… …
708 case KW_path_denied: thawer.get (op->path_denied); break; 696 case KW_path_denied: thawer.get (op->path_denied); break;
709 case KW_invisible: thawer.get (op->invisible); break; 697 case KW_invisible: thawer.get (op->invisible); break;
710 case KW_magic: thawer.get (op->magic); break; 698 case KW_magic: thawer.get (op->magic); break;
711 case KW_state: thawer.get (op->state); break; 699 case KW_state: thawer.get (op->state); break;
712 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;
713 case KW_material: thawer.get (op->material); break; 701 case KW_material: thawer.get (op->materials); break; //TODO: nuke
714 case KW_materialname: thawer.get (op->materialname); break; 702 case KW_materialname: thawer.get (op->materialname); break;
715 703
716 /* These are the new values */ 704 /* These are the new values */
717 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;
718 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;
… …
980 add_button_link (op, op->map, thawer.get_sint32 ()); 968 add_button_link (op, op->map, thawer.get_sint32 ());
981 break; 969 break;
982 970
983 case KW_randomitems: 971 case KW_randomitems:
984 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 ());
985 break; 975 break;
986 976
987 case KW_msg: 977 case KW_msg:
988 thawer.get_ml (KW_endmsg, op->msg); 978 thawer.get_ml (KW_endmsg, op->msg);
989 //TODO: allow longer messages 979 //TODO: allow longer messages
… …
1027 1017
1028 case KW_EOF: 1018 case KW_EOF:
1029 return LL_EOF; 1019 return LL_EOF;
1030 1020
1031 case KW_ERROR: 1021 case KW_ERROR:
1032 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 1022 set_ob_key_value (op, thawer.kw_str, thawer.value, true);
1033 //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
1034 break; 1024 break;
1035 1025
1036 default: 1026 default:
1037 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;
1038 break; 1029 break;
1039 } 1030 }
1040 } 1031 }
1041} 1032}
1042 1033
… …
1376 f.put (resist_save[i], op->resist[i]); 1367 f.put (resist_save[i], op->resist[i]);
1377 1368
1378 CMP_OUT (path_attuned); 1369 CMP_OUT (path_attuned);
1379 CMP_OUT (path_repelled); 1370 CMP_OUT (path_repelled);
1380 CMP_OUT (path_denied); 1371 CMP_OUT (path_denied);
1381 CMP_OUT (material); 1372 CMP_OUT2 (material, materials);//TODO: nuke
1382 CMP_OUT (materialname); 1373 CMP_OUT (materialname);
1383 CMP_OUT (value); 1374 CMP_OUT (value);
1384 CMP_OUT (carrying); 1375 CMP_OUT (carrying);
1385 CMP_OUT (weight); 1376 CMP_OUT (weight);
1386 CMP_OUT (invisible); 1377 CMP_OUT (invisible);
… …
1463 1454
1464 fp.put (op); 1455 fp.put (op);
1465 fp.put (KW_end); 1456 fp.put (KW_end);
1466} 1457}
1467 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