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.106 by root, Thu Apr 10 15:35:15 2008 UTC vs.
Revision 1.122 by root, Mon Sep 15 00:16:19 2008 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
… …
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27 23
28#include <global.h> 24#include <global.h>
29#include <loader.h> 25#include <loader.h>
30#include <sproto.h> 26#include <sproto.h>
31 27
… …
361 || type == AMULET || type == GIRDLE 357 || type == AMULET || type == GIRDLE
362 || type == BRACERS || type == CLOAK) 358 || type == BRACERS || type == CLOAK)
363 { 359 {
364 if (last_heal) 360 if (last_heal)
365 { 361 {
366 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 362 LOG (llevError, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
367 gen_sp_armour = last_heal; 363 gen_sp_armour = last_heal;
368 last_heal = 0; 364 last_heal = 0;
369 } 365 }
370 366
371 int ip = calc_item_power (this, 0); 367 int ip = calc_item_power (this, 0);
… …
389 if (ip > 2 * item_power && ip > (item_power + 3)) 385 if (ip > 2 * item_power && ip > (item_power + 3))
390 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 386 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
391#endif 387#endif
392 } 388 }
393 389
394 /* Old spellcasting object - need to load in the appropiate object */ 390 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
395 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 391 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
392 if ((type == ROD
393 || type == WAND
394 || type == SCROLL
395 || type == HORN
396 || type == FIREWALL
396 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 397 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 398 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
399 && !inv
400 && !loading_arch
401 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
402 // TODO: at least one watchout-comments is redundant - investigate/remove
398 { 403 {
404 // TODO: fix firewall object on map
399 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' 405 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
400 * in that spell was stored in sp. 406 * in that spell was stored in sp.
401 */ 407 */
408 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
402 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 409 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
403 insert_ob_in_ob (tmp, this); 410 insert_ob_in_ob (tmp, this);
404 randomitems = NULL; /* So another spell isn't created for this object */ 411 randomitems = 0;
405 } 412 }
406 413
407 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 414 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
408 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 415 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
409 { 416 {
417 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
410 object *tmp = get_archetype_by_object_name (slaying); 418 object *tmp = get_archetype_by_object_name (slaying);
411 insert_ob_in_ob (tmp, this); 419 insert_ob_in_ob (tmp, this);
412 randomitems = NULL; /* So another spell isn't created for this object */ 420 randomitems = 0; /* So another spell isn't created for this object */
413 /* without this, value is all screwed up */ 421 /* without this, value is all screwed up */
414 value = arch->value * inv->value; 422 value = arch->value * inv->value;
415 } 423 }
416 424
417 if (QUERY_FLAG (this, FLAG_MONSTER)) 425 if (QUERY_FLAG (this, FLAG_MONSTER))
418 { 426 {
419 if (stats.hp > stats.maxhp) 427 if (stats.hp > stats.maxhp)
420 { 428 {
421 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 429 LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
422 stats.maxhp = stats.hp; 430 stats.maxhp = stats.hp;
423 } 431 }
424 432
425 /* The archs just need to be updated for this */ 433 /* The archs just need to be updated for this */
426 if (move_type == 0) 434 if (move_type == 0)
427 move_type = MOVE_WALK; 435 move_type = MOVE_WALK;
428 } 436 }
429 437
430 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 438 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
431 {
432 /* Object will duplicate it's content as part of the 439 /* Object will duplicate it's content as part of the
433 * generation process. To do this, we must flag inventory 440 * generation process. To do this, we must flag inventory
434 * so it remains unevaluated concerning the randomitems and 441 * so it remains unevaluated concerning the randomitems and
435 * the living (a demonlord shouldn't cast from inside generator!) 442 * the living (a demonlord shouldn't cast from inside generator!)
436 */ 443 */
444 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
437 flag_inv (this, FLAG_IS_A_TEMPLATE); 445 flag_inv (this, FLAG_IS_A_TEMPLATE);
438 }
439 446
440 /* Handle player movers. We use move_type for player movers 447 /* Handle player movers. We use move_type for player movers
441 * because they operate on their own time (move_on 448 * because they operate on their own time (move_on
442 * would potentially cause them to be triggered when someone steps 449 * would potentially cause them to be triggered when someone steps
443 * on them). If move_type is set, presume person knows what they 450 * on them). If move_type is set, presume person knows what they
444 * are doing, otherwise, set move_type based on maxhp value. 451 * are doing, otherwise, set move_type based on maxhp value.
445 */ 452 */
446 if (type == PLAYERMOVER) 453 if (type == PLAYERMOVER)
447 { 454 {
448 if (!move_type) 455 if (!move_type)
… …
510 517
511 goto next; 518 goto next;
512 } 519 }
513 } 520 }
514 521
515 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 522 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
516 523
517next: ; 524next: ;
518 } 525 }
519} 526}
520 527
… …
522 529
523bool 530bool
524object::parse_kv (object_thawer &f) 531object::parse_kv (object_thawer &f)
525{ 532{
526 object *op_inv = inv; 533 object *op_inv = inv;
534 key_value *last_kv = key_values;
527 535
528 for (;;) 536 for (;;)
529 { 537 {
530 switch (f.kw) 538 switch (f.kw)
531 { 539 {
532 case KW_uuid: 540 case KW_uuid:
533 if (const char *s = f.get_str ()) 541 if (const char *s = f.get_str ())
534 { 542 if (!uuid.parse (s))
535 unsigned int version;
536 unsigned long long seq;
537
538 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
539 { 543 {
540 uuid.seq = seq; 544 f.parse_warn ("unparseable uuid");
541 break; 545 uuid = UUID::gen ();
542 } 546 }
543 }
544
545 uuid = UUID::gen ();
546 break; 547 break;
547 548
548 case KW_oid: 549 case KW_oid:
549 f.get (this, f.get_sint32 ()); 550 f.get (this, f.get_sint32 ());
550 break; 551 break;
… …
559 case KW_race: f.get_ornull (race); break; 560 case KW_race: f.get_ornull (race); break;
560 case KW_slaying: f.get_ornull (slaying); break; 561 case KW_slaying: f.get_ornull (slaying); break;
561 case KW_tag: f.get_ornull (tag); break; 562 case KW_tag: f.get_ornull (tag); break;
562 563
563 case KW_arch: 564 case KW_arch:
564 {
565 object *tmp = object::read (f); 565 if (object *tmp = object::read (f))
566 tmp->deactivate ();
567
568 { 566 {
567 tmp->deactivate ();
568
569 // was: insert_ob_in_ob (tmp, op); 569 // was: insert_ob_in_ob (tmp, op);
570 // but manually adding it can improve map loading times a lot 570 // but manually adding it can improve map loading times a lot
571 // also, appending instead of prepending keeps the 571 // also, appending instead of prepending keeps the
572 // save ordering the same between repeated load/saves. 572 // save ordering the same between repeated load/saves.
573 // and finally we do not want any funny effects 573 // and finally we do not want any funny effects
… …
590 590
591 tmp->below = 0; 591 tmp->below = 0;
592 tmp->env = this; 592 tmp->env = this;
593 op_inv = tmp; 593 op_inv = tmp;
594 } 594 }
595 } 595 else
596 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
597
596 continue; 598 continue;
597 599
598 case KW_other_arch: 600 case KW_other_arch:
599 other_arch =
600 loading_arch 601 if (loading_arch == this)
601 ? archetype::get (f.get_str ()) 602 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
603 else
604 {
602 : archetype::find (f.get_str ()); 605 other_arch = archetype::find (f.get_str ());
603 606
604 if (!other_arch) 607 if (!other_arch)
605 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 608 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
609 }
606 break; 610 break;
607 611
608 case KW_owner: 612 case KW_owner:
609 f.delayed_deref (this, owner, f.get_str ()); 613 f.delayed_deref (this, owner, f.get_str ());
610 break; 614 break;
… …
614 CLEAR_FLAG (this, FLAG_ANIMATE); 618 CLEAR_FLAG (this, FLAG_ANIMATE);
615 animation_id = 0; 619 animation_id = 0;
616 620
617 const char *str = f.get_str (); 621 const char *str = f.get_str ();
618 if (str && (animation_id = find_animation (str))) 622 if (str && (animation_id = find_animation (str)))
619 SET_FLAG (this, FLAG_ANIMATE); 623 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
620 } 624 }
621 break; 625 break;
622 626
623 case KW_last_heal: f.get (last_heal); break; 627 case KW_last_heal: f.get (last_heal); break;
624 case KW_last_sp: f.get (last_sp); break; 628 case KW_last_sp: f.get (last_sp); break;
… …
813 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 817 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
814 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 818 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
815 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 819 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
816 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 820 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
817 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 821 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
822 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
818 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 823 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
819 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 824 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
820 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 825 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
821 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 826 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
822 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 827 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
927 case KW_expmul: f.get (expmul); break; 932 case KW_expmul: f.get (expmul); break;
928 case KW_glow_radius: f.get (glow_radius); break; 933 case KW_glow_radius: f.get (glow_radius); break;
929 case KW_weapontype: f.get (weapontype); break; 934 case KW_weapontype: f.get (weapontype); break;
930 case KW_tooltype: f.get (tooltype); break; 935 case KW_tooltype: f.get (tooltype); break;
931 case KW_casting_time: f.get (casting_time); break; 936 case KW_casting_time: f.get (casting_time); break;
937
938 // elevation is deprecated
932 case KW_elevation: f.get (elevation); break; 939 case KW_elevation: break;
940
933 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 941 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
934 case KW_client_type: f.get (client_type); break; 942 case KW_client_type: f.get (client_type); break;
935 case KW_duration: f.get (duration); break; 943 case KW_duration: f.get (duration); break;
936 case KW_range: f.get (range); break; 944 case KW_range: f.get (range); break;
937 case KW_range_modifier: f.get (range_modifier); break; 945 case KW_range_modifier: f.get (range_modifier); break;
… …
994 1002
995 f.next (); 1003 f.next ();
996 return true; 1004 return true;
997 1005
998 case KW_ERROR: 1006 case KW_ERROR:
999 set_ob_key_value (this, f.kw_str, f.value, true); 1007 // append as key value pair (do not use kv_set as it prepends)
1008 // we also do not even try to find old values, duplicate keys stay duplicate
1009 {
1010 key_value *kv = new key_value;
1011
1012 kv->next = 0;
1013 kv->key = shstr (f.kw_str);
1014 kv->value = shstr (f.value);
1015
1016 if (!last_kv)
1017 key_values = last_kv = kv;
1018 else
1019 {
1020 while (last_kv->next)
1021 last_kv = last_kv->next;
1022
1023 last_kv->next = kv;
1024 last_kv = kv;
1025 }
1026 }
1000 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1027 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1001 break; 1028 break;
1002 1029
1003 default: 1030 default:
1004 if (!f.parse_error ("object", name)) 1031 if (!f.parse_error ("object", name))
… …
1025 1052
1026 assert (arch); //D maybe use exception handling of sorts? 1053 assert (arch); //D maybe use exception handling of sorts?
1027 1054
1028 f.next (); 1055 f.next ();
1029 1056
1030 object *op = object::create (); 1057 object *op = arch->instance ();
1031
1032 op->map = map; 1058 op->map = map;
1033 arch->copy_to (op);
1034 // copy_to activates, this should be fixed properly 1059 // instance() activates, this should be fixed properly
1035 op->deactivate (); 1060 op->deactivate ();
1036 1061
1037 if (!op->parse_kv (f)) 1062 if (!op->parse_kv (f))
1038 { 1063 {
1039 op->destroy (true); 1064 op->destroy (true);
… …
1249 /* 110 */ 1274 /* 110 */
1250 KW_destroy_on_death, 1275 KW_destroy_on_death,
1251 KW_NULL, 1276 KW_NULL,
1252 }; 1277 };
1253 1278
1254 int i;
1255
1256 /* This saves the key/value lists. We do it first so that any 1279 /* This saves the key/value lists. We do it first so that any
1257 * keys that match field names will be overwritten by the loader. 1280 * keys that match field names will be overwritten by the loader.
1258 */ 1281 */
1259 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1282 for (key_value *kv = op->key_values; kv; kv = kv->next)
1260 { 1283 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1261 /* Find the field in the opposing member. */ 1284 f.put (kv->key, kv->value);
1262 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1263
1264 /* If there's no partnering field, or it's got a different value, save our field. */
1265 if (!arch_field || my_field->value != arch_field->value)
1266 f.put (my_field->key, my_field->value);
1267 }
1268 1285
1269 /* We don't need to worry about the arch's extra fields - they 1286 /* We don't need to worry about the arch's extra fields - they
1270 * will get taken care of the copy_to method. 1287 * will get taken care of the copy_to method.
1271 */ 1288 */
1272 1289
1273 { 1290 f.put (KW_uuid, op->uuid.c_str ());
1274 char uids[64];
1275 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1276 f.put (KW_uuid, (const char *)uids);
1277 }
1278 1291
1279#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1292#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1280#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1293#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1281 1294
1282 if (object *owner = op->owner) 1295 if (object *owner = op->owner)
… …
1285 CMP_OUT (name); 1298 CMP_OUT (name);
1286 CMP_OUT (name_pl); 1299 CMP_OUT (name_pl);
1287 CMP_OUT (custom_name); 1300 CMP_OUT (custom_name);
1288 CMP_OUT (title); 1301 CMP_OUT (title);
1289 CMP_OUT (race); 1302 CMP_OUT (race);
1303 CMP_OUT (skill);
1290 CMP_OUT (slaying); 1304 CMP_OUT (slaying);
1291 CMP_OUT (tag); 1305 CMP_OUT (tag);
1292 CMP_OUT (other_arch); 1306 CMP_OUT (other_arch);
1293 1307
1294 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1308 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
… …
1298 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1312 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1299 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1313 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1300 1314
1301 if (op->animation_id != tmp->animation_id) 1315 if (op->animation_id != tmp->animation_id)
1302 if (op->animation_id) 1316 if (op->animation_id)
1317 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1318 else
1303 { 1319 {
1304 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1320 f.put (KW_animation, (const char *)0);
1305 1321 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1306 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1307 f.put (KW_is_animated, (sint32)0);
1308 } 1322 }
1309 else
1310 f.put (KW_animation, (const char *)0);
1311 1323
1312 CMP_OUT2 (str, stats.Str); 1324 CMP_OUT2 (str, stats.Str);
1313 CMP_OUT2 (dex, stats.Dex); 1325 CMP_OUT2 (dex, stats.Dex);
1314 CMP_OUT2 (con, stats.Con); 1326 CMP_OUT2 (con, stats.Con);
1315 CMP_OUT2 (wis, stats.Wis); 1327 CMP_OUT2 (wis, stats.Wis);
… …
1345 CMP_OUT (direction); 1357 CMP_OUT (direction);
1346 CMP_OUT (type); 1358 CMP_OUT (type);
1347 CMP_OUT (subtype); 1359 CMP_OUT (subtype);
1348 CMP_OUT (attacktype); 1360 CMP_OUT (attacktype);
1349 1361
1350 for (i = 0; i < NROFATTACKS; i++) 1362 for (int i = 0; i < NROFATTACKS; i++)
1351 if (expect_false (op->resist[i] != tmp->resist[i])) 1363 if (expect_false (op->resist[i] != tmp->resist[i]))
1352 f.put (resist_save[i], op->resist[i]); 1364 f.put (resist_save[i], op->resist[i]);
1353 1365
1354 CMP_OUT (path_attuned); 1366 CMP_OUT (path_attuned);
1355 CMP_OUT (path_repelled); 1367 CMP_OUT (path_repelled);
… …
1366 CMP_OUT (last_sp); 1378 CMP_OUT (last_sp);
1367 CMP_OUT (last_grace); 1379 CMP_OUT (last_grace);
1368 CMP_OUT (last_eat); 1380 CMP_OUT (last_eat);
1369 CMP_OUT (glow_radius); 1381 CMP_OUT (glow_radius);
1370 1382
1371 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1383 if (op->flag [FLAG_IS_LINKED])
1384 if (int i = get_button_value (op))
1372 f.put (KW_connected, i); 1385 f.put (KW_connected, i);
1373 1386
1374 CMP_OUT (randomitems); 1387 CMP_OUT (randomitems);
1375 CMP_OUT2 (container, weight_limit); 1388 CMP_OUT2 (container, weight_limit);
1376 1389
1377 CMP_OUT (run_away); 1390 CMP_OUT (run_away);
1378 CMP_OUT (pick_up); 1391 CMP_OUT (pick_up);
1379 CMP_OUT (will_apply); 1392 CMP_OUT (will_apply);
1380 CMP_OUT (smoothlevel); 1393 CMP_OUT (smoothlevel);
1381 CMP_OUT (weapontype); 1394 CMP_OUT (weapontype);
1382 CMP_OUT (tooltype); 1395 CMP_OUT (tooltype);
1383 CMP_OUT (elevation);
1384 CMP_OUT (client_type); 1396 CMP_OUT (client_type);
1385 CMP_OUT (item_power); 1397 CMP_OUT (item_power);
1386 CMP_OUT (duration); 1398 CMP_OUT (duration);
1387 CMP_OUT (range); 1399 CMP_OUT (range);
1388 CMP_OUT (range_modifier); 1400 CMP_OUT (range_modifier);
… …
1397 CMP_OUT (move_off); 1409 CMP_OUT (move_off);
1398 CMP_OUT (move_slow); 1410 CMP_OUT (move_slow);
1399 CMP_OUT (move_slow_penalty); 1411 CMP_OUT (move_slow_penalty);
1400 1412
1401 if (op->flag != tmp->flag) 1413 if (op->flag != tmp->flag)
1402 for (i = 0; i <= NUM_FLAGS; i++) 1414 for (int i = 0; i <= NUM_FLAGS; i++)
1403 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1415 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1404 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1416 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1405 1417
1406 // save body locations 1418 // save body locations
1407 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1419 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1408 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1420 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1409 f.put (body_locations[i].save_name, op->slot[i].info); 1421 f.put (body_locations[i].save_name, op->slot[i].info);
1410} 1422}
1411 1423
1412/* 1424/*
… …
1415 * the only place this is not set is when saving the player. 1427 * the only place this is not set is when saving the player.
1416 */ 1428 */
1417bool 1429bool
1418object::write (object_freezer &f) 1430object::write (object_freezer &f)
1419{ 1431{
1420 archetype *at = arch ? (archetype *)arch : empty_archetype; 1432 archetype *at = arch ? arch : archetype::empty;
1421 1433
1422 f.put (KW_arch, at->archname); 1434 f.put (KW_arch, at->archname);
1423 write_diff (f, this, at); 1435 write_diff (f, this, at);
1424 1436
1425 for (object *tmp = inv; tmp; tmp = tmp->below) 1437 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
1433 1445
1434///////////////////////////////////////////////////////////////////////////// 1446/////////////////////////////////////////////////////////////////////////////
1435 1447
1436// generic resource file load, 1448// generic resource file load,
1437// currently supports: region, treasures, archetypes 1449// currently supports: region, treasures, archetypes
1450bool
1438bool load_resource_file (const char *filename) 1451load_resource_file_ (const char *filename)
1439{ 1452{
1440 object_thawer f (filename); 1453 object_thawer f (filename);
1441
1442 bool success = false;
1443 bool seen_arch = false;
1444 1454
1445 for (;;) 1455 for (;;)
1446 { 1456 {
1447 switch (f.kw) 1457 switch (f.kw)
1448 { 1458 {
1449 case KW_region: 1459 case KW_region:
1450 if (!region::read (f)) 1460 if (!region::read (f))
1451 goto finish; 1461 return false;
1452 break; 1462 break;
1453 1463
1454 case KW_treasure: 1464 case KW_treasure:
1455 case KW_treasureone: 1465 case KW_treasureone:
1456 if (!treasurelist::read (f)) 1466 if (!treasurelist::read (f))
1457 goto finish; 1467 return false;
1458 break; 1468 break;
1459 1469
1460 case KW_object: 1470 case KW_object:
1461 seen_arch = true;
1462 if (!archetype::read (f)) 1471 if (!archetype::read (f))
1463 goto finish; 1472 return false;
1464 break; 1473 break;
1465 1474
1466 case KW_EOF: 1475 case KW_EOF:
1467 success = true; 1476 return true;
1468 goto finish;
1469 1477
1470 default: 1478 default:
1471 if (!f.parse_error ("resource file")) 1479 if (!f.parse_error ("resource file"))
1472 goto finish; 1480 return false;
1473 1481
1474 f.next (); 1482 f.next ();
1475 break; 1483 break;
1476 } 1484 }
1477 } 1485 }
1478
1479finish:
1480 if (seen_arch)
1481 init_archetype_pointers ();
1482
1483 return success;
1484} 1486}
1485 1487

Diff Legend

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