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,2008 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 | #include <global.h> |
25 | #include <global.h> |
… | |
… | |
26 | #include <sproto.h> |
27 | #include <sproto.h> |
27 | |
28 | |
28 | ///////////////////////////////////////////////////////////////////////////// |
29 | ///////////////////////////////////////////////////////////////////////////// |
29 | |
30 | |
30 | extern archetype *loading_arch; |
31 | extern archetype *loading_arch; |
|
|
32 | |
|
|
33 | //+GPL |
31 | |
34 | |
32 | /* 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 |
33 | * spell object conversion to the new object. It was not practical |
36 | * spell object conversion to the new object. It was not practical |
34 | * 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 |
35 | * 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 |
… | |
… | |
257 | void |
260 | void |
258 | object::post_load_check () |
261 | object::post_load_check () |
259 | { |
262 | { |
260 | if (type >= NUM_TYPES) |
263 | if (type >= NUM_TYPES) |
261 | { |
264 | { |
262 | 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 ()); |
263 | type = 0; |
266 | type = 0; |
264 | } |
267 | } |
265 | |
268 | |
266 | switch (type) |
269 | switch (type) |
267 | { |
270 | { |
… | |
… | |
269 | case WAND: |
272 | case WAND: |
270 | case ROD: |
273 | case ROD: |
271 | case HORN: |
274 | case HORN: |
272 | if (slot [body_range].info != -1) |
275 | if (slot [body_range].info != -1) |
273 | { |
276 | { |
274 | 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); |
275 | slot [body_range].info = -1; |
278 | slot [body_range].info = -1; |
276 | } |
279 | } |
277 | break; |
280 | break; |
278 | |
281 | |
279 | case WEAPON: |
282 | case WEAPON: |
280 | if (slot [body_combat].info != -1) |
283 | if (slot [body_combat].info != -1) |
281 | { |
284 | { |
282 | 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); |
283 | slot [body_combat].info = -1; |
286 | slot [body_combat].info = -1; |
284 | } |
287 | } |
285 | break; |
288 | break; |
286 | |
289 | |
287 | case SHIELD: |
290 | case SHIELD: |
288 | if (slot [body_shield].info != -1) |
291 | if (slot [body_shield].info != -1) |
289 | { |
292 | { |
290 | 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); |
291 | slot [body_shield].info = -1; |
294 | slot [body_shield].info = -1; |
292 | } |
295 | } |
293 | break; |
296 | break; |
294 | |
297 | |
295 | case PLAYER: |
298 | case PLAYER: |
296 | if (slot [body_shield].info != 1) |
299 | if (slot [body_shield].info != 1) |
297 | { |
300 | { |
298 | 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); |
299 | slot [body_shield].info = 1; |
302 | slot [body_shield].info = 1; |
300 | } |
303 | } |
301 | |
304 | |
302 | if (slot [body_combat].info != 1) |
305 | if (slot [body_combat].info != 1) |
303 | { |
306 | { |
304 | 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); |
305 | slot [body_combat].info = 1; |
308 | slot [body_combat].info = 1; |
306 | } |
309 | } |
307 | |
310 | |
308 | if (slot [body_range].info != 1) |
311 | if (slot [body_range].info != 1) |
309 | { |
312 | { |
310 | 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); |
311 | slot [body_range].info = 1; |
314 | slot [body_range].info = 1; |
312 | } |
315 | } |
313 | break; |
316 | break; |
314 | } |
317 | } |
315 | |
318 | |
… | |
… | |
338 | * not in the ideal fashion. |
341 | * not in the ideal fashion. |
339 | */ |
342 | */ |
340 | 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)) |
341 | { |
344 | { |
342 | if (!skill) |
345 | if (!skill) |
343 | LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); |
346 | LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ()); |
344 | 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) || |
345 | (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) |
348 | (skill == shstr_two_handed_weapons && slot[body_arm].info != -2)) |
346 | 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); |
347 | } |
350 | } |
348 | |
351 | |
349 | /* 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 |
350 | * really does for many objects. Need to catch any in maps |
353 | * really does for many objects. Need to catch any in maps |
351 | * that may have an old value. |
354 | * that may have an old value. |
… | |
… | |
357 | || type == AMULET || type == GIRDLE |
360 | || type == AMULET || type == GIRDLE |
358 | || type == BRACERS || type == CLOAK) |
361 | || type == BRACERS || type == CLOAK) |
359 | { |
362 | { |
360 | if (last_heal) |
363 | if (last_heal) |
361 | { |
364 | { |
362 | LOG (llevError, "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 ()); |
363 | gen_sp_armour = last_heal; |
366 | gen_sp_armour = last_heal; |
364 | last_heal = 0; |
367 | last_heal = 0; |
365 | } |
368 | } |
366 | |
369 | |
367 | int ip = calc_item_power (this, 0); |
370 | int ip = calc_item_power (this, 0); |
368 | |
371 | |
369 | /* Legacy objects from before item power was in the game */ |
372 | /* Legacy objects from before item power was in the game */ |
370 | if (!item_power && ip) |
373 | if (!item_power && ip) |
371 | { |
374 | { |
372 | if (ip > 3) |
375 | if (ip > 3) |
373 | 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); |
374 | |
377 | |
375 | item_power = ip; |
378 | item_power = ip; |
376 | } |
379 | } |
377 | |
380 | |
378 | /* Check for possibly bogus values. Has to meet both these criteria - |
381 | /* Check for possibly bogus values. Has to meet both these criteria - |
… | |
… | |
385 | if (ip > 2 * item_power && ip > (item_power + 3)) |
388 | if (ip > 2 * item_power && ip > (item_power + 3)) |
386 | 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); |
387 | #endif |
390 | #endif |
388 | } |
391 | } |
389 | |
392 | |
390 | /* Old spellcasting object - need to load in the appropiate object */ |
393 | /* old style spellcasting object (pretty common) - need to load in the appropiate object */ |
391 | 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 |
392 | /* 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 */ |
393 | ((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 |
394 | { |
406 | { |
|
|
407 | // TODO: fix firewall object on map |
395 | /* 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' |
396 | * in that spell was stored in sp. |
409 | * in that spell was stored in sp. |
397 | */ |
410 | */ |
398 | LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
411 | //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
399 | 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]); |
400 | insert_ob_in_ob (tmp, this); |
413 | insert_ob_in_ob (tmp, this); |
401 | randomitems = NULL; /* So another spell isn't created for this object */ |
414 | randomitems = 0; |
402 | } |
415 | } |
403 | |
416 | |
404 | /* 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 */ |
405 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
418 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
406 | { |
419 | { |
407 | LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ()); |
420 | LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ()); |
408 | object *tmp = get_archetype_by_object_name (slaying); |
421 | object *tmp = get_archetype_by_object_name (slaying); |
409 | insert_ob_in_ob (tmp, this); |
422 | insert_ob_in_ob (tmp, this); |
410 | randomitems = NULL; /* So another spell isn't created for this object */ |
423 | randomitems = 0; /* So another spell isn't created for this object */ |
411 | /* without this, value is all screwed up */ |
424 | /* without this, value is all screwed up */ |
412 | value = arch->value * inv->value; |
425 | value = arch->value * inv->value; |
413 | } |
426 | } |
414 | |
427 | |
415 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
428 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
416 | { |
429 | { |
417 | if (stats.hp > stats.maxhp) |
430 | if (stats.hp > stats.maxhp) |
418 | { |
431 | { |
419 | LOG (llevInfo, "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); |
420 | stats.maxhp = stats.hp; |
433 | stats.maxhp = stats.hp; |
421 | } |
434 | } |
422 | |
435 | |
423 | /* The archs just need to be updated for this */ |
436 | /* The archs just need to be updated for this */ |
424 | if (move_type == 0) |
437 | if (move_type == 0) |
… | |
… | |
450 | stats.maxhp = 0; |
463 | stats.maxhp = 0; |
451 | } |
464 | } |
452 | else |
465 | else |
453 | move_type = MOVE_WALK; |
466 | move_type = MOVE_WALK; |
454 | } |
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); |
455 | } |
481 | } |
456 | } |
482 | } |
457 | |
483 | |
458 | static void |
484 | static void |
459 | set_move (MoveType &mt, const char *str) |
485 | set_move (MoveType &mt, const char *str) |
… | |
… | |
513 | |
539 | |
514 | next: ; |
540 | next: ; |
515 | } |
541 | } |
516 | } |
542 | } |
517 | |
543 | |
|
|
544 | //-GPL |
|
|
545 | |
518 | #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () |
546 | #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () |
519 | |
547 | |
520 | bool |
548 | bool |
521 | object::parse_kv (object_thawer &f) |
549 | object::parse_kv (object_thawer &f) |
522 | { |
550 | { |
523 | object *op_inv = inv; |
551 | object *op_inv = inv; |
|
|
552 | key_value *last_kv = key_values; |
524 | |
553 | |
525 | for (;;) |
554 | for (;;) |
526 | { |
555 | { |
527 | switch (f.kw) |
556 | switch (f.kw) |
528 | { |
557 | { |
… | |
… | |
549 | case KW_race: f.get_ornull (race); break; |
578 | case KW_race: f.get_ornull (race); break; |
550 | case KW_slaying: f.get_ornull (slaying); break; |
579 | case KW_slaying: f.get_ornull (slaying); break; |
551 | case KW_tag: f.get_ornull (tag); break; |
580 | case KW_tag: f.get_ornull (tag); break; |
552 | |
581 | |
553 | case KW_arch: |
582 | case KW_arch: |
554 | { |
|
|
555 | object *tmp = object::read (f); |
583 | if (object *tmp = object::read (f)) |
556 | tmp->deactivate (); |
|
|
557 | |
|
|
558 | { |
584 | { |
|
|
585 | tmp->deactivate (); |
|
|
586 | |
559 | // was: insert_ob_in_ob (tmp, op); |
587 | // was: insert_ob_in_ob (tmp, op); |
560 | // but manually adding it can improve map loading times a lot |
588 | // but manually adding it can improve map loading times a lot |
561 | // also, appending instead of prepending keeps the |
589 | // also, appending instead of prepending keeps the |
562 | // save ordering the same between repeated load/saves. |
590 | // save ordering the same between repeated load/saves. |
563 | // and finally we do not want any funny effects |
591 | // and finally we do not want any funny effects |
… | |
… | |
580 | |
608 | |
581 | tmp->below = 0; |
609 | tmp->below = 0; |
582 | tmp->env = this; |
610 | tmp->env = this; |
583 | op_inv = tmp; |
611 | op_inv = tmp; |
584 | } |
612 | } |
585 | } |
613 | else |
|
|
614 | LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n"); |
|
|
615 | |
586 | continue; |
616 | continue; |
587 | |
617 | |
588 | case KW_other_arch: |
618 | case KW_other_arch: |
589 | if (loading_arch == this) |
619 | if (loading_arch == this) |
590 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
620 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
… | |
… | |
606 | CLEAR_FLAG (this, FLAG_ANIMATE); |
636 | CLEAR_FLAG (this, FLAG_ANIMATE); |
607 | animation_id = 0; |
637 | animation_id = 0; |
608 | |
638 | |
609 | const char *str = f.get_str (); |
639 | const char *str = f.get_str (); |
610 | if (str && (animation_id = find_animation (str))) |
640 | if (str && (animation_id = find_animation (str))) |
611 | SET_FLAG (this, FLAG_ANIMATE); |
641 | SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here |
612 | } |
642 | } |
613 | break; |
643 | break; |
614 | |
644 | |
615 | case KW_last_heal: f.get (last_heal); break; |
645 | case KW_last_heal: f.get (last_heal); break; |
616 | case KW_last_sp: f.get (last_sp); break; |
646 | case KW_last_sp: f.get (last_sp); 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 |
|
|
1057 | static char * |
|
|
1058 | get_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 |
1106 | static void |
1112 | static void |
1107 | write_diff (object_freezer &f, object *op, object *tmp) |
1113 | write_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 |
… | |
… | |
1126 | KW_applied, |
1132 | KW_applied, |
1127 | KW_unpaid, |
1133 | KW_unpaid, |
1128 | KW_can_use_shield, |
1134 | KW_can_use_shield, |
1129 | KW_no_pick, |
1135 | KW_no_pick, |
1130 | KW_NULL, // walk_on |
1136 | KW_NULL, // walk_on |
|
|
1137 | /* 10 */ |
1131 | KW_NULL, // no_pass |
1138 | KW_NULL, // no_pass |
1132 | /* 10 */ |
|
|
1133 | KW_is_animated, |
1139 | KW_is_animated, |
1134 | KW_NULL, // slow_move |
1140 | KW_NULL, // slow_move |
1135 | KW_NULL, // flying |
1141 | KW_NULL, // flying |
1136 | KW_monster, |
1142 | KW_monster, |
1137 | KW_friendly, |
1143 | KW_friendly, |
1138 | KW_generator, |
1144 | KW_generator, |
1139 | KW_is_thrown, |
1145 | KW_is_thrown, |
1140 | KW_auto_apply, |
1146 | KW_auto_apply, |
1141 | KW_treasure_env, |
1147 | KW_treasure_env, |
|
|
1148 | /* 20 */ |
1142 | KW_player_sold, |
1149 | KW_player_sold, |
1143 | /* 20 */ |
|
|
1144 | KW_see_invisible, |
1150 | KW_see_invisible, |
1145 | KW_can_roll, |
1151 | KW_can_roll, |
1146 | KW_overlay_floor, |
1152 | KW_overlay_floor, |
1147 | KW_is_turnable, |
1153 | KW_is_turnable, |
1148 | KW_NULL, // walk_off |
1154 | KW_NULL, // walk_off |
1149 | KW_NULL, // fly_on |
1155 | KW_NULL, // fly_on |
1150 | KW_NULL, // fly_off |
1156 | KW_NULL, // fly_off |
1151 | KW_is_used_up, |
1157 | KW_is_used_up, |
1152 | KW_identified, |
1158 | KW_identified, |
|
|
1159 | /* 30 */ |
1153 | KW_reflecting, |
1160 | KW_reflecting, |
1154 | /* 30 */ |
|
|
1155 | KW_changing, |
1161 | KW_changing, |
1156 | KW_splitting, |
1162 | KW_splitting, |
1157 | KW_hitback, |
1163 | KW_hitback, |
1158 | KW_startequip, |
1164 | KW_startequip, |
1159 | KW_blocksview, |
1165 | KW_blocksview, |
1160 | KW_undead, |
1166 | KW_undead, |
1161 | KW_scared, |
1167 | KW_scared, |
1162 | KW_unaggressive, |
1168 | KW_unaggressive, |
1163 | KW_reflect_missile, |
1169 | KW_reflect_missile, |
|
|
1170 | /* 40 */ |
1164 | KW_reflect_spell, |
1171 | KW_reflect_spell, |
1165 | /* 40 */ |
|
|
1166 | KW_no_magic, |
1172 | KW_no_magic, |
1167 | KW_no_fix_player, |
1173 | KW_no_fix_player, |
1168 | KW_is_lightable, |
1174 | KW_is_lightable, |
1169 | KW_tear_down, |
1175 | KW_tear_down, |
1170 | KW_run_away, |
1176 | KW_run_away, |
1171 | KW_NULL, // pass_thru |
1177 | KW_NULL, // pass_thru |
1172 | KW_NULL, // an_pass_thru |
1178 | KW_NULL, // an_pass_thru |
1173 | KW_pick_up, |
1179 | KW_pick_up, |
1174 | KW_unique, |
1180 | KW_unique, |
|
|
1181 | /* 50 */ |
1175 | KW_no_drop, |
1182 | KW_no_drop, |
1176 | /* 50 */ |
|
|
1177 | KW_NULL, // wizcast |
1183 | KW_NULL, // wizcast |
1178 | KW_can_cast_spell, |
1184 | KW_can_cast_spell, |
1179 | KW_can_use_scroll, |
1185 | KW_can_use_scroll, |
1180 | KW_can_use_range, |
1186 | KW_can_use_range, |
1181 | KW_can_use_bow, |
1187 | KW_can_use_bow, |
1182 | KW_can_use_armour, |
1188 | KW_can_use_armour, |
1183 | KW_can_use_weapon, |
1189 | KW_can_use_weapon, |
1184 | KW_can_use_ring, |
1190 | KW_can_use_ring, |
1185 | KW_has_ready_range, |
1191 | KW_has_ready_range, |
|
|
1192 | /* 60 */ |
1186 | KW_has_ready_bow, |
1193 | KW_has_ready_bow, |
1187 | /* 60 */ |
|
|
1188 | KW_xrays, |
1194 | KW_xrays, |
1189 | KW_NULL, |
1195 | KW_NULL, |
1190 | KW_is_floor, |
1196 | KW_is_floor, |
1191 | KW_lifesave, |
1197 | KW_lifesave, |
1192 | KW_no_strength, |
1198 | KW_no_strength, |
1193 | KW_sleep, |
1199 | KW_sleep, |
1194 | KW_stand_still, |
1200 | KW_stand_still, |
1195 | KW_random_move, |
1201 | KW_random_move, |
1196 | KW_only_attack, |
1202 | KW_only_attack, |
|
|
1203 | /* 70 */ |
1197 | KW_confused, |
1204 | KW_confused, |
1198 | /* 70 */ |
|
|
1199 | KW_stealth, |
1205 | KW_stealth, |
1200 | KW_NULL, |
1206 | KW_NULL, |
1201 | KW_NULL, |
1207 | KW_NULL, |
1202 | KW_cursed, |
1208 | KW_cursed, |
1203 | KW_damned, |
1209 | KW_damned, |
1204 | KW_see_anywhere, |
1210 | KW_see_anywhere, |
1205 | KW_known_magical, |
1211 | KW_known_magical, |
1206 | KW_known_cursed, |
1212 | KW_known_cursed, |
1207 | KW_can_use_skill, |
1213 | KW_can_use_skill, |
|
|
1214 | /* 80 */ |
1208 | KW_been_applied, |
1215 | KW_been_applied, |
1209 | /* 80 */ |
|
|
1210 | KW_has_ready_scroll, |
1216 | KW_has_ready_scroll, |
1211 | KW_can_use_rod, |
1217 | KW_can_use_rod, |
1212 | KW_precious, |
1218 | KW_precious, |
1213 | KW_can_use_horn, |
1219 | KW_can_use_horn, |
1214 | KW_make_invisible, |
1220 | KW_make_invisible, |
1215 | KW_inv_locked, |
1221 | KW_inv_locked, |
1216 | KW_is_wooded, |
1222 | KW_is_wooded, |
1217 | KW_is_hilly, |
1223 | KW_is_hilly, |
1218 | KW_has_ready_skill, |
1224 | KW_has_ready_skill, |
|
|
1225 | /* 90 */ |
1219 | KW_has_ready_weapon, |
1226 | KW_has_ready_weapon, |
1220 | /* 90 */ |
|
|
1221 | KW_no_skill_ident, |
1227 | KW_no_skill_ident, |
1222 | KW_is_blind, |
1228 | KW_is_blind, |
1223 | KW_can_see_in_dark, |
1229 | KW_can_see_in_dark, |
1224 | KW_is_cauldron, |
1230 | KW_is_cauldron, |
1225 | KW_NULL, |
1231 | KW_NULL, |
1226 | KW_no_steal, |
1232 | KW_no_steal, |
1227 | KW_one_hit, |
1233 | KW_one_hit, |
1228 | KW_NULL, |
1234 | KW_NULL, |
1229 | KW_berserk, |
1235 | KW_berserk, |
|
|
1236 | /* 100 */ |
1230 | KW_neutral, |
1237 | KW_neutral, |
1231 | /* 100 */ |
|
|
1232 | KW_no_attack, |
1238 | KW_no_attack, |
1233 | KW_no_damage, |
1239 | KW_no_damage, |
1234 | KW_obj_original, |
1240 | KW_obj_original, |
1235 | KW_NULL, |
1241 | KW_NULL, |
1236 | KW_activate_on_push, |
1242 | KW_activate_on_push, |
1237 | KW_activate_on_release, |
1243 | KW_activate_on_release, |
1238 | KW_is_water, |
1244 | KW_is_water, |
1239 | KW_use_content_on_gen, |
1245 | KW_use_content_on_gen, |
1240 | KW_NULL, |
1246 | KW_NULL, |
|
|
1247 | /* 110 */ |
1241 | KW_is_buildable, |
1248 | KW_is_buildable, |
1242 | /* 110 */ |
|
|
1243 | KW_destroy_on_death, |
1249 | KW_destroy_on_death, |
1244 | KW_NULL, |
1250 | KW_NULL, |
1245 | }; |
1251 | }; |
1246 | |
1252 | |
1247 | int i; |
1253 | // obj_original is the only commonly differing flag between archetype |
|
|
1254 | // and object, so special-case it here to be able to skip the loop |
|
|
1255 | static const struct flagmask : object::flags_t |
|
|
1256 | { |
|
|
1257 | flagmask () |
|
|
1258 | { |
|
|
1259 | for (int i = 0; i < NUM_FLAGS; i++) |
|
|
1260 | if (flag_names [i]) |
|
|
1261 | set (i); |
|
|
1262 | } |
|
|
1263 | } flagmask; |
1248 | |
1264 | |
1249 | /* This saves the key/value lists. We do it first so that any |
1265 | /* 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. |
1266 | * keys that match field names will be overwritten by the loader. |
1251 | */ |
1267 | */ |
1252 | for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) |
1268 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1253 | { |
1269 | if (!arch->key_values || arch->kv (kv->key) != kv->value) |
1254 | /* Find the field in the opposing member. */ |
1270 | f.put (kv->key, kv->value); |
1255 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
|
|
1256 | |
1271 | |
1257 | /* If there's no partnering field, or it's got a different value, save our field. */ |
1272 | if (op->uuid) |
1258 | if (!arch_field || my_field->value != arch_field->value) |
|
|
1259 | f.put (my_field->key, my_field->value); |
|
|
1260 | } |
1273 | { |
|
|
1274 | // highly optimised - this is often 25% of all data written |
|
|
1275 | char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1); |
|
|
1276 | char *ptr = cur; |
1261 | |
1277 | |
1262 | /* We don't need to worry about the arch's extra fields - they |
1278 | memcpy (ptr, "uuid ", sizeof ("uuid ") - 1); |
1263 | * will get taken care of the copy_to method. |
1279 | ptr += sizeof ("uuid ") - 1; |
1264 | */ |
1280 | ptr = op->uuid.append (ptr); |
|
|
1281 | *ptr++ = '\n'; |
1265 | |
1282 | |
1266 | f.put (KW_uuid, op->uuid.c_str ()); |
1283 | f.alloc (ptr - cur); |
|
|
1284 | } |
1267 | |
1285 | |
1268 | #define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) |
1286 | #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) |
1287 | #define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v) |
1270 | |
1288 | |
1271 | if (object *owner = op->owner) |
1289 | CMP_OUT (x); |
1272 | f.put (KW_owner, static_cast<const char *>(owner->ref ())); |
1290 | CMP_OUT (y); |
|
|
1291 | |
|
|
1292 | CMP_OUT (type); |
|
|
1293 | CMP_OUT (subtype); |
|
|
1294 | CMP_OUT (direction); |
1273 | |
1295 | |
1274 | CMP_OUT (name); |
1296 | CMP_OUT (name); |
1275 | CMP_OUT (name_pl); |
1297 | CMP_OUT (name_pl); |
1276 | CMP_OUT (custom_name); |
1298 | |
|
|
1299 | CMP_OUT (speed); |
|
|
1300 | CMP_OUT (speed_left); |
|
|
1301 | |
1277 | CMP_OUT (title); |
1302 | CMP_OUT (title); |
1278 | CMP_OUT (race); |
1303 | CMP_OUT (race); |
1279 | CMP_OUT (slaying); |
1304 | CMP_OUT (slaying); |
|
|
1305 | CMP_OUT (skill); |
|
|
1306 | |
1280 | CMP_OUT (tag); |
1307 | CMP_OUT (tag); |
|
|
1308 | CMP_OUT (custom_name); |
|
|
1309 | |
|
|
1310 | if (object *owner = op->owner) |
|
|
1311 | f.put (KW_owner, static_cast<const char *>(owner->ref ())); |
|
|
1312 | |
|
|
1313 | // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved |
|
|
1314 | |
1281 | CMP_OUT (other_arch); |
1315 | CMP_OUT (other_arch); |
1282 | |
1316 | |
1283 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
1317 | 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); |
1318 | if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore); |
1285 | |
1319 | |
1286 | if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); |
1320 | 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); |
1321 | 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); |
1322 | if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1289 | |
1323 | |
1290 | if (op->animation_id != tmp->animation_id) |
1324 | if (op->animation_id != arch->animation_id) |
1291 | if (op->animation_id) |
1325 | if (op->has_anim ()) |
|
|
1326 | f.put (KW_animation, op->anim ().name); |
|
|
1327 | else |
1292 | { |
1328 | { |
1293 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1329 | f.put (KW_animation, (const char *)0); |
1294 | |
1330 | 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 | } |
1331 | } |
1298 | else |
|
|
1299 | f.put (KW_animation, (const char *)0); |
|
|
1300 | |
1332 | |
1301 | CMP_OUT2 (str, stats.Str); |
1333 | CMP_OUT2 (str, stats.Str); |
1302 | CMP_OUT2 (dex, stats.Dex); |
1334 | CMP_OUT2 (dex, stats.Dex); |
1303 | CMP_OUT2 (con, stats.Con); |
1335 | CMP_OUT2 (con, stats.Con); |
1304 | CMP_OUT2 (wis, stats.Wis); |
1336 | CMP_OUT2 (wis, stats.Wis); |
… | |
… | |
1313 | CMP_OUT2 (grace, stats.grace); |
1345 | CMP_OUT2 (grace, stats.grace); |
1314 | CMP_OUT2 (maxgrace, stats.maxgrace); |
1346 | CMP_OUT2 (maxgrace, stats.maxgrace); |
1315 | CMP_OUT2 (exp, stats.exp); |
1347 | CMP_OUT2 (exp, stats.exp); |
1316 | |
1348 | |
1317 | CMP_OUT (perm_exp); |
1349 | CMP_OUT (perm_exp); |
1318 | CMP_OUT (expmul); |
1350 | //CMP_OUT (expmul); |
1319 | |
1351 | |
1320 | CMP_OUT2 (food, stats.food); |
1352 | CMP_OUT2 (food, stats.food); |
1321 | CMP_OUT2 (dam, stats.dam); |
1353 | CMP_OUT2 (dam, stats.dam); |
1322 | CMP_OUT2 (luck, stats.luck); |
1354 | CMP_OUT2 (luck, stats.luck); |
1323 | CMP_OUT2 (wc, stats.wc); |
1355 | CMP_OUT2 (wc, stats.wc); |
1324 | CMP_OUT2 (ac, stats.ac); |
1356 | CMP_OUT2 (ac, stats.ac); |
1325 | |
1357 | |
1326 | CMP_OUT (x); |
|
|
1327 | CMP_OUT (y); |
|
|
1328 | CMP_OUT (speed); |
|
|
1329 | CMP_OUT (speed_left); |
|
|
1330 | CMP_OUT2 (move_state, move_status); |
1358 | CMP_OUT2 (move_state, move_status); |
1331 | CMP_OUT (attack_movement); |
1359 | CMP_OUT (attack_movement); |
1332 | CMP_OUT (nrof); |
1360 | CMP_OUT (nrof); |
1333 | CMP_OUT (level); |
1361 | CMP_OUT (level); |
1334 | CMP_OUT (direction); |
|
|
1335 | CMP_OUT (type); |
|
|
1336 | CMP_OUT (subtype); |
|
|
1337 | CMP_OUT (attacktype); |
1362 | CMP_OUT (attacktype); |
1338 | |
1363 | |
|
|
1364 | // using memcmp here seems to be a loss - us gcc vectorising? |
1339 | for (i = 0; i < NROFATTACKS; i++) |
1365 | for (int i = 0; i < NROFATTACKS; i++) |
1340 | if (expect_false (op->resist[i] != tmp->resist[i])) |
1366 | if (expect_false (op->resist[i] != arch->resist[i])) |
1341 | f.put (resist_save[i], op->resist[i]); |
1367 | f.put (resist_save[i], op->resist[i]); |
1342 | |
1368 | |
1343 | CMP_OUT (path_attuned); |
1369 | CMP_OUT (path_attuned); |
1344 | CMP_OUT (path_repelled); |
1370 | CMP_OUT (path_repelled); |
1345 | CMP_OUT (path_denied); |
1371 | CMP_OUT (path_denied); |
… | |
… | |
1355 | CMP_OUT (last_sp); |
1381 | CMP_OUT (last_sp); |
1356 | CMP_OUT (last_grace); |
1382 | CMP_OUT (last_grace); |
1357 | CMP_OUT (last_eat); |
1383 | CMP_OUT (last_eat); |
1358 | CMP_OUT (glow_radius); |
1384 | CMP_OUT (glow_radius); |
1359 | |
1385 | |
1360 | if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) |
1386 | if (op->flag [FLAG_IS_LINKED]) |
|
|
1387 | if (auto (ol, op->find_link ())) |
1361 | f.put (KW_connected, i); |
1388 | f.put (KW_connected, ol->id); |
1362 | |
1389 | |
1363 | CMP_OUT (randomitems); |
1390 | CMP_OUT (randomitems); |
1364 | CMP_OUT2 (container, weight_limit); |
1391 | CMP_OUT2 (container, weight_limit); |
1365 | |
1392 | |
1366 | CMP_OUT (run_away); |
1393 | CMP_OUT (run_away); |
1367 | CMP_OUT (pick_up); |
1394 | CMP_OUT (pick_up); |
1368 | CMP_OUT (will_apply); |
1395 | CMP_OUT (will_apply); |
1369 | CMP_OUT (smoothlevel); |
1396 | CMP_OUT (smoothlevel); |
1370 | CMP_OUT (weapontype); |
1397 | CMP_OUT (weapontype); |
1371 | CMP_OUT (tooltype); |
|
|
1372 | CMP_OUT (elevation); |
|
|
1373 | CMP_OUT (client_type); |
1398 | CMP_OUT (client_type); |
1374 | CMP_OUT (item_power); |
1399 | CMP_OUT (item_power); |
1375 | CMP_OUT (duration); |
1400 | CMP_OUT (duration); |
1376 | CMP_OUT (range); |
1401 | CMP_OUT (range); |
1377 | CMP_OUT (range_modifier); |
1402 | CMP_OUT (range_modifier); |
… | |
… | |
1385 | CMP_OUT (move_on); |
1410 | CMP_OUT (move_on); |
1386 | CMP_OUT (move_off); |
1411 | CMP_OUT (move_off); |
1387 | CMP_OUT (move_slow); |
1412 | CMP_OUT (move_slow); |
1388 | CMP_OUT (move_slow_penalty); |
1413 | CMP_OUT (move_slow_penalty); |
1389 | |
1414 | |
1390 | if (op->flag != tmp->flag) |
1415 | object::flags_t diff = (op->flag ^ arch->flag) & flagmask; |
|
|
1416 | |
|
|
1417 | if (diff [FLAG_OBJ_ORIGINAL]) |
|
|
1418 | f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0"); |
|
|
1419 | |
|
|
1420 | diff.reset (FLAG_OBJ_ORIGINAL); |
|
|
1421 | |
|
|
1422 | // quickly test whether any other flags differ |
|
|
1423 | if (expect_true (diff.any ())) |
1391 | for (i = 0; i <= NUM_FLAGS; i++) |
1424 | for (int i = 0; i < NUM_FLAGS; i++) |
1392 | if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) |
1425 | if (expect_false (diff [i])) |
1393 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1426 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1394 | |
1427 | |
1395 | // save body locations |
1428 | // save body locations. gcc's memcmp does an abysmal job when used |
1396 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1429 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1397 | if (expect_false (op->slot[i].info != tmp->slot[i].info)) |
1430 | if (expect_false (op->slot[i].info != arch->slot[i].info)) |
1398 | f.put (body_locations[i].save_name, op->slot[i].info); |
1431 | f.put (body_locations[i].save_name, op->slot[i].info); |
1399 | } |
1432 | } |
1400 | |
1433 | |
1401 | /* |
1434 | /* |
1402 | * Dumps all variables in an object to a file. |
1435 | * Dumps all variables in an object to a file. |
… | |
… | |
1404 | * the only place this is not set is when saving the player. |
1437 | * the only place this is not set is when saving the player. |
1405 | */ |
1438 | */ |
1406 | bool |
1439 | bool |
1407 | object::write (object_freezer &f) |
1440 | object::write (object_freezer &f) |
1408 | { |
1441 | { |
1409 | archetype *at = arch ? arch : archetype::empty; |
1442 | if (is_arch ()) |
1410 | |
1443 | { |
|
|
1444 | f.put (KW_object, arch->archname); |
|
|
1445 | write_diff (f, this, archetype::empty); |
|
|
1446 | } |
|
|
1447 | else |
|
|
1448 | { |
1411 | f.put (KW_arch, at->archname); |
1449 | f.put (KW_arch, arch->archname); |
1412 | write_diff (f, this, at); |
1450 | write_diff (f, this, arch); |
|
|
1451 | } |
1413 | |
1452 | |
1414 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1453 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1415 | tmp->write (f); |
1454 | tmp->write (f); |
1416 | |
1455 | |
1417 | f.put (this); |
1456 | f.put (this); |