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.108 by elmex, Sun Apr 13 13:32:48 2008 UTC vs.
Revision 1.126 by root, Thu Jan 1 11:41:17 2009 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
… …
261void 257void
262object::post_load_check () 258object::post_load_check ()
263{ 259{
264 if (type >= NUM_TYPES) 260 if (type >= NUM_TYPES)
265 { 261 {
266 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); 262 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
267 type = 0; 263 type = 0;
268 } 264 }
269 265
270 switch (type) 266 switch (type)
271 { 267 {
… …
273 case WAND: 269 case WAND:
274 case ROD: 270 case ROD:
275 case HORN: 271 case HORN:
276 if (slot [body_range].info != -1) 272 if (slot [body_range].info != -1)
277 { 273 {
278 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); 274 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
279 slot [body_range].info = -1; 275 slot [body_range].info = -1;
280 } 276 }
281 break; 277 break;
282 278
283 case WEAPON: 279 case WEAPON:
284 if (slot [body_combat].info != -1) 280 if (slot [body_combat].info != -1)
285 { 281 {
286 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); 282 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
287 slot [body_combat].info = -1; 283 slot [body_combat].info = -1;
288 } 284 }
289 break; 285 break;
290 286
291 case SHIELD: 287 case SHIELD:
292 if (slot [body_shield].info != -1) 288 if (slot [body_shield].info != -1)
293 { 289 {
294 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); 290 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
295 slot [body_shield].info = -1; 291 slot [body_shield].info = -1;
296 } 292 }
297 break; 293 break;
298 294
299 case PLAYER: 295 case PLAYER:
300 if (slot [body_shield].info != 1) 296 if (slot [body_shield].info != 1)
301 { 297 {
302 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 298 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
303 slot [body_shield].info = 1; 299 slot [body_shield].info = 1;
304 } 300 }
305 301
306 if (slot [body_combat].info != 1) 302 if (slot [body_combat].info != 1)
307 { 303 {
308 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); 304 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
309 slot [body_combat].info = 1; 305 slot [body_combat].info = 1;
310 } 306 }
311 307
312 if (slot [body_range].info != 1) 308 if (slot [body_range].info != 1)
313 { 309 {
314 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); 310 LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
315 slot [body_range].info = 1; 311 slot [body_range].info = 1;
316 } 312 }
317 break; 313 break;
318 } 314 }
319 315
… …
342 * not in the ideal fashion. 338 * not in the ideal fashion.
343 */ 339 */
344 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) 340 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
345 { 341 {
346 if (!skill) 342 if (!skill)
347 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 343 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
348 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || 344 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
349 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 345 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
350 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); 346 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
351 } 347 }
352 348
353 /* We changed last_heal to gen_sp_armour, which is what it 349 /* We changed last_heal to gen_sp_armour, which is what it
354 * really does for many objects. Need to catch any in maps 350 * really does for many objects. Need to catch any in maps
355 * that may have an old value. 351 * that may have an old value.
… …
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, "ITEMBUG: 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);
372 368
373 /* Legacy objects from before item power was in the game */ 369 /* Legacy objects from before item power was in the game */
374 if (!item_power && ip) 370 if (!item_power && ip)
375 { 371 {
376 if (ip > 3) 372 if (ip > 3)
377 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); 373 LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip);
378 374
379 item_power = ip; 375 item_power = ip;
380 } 376 }
381 377
382 /* Check for possibly bogus values. Has to meet both these criteria - 378 /* Check for possibly bogus values. Has to meet both these criteria -
… …
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, "ITEMBUG: 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, "ITEMBUG: 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 {
… …
552 case KW_race: f.get_ornull (race); break; 560 case KW_race: f.get_ornull (race); break;
553 case KW_slaying: f.get_ornull (slaying); break; 561 case KW_slaying: f.get_ornull (slaying); break;
554 case KW_tag: f.get_ornull (tag); break; 562 case KW_tag: f.get_ornull (tag); break;
555 563
556 case KW_arch: 564 case KW_arch:
557 {
558 object *tmp = object::read (f); 565 if (object *tmp = object::read (f))
559 tmp->deactivate ();
560
561 { 566 {
567 tmp->deactivate ();
568
562 // was: insert_ob_in_ob (tmp, op); 569 // was: insert_ob_in_ob (tmp, op);
563 // but manually adding it can improve map loading times a lot 570 // but manually adding it can improve map loading times a lot
564 // also, appending instead of prepending keeps the 571 // also, appending instead of prepending keeps the
565 // save ordering the same between repeated load/saves. 572 // save ordering the same between repeated load/saves.
566 // and finally we do not want any funny effects 573 // and finally we do not want any funny effects
… …
583 590
584 tmp->below = 0; 591 tmp->below = 0;
585 tmp->env = this; 592 tmp->env = this;
586 op_inv = tmp; 593 op_inv = tmp;
587 } 594 }
588 } 595 else
596 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
597
589 continue; 598 continue;
590 599
591 case KW_other_arch: 600 case KW_other_arch:
592 other_arch =
593 loading_arch 601 if (loading_arch == this)
594 ? archetype::get (f.get_str ()) 602 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
603 else
604 {
595 : archetype::find (f.get_str ()); 605 other_arch = archetype::find (f.get_str ());
596 606
597 if (!other_arch) 607 if (!other_arch)
598 f.parse_warn (format ("%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 }
599 break; 610 break;
600 611
601 case KW_owner: 612 case KW_owner:
602 f.delayed_deref (this, owner, f.get_str ()); 613 f.delayed_deref (this, owner, f.get_str ());
603 break; 614 break;
… …
607 CLEAR_FLAG (this, FLAG_ANIMATE); 618 CLEAR_FLAG (this, FLAG_ANIMATE);
608 animation_id = 0; 619 animation_id = 0;
609 620
610 const char *str = f.get_str (); 621 const char *str = f.get_str ();
611 if (str && (animation_id = find_animation (str))) 622 if (str && (animation_id = find_animation (str)))
612 SET_FLAG (this, FLAG_ANIMATE); 623 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
613 } 624 }
614 break; 625 break;
615 626
616 case KW_last_heal: f.get (last_heal); break; 627 case KW_last_heal: f.get (last_heal); break;
617 case KW_last_sp: f.get (last_sp); break; 628 case KW_last_sp: f.get (last_sp); break;
… …
919 case KW_attack_movement: f.get (attack_movement); break; 930 case KW_attack_movement: f.get (attack_movement); break;
920 case KW_move_state: f.get (move_status); break; 931 case KW_move_state: f.get (move_status); break;
921 case KW_expmul: f.get (expmul); break; 932 case KW_expmul: f.get (expmul); break;
922 case KW_glow_radius: f.get (glow_radius); break; 933 case KW_glow_radius: f.get (glow_radius); break;
923 case KW_weapontype: f.get (weapontype); break; 934 case KW_weapontype: f.get (weapontype); break;
924 case KW_tooltype: f.get (tooltype); break;
925 case KW_casting_time: f.get (casting_time); break; 935 case KW_casting_time: f.get (casting_time); break;
936
937 // elevation is deprecated
926 case KW_elevation: f.get (elevation); break; 938 case KW_elevation: break;
939
927 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 940 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
928 case KW_client_type: f.get (client_type); break; 941 case KW_client_type: f.get (client_type); break;
929 case KW_duration: f.get (duration); break; 942 case KW_duration: f.get (duration); break;
930 case KW_range: f.get (range); break; 943 case KW_range: f.get (range); break;
931 case KW_range_modifier: f.get (range_modifier); break; 944 case KW_range_modifier: f.get (range_modifier); break;
… …
988 1001
989 f.next (); 1002 f.next ();
990 return true; 1003 return true;
991 1004
992 case KW_ERROR: 1005 case KW_ERROR:
993 set_ob_key_value (this, f.kw_str, f.value, true); 1006 // append as key value pair (do not use kv_set as it prepends)
1007 // we also do not even try to find old values, duplicate keys stay duplicate
1008 {
1009 key_value *kv = new key_value;
1010
1011 kv->next = 0;
1012 kv->key = shstr (f.kw_str);
1013 kv->value = shstr (f.value);
1014
1015 if (!last_kv)
1016 key_values = last_kv = kv;
1017 else
1018 {
1019 while (last_kv->next)
1020 last_kv = last_kv->next;
1021
1022 last_kv->next = kv;
1023 last_kv = kv;
1024 }
1025 }
994 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1026 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
995 break; 1027 break;
996 1028
997 default: 1029 default:
998 if (!f.parse_error ("object", name)) 1030 if (!f.parse_error ("object", name))
… …
1019 1051
1020 assert (arch); //D maybe use exception handling of sorts? 1052 assert (arch); //D maybe use exception handling of sorts?
1021 1053
1022 f.next (); 1054 f.next ();
1023 1055
1024 object *op = object::create (); 1056 object *op = arch->instance ();
1025
1026 op->map = map; 1057 op->map = map;
1027 arch->copy_to (op);
1028 // copy_to activates, this should be fixed properly 1058 // instance() activates, this should be fixed properly
1029 op->deactivate (); 1059 op->deactivate ();
1030 1060
1031 if (!op->parse_kv (f)) 1061 if (!op->parse_kv (f))
1032 { 1062 {
1033 op->destroy (true); 1063 op->destroy ();
1034 return 0; 1064 return 0;
1035 } 1065 }
1036 1066
1037 op->post_load_check (); 1067 op->post_load_check ();
1038 return op; 1068 return op;
… …
1243 /* 110 */ 1273 /* 110 */
1244 KW_destroy_on_death, 1274 KW_destroy_on_death,
1245 KW_NULL, 1275 KW_NULL,
1246 }; 1276 };
1247 1277
1248 int i;
1249
1250 /* This saves the key/value lists. We do it first so that any 1278 /* This saves the key/value lists. We do it first so that any
1251 * keys that match field names will be overwritten by the loader. 1279 * keys that match field names will be overwritten by the loader.
1252 */ 1280 */
1253 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1281 for (key_value *kv = op->key_values; kv; kv = kv->next)
1254 { 1282 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1255 /* Find the field in the opposing member. */ 1283 f.put (kv->key, kv->value);
1256 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1257
1258 /* If there's no partnering field, or it's got a different value, save our field. */
1259 if (!arch_field || my_field->value != arch_field->value)
1260 f.put (my_field->key, my_field->value);
1261 }
1262 1284
1263 /* We don't need to worry about the arch's extra fields - they 1285 /* We don't need to worry about the arch's extra fields - they
1264 * will get taken care of the copy_to method. 1286 * will get taken care of the copy_to method.
1265 */ 1287 */
1266 1288
… …
1275 CMP_OUT (name); 1297 CMP_OUT (name);
1276 CMP_OUT (name_pl); 1298 CMP_OUT (name_pl);
1277 CMP_OUT (custom_name); 1299 CMP_OUT (custom_name);
1278 CMP_OUT (title); 1300 CMP_OUT (title);
1279 CMP_OUT (race); 1301 CMP_OUT (race);
1302 CMP_OUT (skill);
1280 CMP_OUT (slaying); 1303 CMP_OUT (slaying);
1281 CMP_OUT (tag); 1304 CMP_OUT (tag);
1282 CMP_OUT (other_arch); 1305 CMP_OUT (other_arch);
1283 1306
1284 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1307 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
… …
1288 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1311 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1289 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1312 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1290 1313
1291 if (op->animation_id != tmp->animation_id) 1314 if (op->animation_id != tmp->animation_id)
1292 if (op->animation_id) 1315 if (op->animation_id)
1316 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1317 else
1293 { 1318 {
1294 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1319 f.put (KW_animation, (const char *)0);
1295 1320 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1296 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1297 f.put (KW_is_animated, (sint32)0);
1298 } 1321 }
1299 else
1300 f.put (KW_animation, (const char *)0);
1301 1322
1302 CMP_OUT2 (str, stats.Str); 1323 CMP_OUT2 (str, stats.Str);
1303 CMP_OUT2 (dex, stats.Dex); 1324 CMP_OUT2 (dex, stats.Dex);
1304 CMP_OUT2 (con, stats.Con); 1325 CMP_OUT2 (con, stats.Con);
1305 CMP_OUT2 (wis, stats.Wis); 1326 CMP_OUT2 (wis, stats.Wis);
… …
1335 CMP_OUT (direction); 1356 CMP_OUT (direction);
1336 CMP_OUT (type); 1357 CMP_OUT (type);
1337 CMP_OUT (subtype); 1358 CMP_OUT (subtype);
1338 CMP_OUT (attacktype); 1359 CMP_OUT (attacktype);
1339 1360
1340 for (i = 0; i < NROFATTACKS; i++) 1361 for (int i = 0; i < NROFATTACKS; i++)
1341 if (expect_false (op->resist[i] != tmp->resist[i])) 1362 if (expect_false (op->resist[i] != tmp->resist[i]))
1342 f.put (resist_save[i], op->resist[i]); 1363 f.put (resist_save[i], op->resist[i]);
1343 1364
1344 CMP_OUT (path_attuned); 1365 CMP_OUT (path_attuned);
1345 CMP_OUT (path_repelled); 1366 CMP_OUT (path_repelled);
… …
1356 CMP_OUT (last_sp); 1377 CMP_OUT (last_sp);
1357 CMP_OUT (last_grace); 1378 CMP_OUT (last_grace);
1358 CMP_OUT (last_eat); 1379 CMP_OUT (last_eat);
1359 CMP_OUT (glow_radius); 1380 CMP_OUT (glow_radius);
1360 1381
1361 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1382 if (op->flag [FLAG_IS_LINKED])
1383 if (int i = get_button_value (op))
1362 f.put (KW_connected, i); 1384 f.put (KW_connected, i);
1363 1385
1364 CMP_OUT (randomitems); 1386 CMP_OUT (randomitems);
1365 CMP_OUT2 (container, weight_limit); 1387 CMP_OUT2 (container, weight_limit);
1366 1388
1367 CMP_OUT (run_away); 1389 CMP_OUT (run_away);
1368 CMP_OUT (pick_up); 1390 CMP_OUT (pick_up);
1369 CMP_OUT (will_apply); 1391 CMP_OUT (will_apply);
1370 CMP_OUT (smoothlevel); 1392 CMP_OUT (smoothlevel);
1371 CMP_OUT (weapontype); 1393 CMP_OUT (weapontype);
1372 CMP_OUT (tooltype);
1373 CMP_OUT (elevation);
1374 CMP_OUT (client_type); 1394 CMP_OUT (client_type);
1375 CMP_OUT (item_power); 1395 CMP_OUT (item_power);
1376 CMP_OUT (duration); 1396 CMP_OUT (duration);
1377 CMP_OUT (range); 1397 CMP_OUT (range);
1378 CMP_OUT (range_modifier); 1398 CMP_OUT (range_modifier);
… …
1387 CMP_OUT (move_off); 1407 CMP_OUT (move_off);
1388 CMP_OUT (move_slow); 1408 CMP_OUT (move_slow);
1389 CMP_OUT (move_slow_penalty); 1409 CMP_OUT (move_slow_penalty);
1390 1410
1391 if (op->flag != tmp->flag) 1411 if (op->flag != tmp->flag)
1392 for (i = 0; i <= NUM_FLAGS; i++) 1412 for (int i = 0; i <= NUM_FLAGS; i++)
1393 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1413 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1394 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1414 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1395 1415
1396 // save body locations 1416 // save body locations
1397 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1417 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1398 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1418 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1399 f.put (body_locations[i].save_name, op->slot[i].info); 1419 f.put (body_locations[i].save_name, op->slot[i].info);
1400} 1420}
1401 1421
1402/* 1422/*
… …
1405 * the only place this is not set is when saving the player. 1425 * the only place this is not set is when saving the player.
1406 */ 1426 */
1407bool 1427bool
1408object::write (object_freezer &f) 1428object::write (object_freezer &f)
1409{ 1429{
1410 archetype *at = arch ? (archetype *)arch : empty_archetype; 1430 archetype *at = arch ? arch : archetype::empty;
1411 1431
1412 f.put (KW_arch, at->archname); 1432 f.put (KW_arch, at->archname);
1413 write_diff (f, this, at); 1433 write_diff (f, this, at);
1414 1434
1415 for (object *tmp = inv; tmp; tmp = tmp->below) 1435 for (object *tmp = inv; tmp; tmp = tmp->below)
… …
1423 1443
1424///////////////////////////////////////////////////////////////////////////// 1444/////////////////////////////////////////////////////////////////////////////
1425 1445
1426// generic resource file load, 1446// generic resource file load,
1427// currently supports: region, treasures, archetypes 1447// currently supports: region, treasures, archetypes
1448bool
1428bool load_resource_file (const char *filename) 1449load_resource_file_ (const char *filename)
1429{ 1450{
1430 object_thawer f (filename); 1451 object_thawer f (filename);
1431
1432 bool success = false;
1433 bool seen_arch = false;
1434 1452
1435 for (;;) 1453 for (;;)
1436 { 1454 {
1437 switch (f.kw) 1455 switch (f.kw)
1438 { 1456 {
1439 case KW_region: 1457 case KW_region:
1440 if (!region::read (f)) 1458 if (!region::read (f))
1441 goto finish; 1459 return false;
1442 break; 1460 break;
1443 1461
1444 case KW_treasure: 1462 case KW_treasure:
1445 case KW_treasureone: 1463 case KW_treasureone:
1446 if (!treasurelist::read (f)) 1464 if (!treasurelist::read (f))
1447 goto finish; 1465 return false;
1448 break; 1466 break;
1449 1467
1450 case KW_object: 1468 case KW_object:
1451 seen_arch = true;
1452 if (!archetype::read (f)) 1469 if (!archetype::read (f))
1453 goto finish; 1470 return false;
1454 break; 1471 break;
1455 1472
1456 case KW_EOF: 1473 case KW_EOF:
1457 success = true; 1474 return true;
1458 goto finish;
1459 1475
1460 default: 1476 default:
1461 if (!f.parse_error ("resource file")) 1477 if (!f.parse_error ("resource file"))
1462 goto finish; 1478 return false;
1463 1479
1464 f.next (); 1480 f.next ();
1465 break; 1481 break;
1466 } 1482 }
1467 } 1483 }
1468
1469finish:
1470 if (seen_arch)
1471 init_archetype_pointers ();
1472
1473 return success;
1474} 1484}
1475 1485

Diff Legend

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