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.107 by root, Fri Apr 11 14:09:56 2008 UTC vs.
Revision 1.140 by root, Sun Nov 8 22:30:48 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,2009 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 it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
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
28#include <global.h> 25#include <global.h>
29#include <loader.h> 26#include <loader.h>
30#include <sproto.h> 27#include <sproto.h>
31 28
32///////////////////////////////////////////////////////////////////////////// 29/////////////////////////////////////////////////////////////////////////////
33 30
34extern archetype *loading_arch; 31extern archetype *loading_arch;
32
33//+GPL
35 34
36/* This table is only necessary to convert objects that existed before the 35/* This table is only necessary to convert objects that existed before the
37 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
38 * to go through every mapping looking for every potion, rod, wand, etc 37 * to go through every mapping looking for every potion, rod, wand, etc
39 * that had a sp set and update to the new value. So this maps the 38 * that had a sp set and update to the new value. So this maps the
… …
261void 260void
262object::post_load_check () 261object::post_load_check ()
263{ 262{
264 if (type >= NUM_TYPES) 263 if (type >= NUM_TYPES)
265 { 264 {
266 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); 265 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
267 type = 0; 266 type = 0;
268 } 267 }
269 268
270 switch (type) 269 switch (type)
271 { 270 {
… …
273 case WAND: 272 case WAND:
274 case ROD: 273 case ROD:
275 case HORN: 274 case HORN:
276 if (slot [body_range].info != -1) 275 if (slot [body_range].info != -1)
277 { 276 {
278 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); 277 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
279 slot [body_range].info = -1; 278 slot [body_range].info = -1;
280 } 279 }
281 break; 280 break;
282 281
283 case WEAPON: 282 case WEAPON:
284 if (slot [body_combat].info != -1) 283 if (slot [body_combat].info != -1)
285 { 284 {
286 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); 285 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
287 slot [body_combat].info = -1; 286 slot [body_combat].info = -1;
288 } 287 }
289 break; 288 break;
290 289
291 case SHIELD: 290 case SHIELD:
292 if (slot [body_shield].info != -1) 291 if (slot [body_shield].info != -1)
293 { 292 {
294 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); 293 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
295 slot [body_shield].info = -1; 294 slot [body_shield].info = -1;
296 } 295 }
297 break; 296 break;
298 297
299 case PLAYER: 298 case PLAYER:
300 if (slot [body_shield].info != 1) 299 if (slot [body_shield].info != 1)
301 { 300 {
302 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 301 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
303 slot [body_shield].info = 1; 302 slot [body_shield].info = 1;
304 } 303 }
305 304
306 if (slot [body_combat].info != 1) 305 if (slot [body_combat].info != 1)
307 { 306 {
308 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); 307 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
309 slot [body_combat].info = 1; 308 slot [body_combat].info = 1;
310 } 309 }
311 310
312 if (slot [body_range].info != 1) 311 if (slot [body_range].info != 1)
313 { 312 {
314 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); 313 LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
315 slot [body_range].info = 1; 314 slot [body_range].info = 1;
316 } 315 }
317 break; 316 break;
318 } 317 }
319 318
… …
342 * not in the ideal fashion. 341 * not in the ideal fashion.
343 */ 342 */
344 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) 343 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
345 { 344 {
346 if (!skill) 345 if (!skill)
347 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 346 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
348 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || 347 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
349 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 348 (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); 349 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
351 } 350 }
352 351
353 /* We changed last_heal to gen_sp_armour, which is what it 352 /* We changed last_heal to gen_sp_armour, which is what it
354 * really does for many objects. Need to catch any in maps 353 * really does for many objects. Need to catch any in maps
355 * that may have an old value. 354 * that may have an old value.
… …
361 || type == AMULET || type == GIRDLE 360 || type == AMULET || type == GIRDLE
362 || type == BRACERS || type == CLOAK) 361 || type == BRACERS || type == CLOAK)
363 { 362 {
364 if (last_heal) 363 if (last_heal)
365 { 364 {
366 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 365 LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
367 gen_sp_armour = last_heal; 366 gen_sp_armour = last_heal;
368 last_heal = 0; 367 last_heal = 0;
369 } 368 }
370 369
371 int ip = calc_item_power (this, 0); 370 int ip = calc_item_power (this, 0);
372 371
373 /* Legacy objects from before item power was in the game */ 372 /* Legacy objects from before item power was in the game */
374 if (!item_power && ip) 373 if (!item_power && ip)
375 { 374 {
376 if (ip > 3) 375 if (ip > 3)
377 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); 376 LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip);
378 377
379 item_power = ip; 378 item_power = ip;
380 } 379 }
381 380
382 /* Check for possibly bogus values. Has to meet both these criteria - 381 /* Check for possibly bogus values. Has to meet both these criteria -
… …
389 if (ip > 2 * item_power && ip > (item_power + 3)) 388 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); 389 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
391#endif 390#endif
392 } 391 }
393 392
394 /* Old spellcasting object - need to load in the appropiate object */ 393 /* 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 || 394 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
395 if ((type == ROD
396 || type == WAND
397 || type == SCROLL
398 || type == HORN
399 || type == FIREWALL
396 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 400 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 401 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
402 && !inv
403 && !loading_arch
404 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
405 // TODO: at least one watchout-comments is redundant - investigate/remove
398 { 406 {
407 // TODO: fix firewall object on map
399 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' 408 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
400 * in that spell was stored in sp. 409 * in that spell was stored in sp.
401 */ 410 */
411 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
402 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 412 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
403 insert_ob_in_ob (tmp, this); 413 insert_ob_in_ob (tmp, this);
404 randomitems = NULL; /* So another spell isn't created for this object */ 414 randomitems = 0;
405 } 415 }
406 416
407 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 417 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
408 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 418 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
409 { 419 {
420 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
410 object *tmp = get_archetype_by_object_name (slaying); 421 object *tmp = get_archetype_by_object_name (slaying);
411 insert_ob_in_ob (tmp, this); 422 insert_ob_in_ob (tmp, this);
412 randomitems = NULL; /* So another spell isn't created for this object */ 423 randomitems = 0; /* So another spell isn't created for this object */
413 /* without this, value is all screwed up */ 424 /* without this, value is all screwed up */
414 value = arch->value * inv->value; 425 value = arch->value * inv->value;
415 } 426 }
416 427
417 if (QUERY_FLAG (this, FLAG_MONSTER)) 428 if (QUERY_FLAG (this, FLAG_MONSTER))
418 { 429 {
419 if (stats.hp > stats.maxhp) 430 if (stats.hp > stats.maxhp)
420 { 431 {
421 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 432 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; 433 stats.maxhp = stats.hp;
423 } 434 }
424 435
425 /* The archs just need to be updated for this */ 436 /* The archs just need to be updated for this */
426 if (move_type == 0) 437 if (move_type == 0)
427 move_type = MOVE_WALK; 438 move_type = MOVE_WALK;
428 } 439 }
429 440
430 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 441 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 442 /* Object will duplicate it's content as part of the
433 * generation process. To do this, we must flag inventory 443 * generation process. To do this, we must flag inventory
434 * so it remains unevaluated concerning the randomitems and 444 * so it remains unevaluated concerning the randomitems and
435 * the living (a demonlord shouldn't cast from inside generator!) 445 * the living (a demonlord shouldn't cast from inside generator!)
436 */ 446 */
447 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
437 flag_inv (this, FLAG_IS_A_TEMPLATE); 448 flag_inv (this, FLAG_IS_A_TEMPLATE);
438 }
439 449
440 /* Handle player movers. We use move_type for player movers 450 /* Handle player movers. We use move_type for player movers
441 * because they operate on their own time (move_on 451 * because they operate on their own time (move_on
442 * would potentially cause them to be triggered when someone steps 452 * would potentially cause them to be triggered when someone steps
443 * on them). If move_type is set, presume person knows what they 453 * on them). If move_type is set, presume person knows what they
444 * are doing, otherwise, set move_type based on maxhp value. 454 * are doing, otherwise, set move_type based on maxhp value.
445 */ 455 */
446 if (type == PLAYERMOVER) 456 if (type == PLAYERMOVER)
447 { 457 {
448 if (!move_type) 458 if (!move_type)
… …
453 stats.maxhp = 0; 463 stats.maxhp = 0;
454 } 464 }
455 else 465 else
456 move_type = MOVE_WALK; 466 move_type = MOVE_WALK;
457 } 467 }
468 }
469
470 // if the object has an animation, try to provide a default face
471 if (has_anim ())
472 {
473 const animation &anim_ob = anim ();
474
475 if (anim_speed)
476 // if this item is time-animated, force the last frame
477 animate_object (this, 0);
478 else if (flag [FLAG_MONSTER])
479 // if it is a monster, set appropriate facing
480 animate_object (this, direction);
458 } 481 }
459} 482}
460 483
461static void 484static void
462set_move (MoveType &mt, const char *str) 485set_move (MoveType &mt, const char *str)
… …
510 533
511 goto next; 534 goto next;
512 } 535 }
513 } 536 }
514 537
515 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 538 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
516 539
517next: ; 540next: ;
518 } 541 }
519} 542}
543
544//-GPL
520 545
521#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 546#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
522 547
523bool 548bool
524object::parse_kv (object_thawer &f) 549object::parse_kv (object_thawer &f)
525{ 550{
526 object *op_inv = inv; 551 object *op_inv = inv;
552 key_value *last_kv = key_values;
527 553
528 for (;;) 554 for (;;)
529 { 555 {
530 switch (f.kw) 556 switch (f.kw)
531 { 557 {
… …
552 case KW_race: f.get_ornull (race); break; 578 case KW_race: f.get_ornull (race); break;
553 case KW_slaying: f.get_ornull (slaying); break; 579 case KW_slaying: f.get_ornull (slaying); break;
554 case KW_tag: f.get_ornull (tag); break; 580 case KW_tag: f.get_ornull (tag); break;
555 581
556 case KW_arch: 582 case KW_arch:
557 {
558 object *tmp = object::read (f); 583 if (object *tmp = object::read (f))
559 tmp->deactivate ();
560
561 { 584 {
585 tmp->deactivate ();
586
562 // was: insert_ob_in_ob (tmp, op); 587 // was: insert_ob_in_ob (tmp, op);
563 // but manually adding it can improve map loading times a lot 588 // but manually adding it can improve map loading times a lot
564 // also, appending instead of prepending keeps the 589 // also, appending instead of prepending keeps the
565 // save ordering the same between repeated load/saves. 590 // save ordering the same between repeated load/saves.
566 // and finally we do not want any funny effects 591 // and finally we do not want any funny effects
… …
583 608
584 tmp->below = 0; 609 tmp->below = 0;
585 tmp->env = this; 610 tmp->env = this;
586 op_inv = tmp; 611 op_inv = tmp;
587 } 612 }
588 } 613 else
614 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
615
589 continue; 616 continue;
590 617
591 case KW_other_arch: 618 case KW_other_arch:
592 other_arch =
593 loading_arch 619 if (loading_arch == this)
594 ? archetype::get (f.get_str ()) 620 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
621 else
622 {
595 : archetype::find (f.get_str ()); 623 other_arch = archetype::find (f.get_str ());
596 624
597 if (!other_arch) 625 if (!other_arch)
598 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ())); 626 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
627 }
599 break; 628 break;
600 629
601 case KW_owner: 630 case KW_owner:
602 f.delayed_deref (this, owner, f.get_str ()); 631 f.delayed_deref (this, owner, f.get_str ());
603 break; 632 break;
… …
607 CLEAR_FLAG (this, FLAG_ANIMATE); 636 CLEAR_FLAG (this, FLAG_ANIMATE);
608 animation_id = 0; 637 animation_id = 0;
609 638
610 const char *str = f.get_str (); 639 const char *str = f.get_str ();
611 if (str && (animation_id = find_animation (str))) 640 if (str && (animation_id = find_animation (str)))
612 SET_FLAG (this, FLAG_ANIMATE); 641 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
613 } 642 }
614 break; 643 break;
615 644
616 case KW_last_heal: f.get (last_heal); break; 645 case KW_last_heal: f.get (last_heal); break;
617 case KW_last_sp: f.get (last_sp); break; 646 case KW_last_sp: f.get (last_sp); break;
… …
806 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 835 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
807 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 836 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
808 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 837 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
809 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 838 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
810 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 839 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
840 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
811 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 841 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
812 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 842 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
813 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 843 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
814 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 844 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
815 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 845 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
915 case KW_anim_speed: f.get (anim_speed); break; 945 case KW_anim_speed: f.get (anim_speed); break;
916 case KW_container: f.get (weight_limit); break; 946 case KW_container: f.get (weight_limit); break;
917 case KW_will_apply: f.get (will_apply); break; 947 case KW_will_apply: f.get (will_apply); break;
918 case KW_attack_movement: f.get (attack_movement); break; 948 case KW_attack_movement: f.get (attack_movement); break;
919 case KW_move_state: f.get (move_status); break; 949 case KW_move_state: f.get (move_status); break;
920 case KW_expmul: f.get (expmul); break; 950 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
921 case KW_glow_radius: f.get (glow_radius); break; 951 case KW_glow_radius: f.get (glow_radius); break;
922 case KW_weapontype: f.get (weapontype); break; 952 case KW_weapontype: f.get (weapontype); break;
923 case KW_tooltype: f.get (tooltype); break;
924 case KW_casting_time: f.get (casting_time); break; 953 case KW_casting_time: f.get (casting_time); break;
954
955 // elevation is deprecated
925 case KW_elevation: f.get (elevation); break; 956 case KW_elevation: break;
957
926 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 958 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
927 case KW_client_type: f.get (client_type); break; 959 case KW_client_type: f.get (client_type); break;
928 case KW_duration: f.get (duration); break; 960 case KW_duration: f.get (duration); break;
929 case KW_range: f.get (range); break; 961 case KW_range: f.get (range); break;
930 case KW_range_modifier: f.get (range_modifier); break; 962 case KW_range_modifier: f.get (range_modifier); break;
… …
949 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 981 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
950 case KW_can_apply: 982 case KW_can_apply:
951 break; 983 break;
952 984
953 case KW_connected: 985 case KW_connected:
954 add_button_link (this, map, f.get_sint32 ()); 986 {
987 shstr connected;
988
989 f.get (connected);
990 add_link (map, connected);
991 }
955 break; 992 break;
956 993
957 case KW_randomitems: 994 case KW_randomitems:
958 if (f.get_str ()) 995 if (f.get_str ())
959 { 996 {
… …
961 loading_arch 998 loading_arch
962 ? treasurelist::get (f.get_str ()) 999 ? treasurelist::get (f.get_str ())
963 : treasurelist::find (f.get_str ()); 1000 : treasurelist::find (f.get_str ());
964 1001
965 if (!randomitems) 1002 if (!randomitems)
1003 {
966 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1004 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1005 randomitems = treasurelist::get (shstr_none); // avoid crashes
1006 }
967 } 1007 }
968 else 1008 else
969 randomitems = 0; 1009 randomitems = 0;
970 break; 1010 break;
971 1011
… …
987 1027
988 f.next (); 1028 f.next ();
989 return true; 1029 return true;
990 1030
991 case KW_ERROR: 1031 case KW_ERROR:
992 set_ob_key_value (this, f.kw_str, f.value, true); 1032 // append as key value pair (do not use kv_set as it prepends)
1033 // we also do not even try to find old values, duplicate keys stay duplicate
1034 {
1035 key_value *kv = new key_value;
1036
1037 kv->next = 0;
1038 kv->key = shstr (f.kw_str);
1039 kv->value = shstr (f.value);
1040
1041 if (!last_kv)
1042 key_values = last_kv = kv;
1043 else
1044 {
1045 while (last_kv->next)
1046 last_kv = last_kv->next;
1047
1048 last_kv->next = kv;
1049 last_kv = kv;
1050 }
1051 }
993 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1052 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
994 break; 1053 break;
995 1054
996 default: 1055 default:
997 if (!f.parse_error ("object", name)) 1056 if (!f.parse_error ("object", name))
… …
1011 archetype *arch = archetype::find (f.get_str ()); 1070 archetype *arch = archetype::find (f.get_str ());
1012 1071
1013 if (!arch) 1072 if (!arch)
1014 { 1073 {
1015 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1074 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1016 arch = archetype::find ("earthwall"); 1075 arch = archetype::find (shstr_earthwall);
1017 } 1076 }
1018 1077
1019 assert (arch); //D maybe use exception handling of sorts? 1078 assert (arch); //D maybe use exception handling of sorts?
1020 1079
1021 f.next (); 1080 f.next ();
1022 1081
1023 object *op = object::create (); 1082 object *op = arch->instance ();
1024
1025 op->map = map; 1083 op->map = map;
1026 arch->copy_to (op);
1027 // copy_to activates, this should be fixed properly 1084 // instance() activates, this should be fixed properly
1028 op->deactivate (); 1085 op->deactivate ();
1029 1086
1030 if (!op->parse_kv (f)) 1087 if (!op->parse_kv (f))
1031 { 1088 {
1032 op->destroy (true); 1089 op->destroy ();
1033 return 0; 1090 return 0;
1034 } 1091 }
1035 1092
1036 op->post_load_check (); 1093 op->post_load_check ();
1037 return op; 1094 return op;
… …
1049 object_thawer f (buf, (AV *)0); 1106 object_thawer f (buf, (AV *)0);
1050 1107
1051 return op->parse_kv (f); 1108 return op->parse_kv (f);
1052} 1109}
1053 1110
1054/* This returns a string of the integer movement type */
1055#if 0
1056// unused function
1057static char *
1058get_string_move_type (MoveType mt)
1059{
1060 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1061 int i, all_count = 0, count;
1062
1063 strcpy (retbuf, "");
1064 strcpy (retbuf_all, " all");
1065
1066 /* Quick check, and probably fairly common */
1067 if (mt == MOVE_ALL)
1068 return retbuf_all + 1;
1069 if (mt == 0)
1070 {
1071 strcpy (retbuf, "0");
1072 return retbuf;
1073 }
1074
1075 /* We basically slide the bits down. Why look at MOVE_ALL?
1076 * because we may want to return a string like 'all -swim',
1077 * and if we just looked at mt, we couldn't get that.
1078 */
1079 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1080 {
1081 if (mt & (1 << count))
1082 {
1083 strcat (retbuf, " ");
1084 strcat (retbuf, move_name[count]);
1085 }
1086 else
1087 {
1088 strcat (retbuf_all, " -");
1089 strcat (retbuf_all, move_name[count]);
1090 all_count++;
1091 }
1092 }
1093 /* Basically, if there is a single negation, return it, eg
1094 * 'all -swim'. But more than that, just return the
1095 * enumerated values. It doesn't make sense to return
1096 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1097 */
1098 if (all_count <= 1)
1099 return retbuf_all + 1;
1100 else
1101 return retbuf + 1;
1102}
1103#endif
1104
1105// compare *op against *tmp and output differences 1111// compare *op against *arch and output differences
1106static void 1112static void
1107write_diff (object_freezer &f, object *op, object *tmp) 1113write_diff (object_freezer &f, object *op, object *arch)
1108{ 1114{
1109 static const keyword resist_save[NROFATTACKS] = { 1115 static const keyword resist_save[NROFATTACKS] = {
1110# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1116# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1111# include "attackinc.h" 1117# include "attackinc.h"
1112# undef def 1118# undef def
… …
1242 /* 110 */ 1248 /* 110 */
1243 KW_destroy_on_death, 1249 KW_destroy_on_death,
1244 KW_NULL, 1250 KW_NULL,
1245 }; 1251 };
1246 1252
1247 int i;
1248
1249 /* This saves the key/value lists. We do it first so that any 1253 /* This saves the key/value lists. We do it first so that any
1250 * keys that match field names will be overwritten by the loader. 1254 * keys that match field names will be overwritten by the loader.
1251 */ 1255 */
1252 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1256 for (key_value *kv = op->key_values; kv; kv = kv->next)
1253 { 1257 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1254 /* Find the field in the opposing member. */ 1258 f.put (kv->key, kv->value);
1255 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1256 1259
1257 /* If there's no partnering field, or it's got a different value, save our field. */ 1260 if (op->uuid)
1258 if (!arch_field || my_field->value != arch_field->value)
1259 f.put (my_field->key, my_field->value);
1260 }
1261
1262 /* We don't need to worry about the arch's extra fields - they
1263 * will get taken care of the copy_to method.
1264 */
1265
1266 f.put (KW_uuid, op->uuid.c_str ()); 1261 f.put (KW_uuid, op->uuid.c_str ());
1267 1262
1268#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1263#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW_ ## v, op->v)
1269#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1264#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v)
1270 1265
1271 if (object *owner = op->owner) 1266 CMP_OUT (x);
1272 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1267 CMP_OUT (y);
1268
1269 CMP_OUT (type);
1270 CMP_OUT (subtype);
1271 CMP_OUT (direction);
1273 1272
1274 CMP_OUT (name); 1273 CMP_OUT (name);
1275 CMP_OUT (name_pl); 1274 CMP_OUT (name_pl);
1276 CMP_OUT (custom_name); 1275
1276 CMP_OUT (speed);
1277 CMP_OUT (speed_left);
1278
1277 CMP_OUT (title); 1279 CMP_OUT (title);
1278 CMP_OUT (race); 1280 CMP_OUT (race);
1279 CMP_OUT (slaying); 1281 CMP_OUT (slaying);
1282 CMP_OUT (skill);
1283
1280 CMP_OUT (tag); 1284 CMP_OUT (tag);
1285 CMP_OUT (custom_name);
1286
1287 if (object *owner = op->owner)
1288 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1289
1290 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1291
1281 CMP_OUT (other_arch); 1292 CMP_OUT (other_arch);
1282 1293
1283 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1294 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1284 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1295 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore);
1285 1296
1286 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1297 if (op->face != arch->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1287 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1298 if (op->sound != arch->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1288 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1299 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1289 1300
1290 if (op->animation_id != tmp->animation_id) 1301 if (op->animation_id != arch->animation_id)
1291 if (op->animation_id) 1302 if (op->has_anim ())
1303 f.put (KW_animation, op->anim ().name);
1304 else
1292 { 1305 {
1293 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1306 f.put (KW_animation, (const char *)0);
1294 1307 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1295 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1296 f.put (KW_is_animated, (sint32)0);
1297 } 1308 }
1298 else
1299 f.put (KW_animation, (const char *)0);
1300 1309
1301 CMP_OUT2 (str, stats.Str); 1310 CMP_OUT2 (str, stats.Str);
1302 CMP_OUT2 (dex, stats.Dex); 1311 CMP_OUT2 (dex, stats.Dex);
1303 CMP_OUT2 (con, stats.Con); 1312 CMP_OUT2 (con, stats.Con);
1304 CMP_OUT2 (wis, stats.Wis); 1313 CMP_OUT2 (wis, stats.Wis);
… …
1313 CMP_OUT2 (grace, stats.grace); 1322 CMP_OUT2 (grace, stats.grace);
1314 CMP_OUT2 (maxgrace, stats.maxgrace); 1323 CMP_OUT2 (maxgrace, stats.maxgrace);
1315 CMP_OUT2 (exp, stats.exp); 1324 CMP_OUT2 (exp, stats.exp);
1316 1325
1317 CMP_OUT (perm_exp); 1326 CMP_OUT (perm_exp);
1318 CMP_OUT (expmul); 1327 //CMP_OUT (expmul);
1319 1328
1320 CMP_OUT2 (food, stats.food); 1329 CMP_OUT2 (food, stats.food);
1321 CMP_OUT2 (dam, stats.dam); 1330 CMP_OUT2 (dam, stats.dam);
1322 CMP_OUT2 (luck, stats.luck); 1331 CMP_OUT2 (luck, stats.luck);
1323 CMP_OUT2 (wc, stats.wc); 1332 CMP_OUT2 (wc, stats.wc);
1324 CMP_OUT2 (ac, stats.ac); 1333 CMP_OUT2 (ac, stats.ac);
1325 1334
1326 CMP_OUT (x);
1327 CMP_OUT (y);
1328 CMP_OUT (speed);
1329 CMP_OUT (speed_left);
1330 CMP_OUT2 (move_state, move_status); 1335 CMP_OUT2 (move_state, move_status);
1331 CMP_OUT (attack_movement); 1336 CMP_OUT (attack_movement);
1332 CMP_OUT (nrof); 1337 CMP_OUT (nrof);
1333 CMP_OUT (level); 1338 CMP_OUT (level);
1334 CMP_OUT (direction);
1335 CMP_OUT (type);
1336 CMP_OUT (subtype);
1337 CMP_OUT (attacktype); 1339 CMP_OUT (attacktype);
1338 1340
1341 // using memcmp here seems to be a loss - us gcc vectorising?
1339 for (i = 0; i < NROFATTACKS; i++) 1342 for (int i = 0; i < NROFATTACKS; i++)
1340 if (expect_false (op->resist[i] != tmp->resist[i])) 1343 if (expect_false (op->resist[i] != arch->resist[i]))
1341 f.put (resist_save[i], op->resist[i]); 1344 f.put (resist_save[i], op->resist[i]);
1342 1345
1343 CMP_OUT (path_attuned); 1346 CMP_OUT (path_attuned);
1344 CMP_OUT (path_repelled); 1347 CMP_OUT (path_repelled);
1345 CMP_OUT (path_denied); 1348 CMP_OUT (path_denied);
… …
1355 CMP_OUT (last_sp); 1358 CMP_OUT (last_sp);
1356 CMP_OUT (last_grace); 1359 CMP_OUT (last_grace);
1357 CMP_OUT (last_eat); 1360 CMP_OUT (last_eat);
1358 CMP_OUT (glow_radius); 1361 CMP_OUT (glow_radius);
1359 1362
1360 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1363 if (op->flag [FLAG_IS_LINKED])
1364 if (auto (ol, op->find_link ()))
1361 f.put (KW_connected, i); 1365 f.put (KW_connected, ol->id);
1362 1366
1363 CMP_OUT (randomitems); 1367 CMP_OUT (randomitems);
1364 CMP_OUT2 (container, weight_limit); 1368 CMP_OUT2 (container, weight_limit);
1365 1369
1366 CMP_OUT (run_away); 1370 CMP_OUT (run_away);
1367 CMP_OUT (pick_up); 1371 CMP_OUT (pick_up);
1368 CMP_OUT (will_apply); 1372 CMP_OUT (will_apply);
1369 CMP_OUT (smoothlevel); 1373 CMP_OUT (smoothlevel);
1370 CMP_OUT (weapontype); 1374 CMP_OUT (weapontype);
1371 CMP_OUT (tooltype);
1372 CMP_OUT (elevation);
1373 CMP_OUT (client_type); 1375 CMP_OUT (client_type);
1374 CMP_OUT (item_power); 1376 CMP_OUT (item_power);
1375 CMP_OUT (duration); 1377 CMP_OUT (duration);
1376 CMP_OUT (range); 1378 CMP_OUT (range);
1377 CMP_OUT (range_modifier); 1379 CMP_OUT (range_modifier);
… …
1385 CMP_OUT (move_on); 1387 CMP_OUT (move_on);
1386 CMP_OUT (move_off); 1388 CMP_OUT (move_off);
1387 CMP_OUT (move_slow); 1389 CMP_OUT (move_slow);
1388 CMP_OUT (move_slow_penalty); 1390 CMP_OUT (move_slow_penalty);
1389 1391
1390 if (op->flag != tmp->flag) 1392 // obj_original is the only commonly differing flag between archetype
1393 // and object, so special-case it here to be able to skip the loop
1394 object::flags_t diff = op->flags ^ arch->flags;
1395
1396 if (expect_true (diff.any ()))
1397 {
1398 if (expect_false (diff.reset (FLAG_OBJ_ORIGINAL).any ()))
1399 {
1400 // some other flags differ, too
1391 for (i = 0; i <= NUM_FLAGS; i++) 1401 for (int i = 0; i < NUM_FLAGS; i++)
1392 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1402 if (expect_false (flag_names [i] && op->flag [i] != arch->flag [i]))
1393 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1403 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1404 }
1405 else
1406 {
1407 // only obj_original differs
1408 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");
1409 }
1410 }
1394 1411
1395 // save body locations 1412 // save body locations. gcc's memcmp does an abysmal job when used
1396 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1413 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1397 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1414 if (expect_false (op->slot[i].info != arch->slot[i].info))
1398 f.put (body_locations[i].save_name, op->slot[i].info); 1415 f.put (body_locations[i].save_name, op->slot[i].info);
1399} 1416}
1400 1417
1401/* 1418/*
1402 * Dumps all variables in an object to a file. 1419 * Dumps all variables in an object to a file.
… …
1404 * the only place this is not set is when saving the player. 1421 * the only place this is not set is when saving the player.
1405 */ 1422 */
1406bool 1423bool
1407object::write (object_freezer &f) 1424object::write (object_freezer &f)
1408{ 1425{
1409 archetype *at = arch ? (archetype *)arch : empty_archetype; 1426 if (is_arch ())
1410 1427 {
1428 f.put (KW_object, arch->archname);
1429 write_diff (f, this, archetype::empty);
1430 }
1431 else
1432 {
1411 f.put (KW_arch, at->archname); 1433 f.put (KW_arch, arch->archname);
1412 write_diff (f, this, at); 1434 write_diff (f, this, arch);
1435 }
1413 1436
1414 for (object *tmp = inv; tmp; tmp = tmp->below) 1437 for (object *tmp = inv; tmp; tmp = tmp->below)
1415 tmp->write (f); 1438 tmp->write (f);
1416 1439
1417 f.put (this); 1440 f.put (this);
… …
1422 1445
1423///////////////////////////////////////////////////////////////////////////// 1446/////////////////////////////////////////////////////////////////////////////
1424 1447
1425// generic resource file load, 1448// generic resource file load,
1426// currently supports: region, treasures, archetypes 1449// currently supports: region, treasures, archetypes
1450bool
1427bool load_resource_file (const char *filename) 1451load_resource_file_ (const char *filename)
1428{ 1452{
1429 object_thawer f (filename); 1453 object_thawer f (filename);
1430
1431 bool success = false;
1432 bool seen_arch = false;
1433 1454
1434 for (;;) 1455 for (;;)
1435 { 1456 {
1436 switch (f.kw) 1457 switch (f.kw)
1437 { 1458 {
1438 case KW_region: 1459 case KW_region:
1439 if (!region::read (f)) 1460 if (!region::read (f))
1440 goto finish; 1461 return false;
1441 break; 1462 break;
1442 1463
1443 case KW_treasure: 1464 case KW_treasure:
1444 case KW_treasureone: 1465 case KW_treasureone:
1445 if (!treasurelist::read (f)) 1466 if (!treasurelist::read (f))
1446 goto finish; 1467 return false;
1447 break; 1468 break;
1448 1469
1449 case KW_object: 1470 case KW_object:
1450 seen_arch = true;
1451 if (!archetype::read (f)) 1471 if (!archetype::read (f))
1452 goto finish; 1472 return false;
1453 break; 1473 break;
1454 1474
1455 case KW_EOF: 1475 case KW_EOF:
1456 success = true; 1476 return true;
1457 goto finish;
1458 1477
1459 default: 1478 default:
1460 if (!f.parse_error ("resource file")) 1479 if (!f.parse_error ("resource file"))
1461 goto finish; 1480 return false;
1462 1481
1463 f.next (); 1482 f.next ();
1464 break; 1483 break;
1465 } 1484 }
1466 } 1485 }
1467
1468finish:
1469 if (seen_arch)
1470 init_archetype_pointers ();
1471
1472 return success;
1473} 1486}
1474 1487

Diff Legend

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