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,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * the terms of the Affero GNU General Public License as published by the |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * option) any later version. |
11 | * option) any later version. |
… | |
… | |
21 | * |
21 | * |
22 | * 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> |
23 | */ |
23 | */ |
24 | |
24 | |
25 | #include <global.h> |
25 | #include <global.h> |
26 | #include <loader.h> |
|
|
27 | #include <sproto.h> |
26 | #include <sproto.h> |
28 | |
27 | |
29 | ///////////////////////////////////////////////////////////////////////////// |
28 | ///////////////////////////////////////////////////////////////////////////// |
30 | |
29 | |
31 | extern archetype *loading_arch; |
30 | extern archetype *loading_arch; |
… | |
… | |
266 | type = 0; |
265 | type = 0; |
267 | } |
266 | } |
268 | |
267 | |
269 | switch (type) |
268 | switch (type) |
270 | { |
269 | { |
|
|
270 | case RANGED: |
271 | case BOW: |
271 | case BOW: |
272 | case WAND: |
272 | case WAND: |
273 | case ROD: |
273 | case ROD: |
274 | case HORN: |
274 | case HORN: |
275 | if (slot [body_range].info != -1) |
275 | if (slot [body_range].info != -1) |
… | |
… | |
333 | |
333 | |
334 | /* objects now have a materialname. try to patch it in */ |
334 | /* objects now have a materialname. try to patch it in */ |
335 | if (material == MATERIAL_NULL && !(is_weapon () && level > 0)) |
335 | if (material == MATERIAL_NULL && !(is_weapon () && level > 0)) |
336 | select_material (this, map ? map->difficulty : 5); |
336 | select_material (this, map ? map->difficulty : 5); |
337 | |
337 | |
|
|
338 | if (speed < 0.) |
|
|
339 | { |
|
|
340 | flag [FLAG_RANDOM_SPEED] = true; |
|
|
341 | speed = -speed; |
|
|
342 | // speed_left will be randomised in instantiate () and copy_to () |
|
|
343 | } |
|
|
344 | |
338 | /* only do these when program is first run - a bit |
345 | /* only do these when program is first run - a bit |
339 | * excessive to do this at every run - most of this is |
346 | * excessive to do this at every run - most of this is |
340 | * really just to catch any errors - program will still run, but |
347 | * really just to catch any errors - program will still run, but |
341 | * not in the ideal fashion. |
348 | * not in the ideal fashion. |
342 | */ |
349 | */ |
… | |
… | |
388 | if (ip > 2 * item_power && ip > (item_power + 3)) |
395 | if (ip > 2 * item_power && ip > (item_power + 3)) |
389 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
396 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
390 | #endif |
397 | #endif |
391 | } |
398 | } |
392 | |
399 | |
393 | /* old style spellcasting object (pretty common) - need to load in the appropiate object */ |
400 | /* old style spellcasting object (pretty common) - need to load in the appropriate object */ |
394 | /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ |
401 | /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ |
395 | if ((type == ROD |
402 | if ((type == ROD |
396 | || type == WAND |
403 | || type == WAND |
397 | || type == SCROLL |
404 | || type == SCROLL |
398 | || type == HORN |
405 | || type == HORN |
… | |
… | |
407 | // TODO: fix firewall object on map |
414 | // TODO: fix firewall object on map |
408 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
415 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
409 | * in that spell was stored in sp. |
416 | * in that spell was stored in sp. |
410 | */ |
417 | */ |
411 | //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
418 | //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
412 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
419 | object *tmp = archetype::get (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
413 | insert_ob_in_ob (tmp, this); |
420 | insert_ob_in_ob (tmp, this); |
414 | randomitems = 0; |
421 | randomitems = 0; |
415 | } |
422 | } |
416 | |
423 | |
417 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
424 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
… | |
… | |
423 | randomitems = 0; /* So another spell isn't created for this object */ |
430 | randomitems = 0; /* So another spell isn't created for this object */ |
424 | /* without this, value is all screwed up */ |
431 | /* without this, value is all screwed up */ |
425 | value = arch->value * inv->value; |
432 | value = arch->value * inv->value; |
426 | } |
433 | } |
427 | |
434 | |
428 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
435 | if (this->flag [FLAG_MONSTER]) |
429 | { |
436 | { |
430 | if (stats.hp > stats.maxhp) |
437 | if (stats.hp > stats.maxhp) |
431 | { |
438 | { |
432 | LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
439 | LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
433 | stats.maxhp = stats.hp; |
440 | stats.maxhp = stats.hp; |
… | |
… | |
436 | /* The archs just need to be updated for this */ |
443 | /* The archs just need to be updated for this */ |
437 | if (move_type == 0) |
444 | if (move_type == 0) |
438 | move_type = MOVE_WALK; |
445 | move_type = MOVE_WALK; |
439 | } |
446 | } |
440 | |
447 | |
441 | if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) |
448 | if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER) |
442 | /* Object will duplicate it's content as part of the |
449 | /* Object will duplicate it's content as part of the |
443 | * generation process. To do this, we must flag inventory |
450 | * generation process. To do this, we must flag inventory |
444 | * so it remains unevaluated concerning the randomitems and |
451 | * so it remains unevaluated concerning the randomitems and |
445 | * the living (a demonlord shouldn't cast from inside generator!) |
452 | * the living (a demonlord shouldn't cast from inside generator!) |
446 | */ |
453 | */ |
… | |
… | |
516 | { |
523 | { |
517 | negate = 1; |
524 | negate = 1; |
518 | str++; |
525 | str++; |
519 | } |
526 | } |
520 | |
527 | |
521 | for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) |
528 | for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f) |
522 | { |
529 | { |
523 | if (!strcmp (f->name, str)) |
530 | if (!strcmp (f->name, str)) |
524 | { |
531 | { |
525 | if (negate) |
532 | if (negate) |
526 | mt &= ~f->flags; |
533 | mt &= ~f->flags; |
… | |
… | |
543 | |
550 | |
544 | bool |
551 | bool |
545 | object::parse_kv (object_thawer &f) |
552 | object::parse_kv (object_thawer &f) |
546 | { |
553 | { |
547 | object *op_inv = inv; |
554 | object *op_inv = inv; |
548 | key_value *last_kv = key_values; |
555 | key_value *last_kv = kv.first; |
549 | |
556 | |
550 | for (;;) |
557 | for (;;) |
551 | { |
558 | { |
552 | switch (f.kw) |
559 | switch (f.kw) |
553 | { |
560 | { |
… | |
… | |
582 | // was: insert_ob_in_ob (tmp, op); |
589 | // was: insert_ob_in_ob (tmp, op); |
583 | // but manually adding it can improve map loading times a lot |
590 | // but manually adding it can improve map loading times a lot |
584 | // also, appending instead of prepending keeps the |
591 | // also, appending instead of prepending keeps the |
585 | // save ordering the same between repeated load/saves. |
592 | // save ordering the same between repeated load/saves. |
586 | // and finally we do not want any funny effects |
593 | // and finally we do not want any funny effects |
587 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
594 | tmp->clr_flag (FLAG_OBJ_ORIGINAL); |
588 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
595 | tmp->clr_flag (FLAG_REMOVED); |
589 | |
596 | |
590 | if (!op_inv) |
597 | if (!op_inv) |
591 | { |
598 | { |
592 | inv = tmp; |
599 | inv = tmp; |
593 | tmp->above = 0; |
600 | tmp->above = 0; |
… | |
… | |
626 | f.delayed_deref (this, owner, f.get_str ()); |
633 | f.delayed_deref (this, owner, f.get_str ()); |
627 | break; |
634 | break; |
628 | |
635 | |
629 | case KW_animation: |
636 | case KW_animation: |
630 | { |
637 | { |
631 | CLEAR_FLAG (this, FLAG_ANIMATE); |
638 | this->clr_flag (FLAG_ANIMATE); |
632 | animation_id = 0; |
639 | animation_id = 0; |
633 | |
640 | |
634 | if (f.has_value () && (animation_id = find_animation (f.get_str ()))) |
641 | if (f.has_value () && (animation_id = find_animation (f.get_str ()))) |
635 | SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here |
642 | this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here |
636 | } |
643 | } |
637 | break; |
644 | break; |
638 | |
645 | |
639 | case KW_last_heal: f.get (last_heal); break; |
646 | case KW_last_heal: f.get (last_heal); break; |
640 | case KW_last_sp: f.get (last_sp); break; |
647 | case KW_last_sp: f.get (last_sp); break; |
641 | case KW_last_grace: f.get (last_grace); break; |
648 | case KW_last_grace: f.get (last_grace); break; |
642 | case KW_last_eat: f.get (last_eat); break; |
649 | case KW_last_eat: f.get (last_eat); break; |
|
|
650 | case KW_sl: |
643 | case KW_speed_left: f.get (speed_left); break; |
651 | case KW_speed_left: f.get (speed_left); break; |
644 | |
652 | |
645 | case KW_speed: |
653 | case KW_speed: |
646 | f.get (speed); |
654 | f.get (speed); |
647 | |
655 | |
… | |
… | |
729 | case KW_invisible: f.get (invisible); break; |
737 | case KW_invisible: f.get (invisible); break; |
730 | case KW_magic: f.get (magic); break; |
738 | case KW_magic: f.get (magic); break; |
731 | case KW_state: f.get (state); break; |
739 | case KW_state: f.get (state); break; |
732 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
740 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
733 | case KW_material: f.get (materials); break; //TODO: nuke |
741 | case KW_material: f.get (materials); break; //TODO: nuke |
734 | |
742 | case KW_materialname: f.get (material); break; |
735 | case KW_materialname: |
|
|
736 | { |
|
|
737 | shstr sh; |
|
|
738 | f.get (sh); |
|
|
739 | material = name_to_material (sh); |
|
|
740 | } |
|
|
741 | break; |
|
|
742 | |
743 | |
743 | /* These are the new values */ |
744 | /* These are the new values */ |
744 | case KW_move_block: set_move (move_block, f); break; |
745 | case KW_move_block: set_move (move_block, f); break; |
745 | case KW_move_allow: set_move (move_allow, f); break; |
746 | case KW_move_allow: set_move (move_allow, f); break; |
746 | case KW_move_type: set_move (move_type , f); break; |
747 | case KW_move_type: set_move (move_type , f); break; |
… | |
… | |
817 | |
818 | |
818 | |
819 | |
819 | case KW_identified: |
820 | case KW_identified: |
820 | GET_FLAG (this, FLAG_IDENTIFIED); |
821 | GET_FLAG (this, FLAG_IDENTIFIED); |
821 | //TODO: move to check_object or so |
822 | //TODO: move to check_object or so |
822 | if (QUERY_FLAG (this, FLAG_IDENTIFIED)) |
823 | if (this->flag [FLAG_IDENTIFIED]) |
823 | CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); |
824 | this->clr_flag (FLAG_KNOWN_MAGICAL); |
824 | |
825 | |
825 | break; |
826 | break; |
826 | |
827 | |
827 | case KW_friendly: |
828 | case KW_friendly: |
828 | if (f.get_bool ()) |
829 | if (f.get_bool ()) |
… | |
… | |
916 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
917 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
917 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
918 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
918 | case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; |
919 | case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; |
919 | case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; |
920 | case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; |
920 | case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; |
921 | case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; |
|
|
922 | case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break; |
|
|
923 | case KW_is_quad: GET_FLAG (this, FLAG_IS_QUAD); break; |
921 | |
924 | |
922 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
925 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
923 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
926 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
924 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
927 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
925 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
928 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
… | |
… | |
1037 | |
1040 | |
1038 | f.next (); |
1041 | f.next (); |
1039 | return true; |
1042 | return true; |
1040 | |
1043 | |
1041 | case KW_ERROR: |
1044 | case KW_ERROR: |
1042 | // append as key value pair (do not use kv_set as it prepends) |
|
|
1043 | // we also do not even try to find old values, duplicate keys stay duplicate |
1045 | // we do not even try to find old values, duplicate keys stay duplicate |
1044 | { |
1046 | // the list gets reversed after loading |
1045 | key_value *kv = new key_value; |
1047 | kv.add (shstr (f.kw_str), shstr (f.value)); |
1046 | |
|
|
1047 | kv->next = 0; |
|
|
1048 | kv->key = shstr (f.kw_str); |
|
|
1049 | kv->value = shstr (f.value); |
|
|
1050 | |
|
|
1051 | if (!last_kv) |
|
|
1052 | key_values = last_kv = kv; |
|
|
1053 | else |
|
|
1054 | { |
|
|
1055 | while (last_kv->next) |
|
|
1056 | last_kv = last_kv->next; |
|
|
1057 | |
|
|
1058 | last_kv->next = kv; |
|
|
1059 | last_kv = kv; |
|
|
1060 | } |
|
|
1061 | } |
|
|
1062 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
|
|
1063 | break; |
1048 | break; |
1064 | |
1049 | |
1065 | default: |
1050 | default: |
1066 | if (!f.parse_error ("object", name)) |
1051 | if (!f.parse_error ("object", name)) |
1067 | return false; |
1052 | return false; |
… | |
… | |
1079 | |
1064 | |
1080 | archetype *arch = archetype::find (f.get_str ()); |
1065 | archetype *arch = archetype::find (f.get_str ()); |
1081 | |
1066 | |
1082 | if (!arch) |
1067 | if (!arch) |
1083 | { |
1068 | { |
1084 | LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); |
1069 | LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ()); |
1085 | arch = archetype::find (shstr_earthwall); |
1070 | arch = archetype::find (shstr_earthwall); |
1086 | } |
1071 | } |
1087 | |
1072 | |
1088 | assert (arch); //D maybe use exception handling of sorts? |
1073 | assert (arch); //D maybe use exception handling of sorts? |
1089 | |
1074 | |
… | |
… | |
1097 | if (!op->parse_kv (f)) |
1082 | if (!op->parse_kv (f)) |
1098 | { |
1083 | { |
1099 | op->destroy (); |
1084 | op->destroy (); |
1100 | return 0; |
1085 | return 0; |
1101 | } |
1086 | } |
|
|
1087 | |
|
|
1088 | // the loader reverses the ordering of kv-pairs, so we reverse it again after loading |
|
|
1089 | // that greatly simplifies the loading code. |
|
|
1090 | op->kv.reverse (); |
1102 | |
1091 | |
1103 | op->post_load_check (); |
1092 | op->post_load_check (); |
1104 | return op; |
1093 | return op; |
1105 | } |
1094 | } |
1106 | |
1095 | |
… | |
… | |
1111 | * override values and in c_wiz to mutate values. |
1100 | * override values and in c_wiz to mutate values. |
1112 | */ |
1101 | */ |
1113 | int |
1102 | int |
1114 | set_variable (object *op, char *buf) |
1103 | set_variable (object *op, char *buf) |
1115 | { |
1104 | { |
1116 | object_thawer f (buf, (AV *)0); |
1105 | object_thawer f (format ("%s\nend", buf), (AV *)0); |
1117 | |
1106 | |
1118 | return op->parse_kv (f); |
1107 | return op->parse_kv (f); |
1119 | } |
1108 | } |
1120 | |
1109 | |
1121 | // compare *op against *arch and output differences |
1110 | // compare *op against *arch and output differences |
… | |
… | |
1246 | /* 100 */ |
1235 | /* 100 */ |
1247 | KW_neutral, |
1236 | KW_neutral, |
1248 | KW_no_attack, |
1237 | KW_no_attack, |
1249 | KW_no_damage, |
1238 | KW_no_damage, |
1250 | KW_obj_original, |
1239 | KW_obj_original, |
1251 | KW_NULL, |
1240 | KW_random_speed, |
1252 | KW_activate_on_push, |
1241 | KW_activate_on_push, |
1253 | KW_activate_on_release, |
1242 | KW_activate_on_release, |
1254 | KW_is_water, |
1243 | KW_is_water, |
1255 | KW_use_content_on_gen, |
1244 | KW_use_content_on_gen, |
1256 | KW_NULL, |
1245 | KW_NULL, |
… | |
… | |
1273 | } flagmask; |
1262 | } flagmask; |
1274 | |
1263 | |
1275 | /* This saves the key/value lists. We do it first so that any |
1264 | /* This saves the key/value lists. We do it first so that any |
1276 | * keys that match field names will be overwritten by the loader. |
1265 | * keys that match field names will be overwritten by the loader. |
1277 | */ |
1266 | */ |
1278 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1267 | for (key_value *kv = op->kv.first; kv; kv = kv->next) |
1279 | if (!arch->key_values || arch->kv (kv->key) != kv->value) |
1268 | if (arch->kv.empty () || arch->kv [kv->key] != kv->value) |
1280 | f.put (kv->key, kv->value); |
1269 | f.put (kv->key, kv->value); |
1281 | |
1270 | |
1282 | if (op->uuid) |
1271 | if (op->uuid) |
1283 | { |
1272 | { |
1284 | // highly optimised - this is often 25% of all data written |
1273 | // highly optimised - this is often 25% of all data written |
… | |
… | |
1303 | CMP_OUT (subtype); |
1292 | CMP_OUT (subtype); |
1304 | CMP_OUT (direction); |
1293 | CMP_OUT (direction); |
1305 | |
1294 | |
1306 | CMP_OUT (name); |
1295 | CMP_OUT (name); |
1307 | CMP_OUT (name_pl); |
1296 | CMP_OUT (name_pl); |
1308 | |
|
|
1309 | CMP_OUT (speed); |
1297 | CMP_OUT (speed); |
1310 | |
1298 | |
1311 | // speed_left is a major time-burner, and has good locality, so |
1299 | // speed_left is a major time-burner, and has good locality, so |
1312 | // we use a simple lookup-cache to avoid the very slow printf. |
1300 | // we use a simple lookup-cache to avoid the very slow printf. |
1313 | if (op->speed_left != arch->speed_left) |
1301 | if (op->speed_left != arch->speed_left) |
1314 | { |
1302 | { |
1315 | static double last_speed_left = 0.; |
1303 | static double last_speed_left = 0.; |
1316 | static char last_speed_left_str [256] = "speed_left 0\n"; |
1304 | static char last_speed_left_str [256] = "sl 0\n"; |
1317 | static int last_speed_left_len = sizeof ("speed_left 0\n") - 1; |
1305 | static int last_speed_left_len = sizeof ("sl 0\n") - 1; |
1318 | |
1306 | |
1319 | if (last_speed_left != op->speed_left) |
1307 | if (last_speed_left != op->speed_left) |
1320 | { |
1308 | { |
1321 | last_speed_left = op->speed_left; |
1309 | last_speed_left = op->speed_left; |
1322 | last_speed_left_len = sizeof ("speed_left ") - 1 |
1310 | last_speed_left_len = sizeof ("sl ") - 1 |
1323 | + sprintf (last_speed_left_str + sizeof ("speed_left ") - 1, "%.7g\n", last_speed_left); |
1311 | + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left); |
1324 | } |
1312 | } |
1325 | |
1313 | |
1326 | f.add (last_speed_left_str, last_speed_left_len); |
1314 | f.add (last_speed_left_str, last_speed_left_len); |
1327 | } |
1315 | } |
1328 | |
1316 | |
… | |
… | |
1333 | |
1321 | |
1334 | CMP_OUT (tag); |
1322 | CMP_OUT (tag); |
1335 | CMP_OUT (custom_name); |
1323 | CMP_OUT (custom_name); |
1336 | |
1324 | |
1337 | if (object *owner = op->owner) |
1325 | if (object *owner = op->owner) |
1338 | f.put (KW(owner), static_cast<const char *>(owner->ref ())); |
1326 | if (const char *ref = owner->ref ()) |
|
|
1327 | f.put (KW(owner), ref); |
1339 | |
1328 | |
1340 | // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved |
1329 | // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved |
1341 | |
1330 | |
1342 | CMP_OUT (other_arch); |
1331 | CMP_OUT (other_arch); |
1343 | |
1332 | |
… | |
… | |
1416 | if (op->flag [FLAG_IS_LINKED]) |
1405 | if (op->flag [FLAG_IS_LINKED]) |
1417 | if (auto (ol, op->find_link ())) |
1406 | if (auto (ol, op->find_link ())) |
1418 | f.put (KW(connected), ol->id); |
1407 | f.put (KW(connected), ol->id); |
1419 | |
1408 | |
1420 | CMP_OUT (randomitems); |
1409 | CMP_OUT (randomitems); |
|
|
1410 | |
1421 | CMP_OUT2 (container, weight_limit); |
1411 | CMP_OUT2 (container, weight_limit); |
1422 | |
1412 | |
1423 | CMP_OUT (run_away); |
1413 | CMP_OUT (run_away); |
1424 | CMP_OUT (pick_up); |
1414 | CMP_OUT (pick_up); |
1425 | CMP_OUT (will_apply); |
1415 | CMP_OUT (will_apply); |
… | |
… | |
1442 | CMP_OUT (move_slow); |
1432 | CMP_OUT (move_slow); |
1443 | CMP_OUT (move_slow_penalty); |
1433 | CMP_OUT (move_slow_penalty); |
1444 | |
1434 | |
1445 | object::flags_t diff = (op->flag ^ arch->flag) & flagmask; |
1435 | object::flags_t diff = (op->flag ^ arch->flag) & flagmask; |
1446 | |
1436 | |
|
|
1437 | #if stdcpp // we need gcc, sorry |
1447 | if (diff [FLAG_OBJ_ORIGINAL]) |
1438 | if (diff [FLAG_OBJ_ORIGINAL]) |
1448 | f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); |
1439 | f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); |
1449 | |
1440 | |
1450 | diff.reset (FLAG_OBJ_ORIGINAL); |
1441 | diff.reset (FLAG_OBJ_ORIGINAL); |
1451 | |
1442 | |
1452 | // quickly test whether any other flags differ |
1443 | // quickly test whether any other flags differ |
1453 | if (expect_true (diff.any ())) |
1444 | if (expect_true (diff.any ())) |
1454 | for (int i = 0; i < NUM_FLAGS; i++) |
1445 | for (int i = 0; i < NUM_FLAGS; i++) |
1455 | if (expect_false (diff [i])) |
1446 | if (expect_false (diff [i])) |
1456 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
1447 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
|
|
1448 | #else |
|
|
1449 | // use sgi extensions |
|
|
1450 | for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i)) |
|
|
1451 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
|
|
1452 | #endif |
1457 | |
1453 | |
1458 | // save body locations. gcc's memcmp does an abysmal job when used |
1454 | // save body locations. gcc's memcmp does an abysmal job when used |
1459 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1455 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1460 | if (expect_false (op->slot[i].info != arch->slot[i].info)) |
1456 | if (expect_false (op->slot[i].info != arch->slot[i].info)) |
1461 | f.put (body_locations[i].save_name, op->slot[i].info); |
1457 | f.put (body_locations[i].kw, op->slot[i].info); |
1462 | } |
1458 | } |
1463 | |
1459 | |
1464 | /* |
1460 | /* |
1465 | * Dumps all variables in an object to a file. |
1461 | * Dumps all variables in an object to a file. |
1466 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1462 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
… | |
… | |
1498 | { |
1494 | { |
1499 | object_thawer f (filename); |
1495 | object_thawer f (filename); |
1500 | |
1496 | |
1501 | for (;;) |
1497 | for (;;) |
1502 | { |
1498 | { |
|
|
1499 | coroapi::cede_to_tick (); |
|
|
1500 | |
1503 | switch (f.kw) |
1501 | switch (f.kw) |
1504 | { |
1502 | { |
1505 | case KW_region: |
1503 | case KW_region: |
1506 | if (!region::read (f)) |
1504 | if (!region::read (f)) |
1507 | return false; |
1505 | return false; |