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,2010,2011,2012 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 |
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> |
25 | #include <loader.h> |
|
|
26 | #include <sproto.h> |
26 | #include <sproto.h> |
27 | |
27 | |
28 | ///////////////////////////////////////////////////////////////////////////// |
28 | ///////////////////////////////////////////////////////////////////////////// |
29 | |
29 | |
30 | extern archetype *loading_arch; |
30 | extern archetype *loading_arch; |
|
|
31 | |
|
|
32 | //+GPL |
31 | |
33 | |
32 | /* This table is only necessary to convert objects that existed before the |
34 | /* This table is only necessary to convert objects that existed before the |
33 | * spell object conversion to the new object. It was not practical |
35 | * spell object conversion to the new object. It was not practical |
34 | * to go through every mapping looking for every potion, rod, wand, etc |
36 | * 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 |
37 | * that had a sp set and update to the new value. So this maps the |
… | |
… | |
257 | void |
259 | void |
258 | object::post_load_check () |
260 | object::post_load_check () |
259 | { |
261 | { |
260 | if (type >= NUM_TYPES) |
262 | if (type >= NUM_TYPES) |
261 | { |
263 | { |
262 | LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); |
264 | LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ()); |
263 | type = 0; |
265 | type = 0; |
264 | } |
266 | } |
265 | |
267 | |
266 | switch (type) |
268 | switch (type) |
267 | { |
269 | { |
|
|
270 | case RANGED: |
268 | case BOW: |
271 | case BOW: |
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 | |
… | |
… | |
327 | |
330 | |
328 | if (!name_pl) |
331 | if (!name_pl) |
329 | name_pl = name; |
332 | name_pl = name; |
330 | |
333 | |
331 | /* objects now have a materialname. try to patch it in */ |
334 | /* objects now have a materialname. try to patch it in */ |
332 | if (!(is_weapon () && level > 0)) |
335 | if (material == MATERIAL_NULL && !(is_weapon () && level > 0)) |
333 | set_materialname (this, map ? map->difficulty : 5, 0); |
336 | select_material (this, map ? map->difficulty : 5); |
|
|
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 | } |
334 | |
344 | |
335 | /* only do these when program is first run - a bit |
345 | /* only do these when program is first run - a bit |
336 | * excessive to do this at every run - most of this is |
346 | * excessive to do this at every run - most of this is |
337 | * really just to catch any errors - program will still run, but |
347 | * really just to catch any errors - program will still run, but |
338 | * not in the ideal fashion. |
348 | * not in the ideal fashion. |
339 | */ |
349 | */ |
340 | if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) |
350 | if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) |
341 | { |
351 | { |
342 | if (!skill) |
352 | if (!skill) |
343 | LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); |
353 | LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ()); |
344 | else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || |
354 | else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) || |
345 | (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) |
355 | (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); |
356 | LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); |
347 | } |
357 | } |
348 | |
358 | |
349 | /* We changed last_heal to gen_sp_armour, which is what it |
359 | /* We changed last_heal to gen_sp_armour, which is what it |
350 | * really does for many objects. Need to catch any in maps |
360 | * really does for many objects. Need to catch any in maps |
351 | * that may have an old value. |
361 | * that may have an old value. |
… | |
… | |
357 | || type == AMULET || type == GIRDLE |
367 | || type == AMULET || type == GIRDLE |
358 | || type == BRACERS || type == CLOAK) |
368 | || type == BRACERS || type == CLOAK) |
359 | { |
369 | { |
360 | if (last_heal) |
370 | if (last_heal) |
361 | { |
371 | { |
362 | LOG (llevError, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); |
372 | LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); |
363 | gen_sp_armour = last_heal; |
373 | gen_sp_armour = last_heal; |
364 | last_heal = 0; |
374 | last_heal = 0; |
365 | } |
375 | } |
366 | |
376 | |
367 | int ip = calc_item_power (this, 0); |
377 | int ip = calc_item_power (this, 0); |
368 | |
378 | |
369 | /* Legacy objects from before item power was in the game */ |
379 | /* Legacy objects from before item power was in the game */ |
370 | if (!item_power && ip) |
380 | if (!item_power && ip) |
371 | { |
381 | { |
372 | if (ip > 3) |
382 | if (ip > 3) |
373 | LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); |
383 | LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip); |
374 | |
384 | |
375 | item_power = ip; |
385 | item_power = ip; |
376 | } |
386 | } |
377 | |
387 | |
378 | /* Check for possibly bogus values. Has to meet both these criteria - |
388 | /* Check for possibly bogus values. Has to meet both these criteria - |
… | |
… | |
385 | if (ip > 2 * item_power && ip > (item_power + 3)) |
395 | 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); |
396 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
387 | #endif |
397 | #endif |
388 | } |
398 | } |
389 | |
399 | |
390 | /* Old spellcasting object - need to load in the appropiate object */ |
400 | /* old style spellcasting object (pretty common) - need to load in the appropriate object */ |
391 | if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || |
401 | /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ |
|
|
402 | if ((type == ROD |
|
|
403 | || type == WAND |
|
|
404 | || type == SCROLL |
|
|
405 | || type == HORN |
|
|
406 | || type == FIREWALL |
392 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
407 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
393 | ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) |
408 | || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet. |
|
|
409 | && !inv |
|
|
410 | && !loading_arch |
|
|
411 | && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here! |
|
|
412 | // TODO: at least one watchout-comments is redundant - investigate/remove |
394 | { |
413 | { |
|
|
414 | // TODO: fix firewall object on map |
395 | /* 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' |
396 | * in that spell was stored in sp. |
416 | * in that spell was stored in sp. |
397 | */ |
417 | */ |
398 | LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
418 | //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
399 | 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]); |
400 | insert_ob_in_ob (tmp, this); |
420 | insert_ob_in_ob (tmp, this); |
401 | randomitems = NULL; /* So another spell isn't created for this object */ |
421 | randomitems = 0; |
402 | } |
422 | } |
403 | |
423 | |
404 | /* 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 */ |
405 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
425 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
406 | { |
426 | { |
407 | LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ()); |
427 | LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ()); |
408 | object *tmp = get_archetype_by_object_name (slaying); |
428 | object *tmp = get_archetype_by_object_name (slaying); |
409 | insert_ob_in_ob (tmp, this); |
429 | insert_ob_in_ob (tmp, this); |
410 | randomitems = 0; /* So another spell isn't created for this object */ |
430 | randomitems = 0; /* So another spell isn't created for this object */ |
411 | /* without this, value is all screwed up */ |
431 | /* without this, value is all screwed up */ |
412 | value = arch->value * inv->value; |
432 | value = arch->value * inv->value; |
413 | } |
433 | } |
414 | |
434 | |
415 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
435 | if (this->flag [FLAG_MONSTER]) |
416 | { |
436 | { |
417 | if (stats.hp > stats.maxhp) |
437 | if (stats.hp > stats.maxhp) |
418 | { |
438 | { |
419 | LOG (llevInfo, "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); |
420 | stats.maxhp = stats.hp; |
440 | stats.maxhp = stats.hp; |
421 | } |
441 | } |
422 | |
442 | |
423 | /* The archs just need to be updated for this */ |
443 | /* The archs just need to be updated for this */ |
424 | if (move_type == 0) |
444 | if (move_type == 0) |
425 | move_type = MOVE_WALK; |
445 | move_type = MOVE_WALK; |
426 | } |
446 | } |
427 | |
447 | |
428 | 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) |
429 | /* Object will duplicate it's content as part of the |
449 | /* Object will duplicate it's content as part of the |
430 | * generation process. To do this, we must flag inventory |
450 | * generation process. To do this, we must flag inventory |
431 | * so it remains unevaluated concerning the randomitems and |
451 | * so it remains unevaluated concerning the randomitems and |
432 | * the living (a demonlord shouldn't cast from inside generator!) |
452 | * the living (a demonlord shouldn't cast from inside generator!) |
433 | */ |
453 | */ |
… | |
… | |
451 | } |
471 | } |
452 | else |
472 | else |
453 | move_type = MOVE_WALK; |
473 | move_type = MOVE_WALK; |
454 | } |
474 | } |
455 | } |
475 | } |
|
|
476 | |
|
|
477 | // if the object has an animation, try to provide a default face |
|
|
478 | if (has_anim ()) |
|
|
479 | { |
|
|
480 | const animation &anim_ob = anim (); |
|
|
481 | |
|
|
482 | if (anim_speed) |
|
|
483 | // if this item is time-animated, force the last frame |
|
|
484 | animate_object (this, 0); |
|
|
485 | else if (flag [FLAG_MONSTER]) |
|
|
486 | // if it is a monster, set appropriate facing |
|
|
487 | animate_object (this, direction); |
|
|
488 | } |
456 | } |
489 | } |
457 | |
490 | |
458 | static void |
491 | static void |
459 | set_move (MoveType &mt, const char *str) |
492 | set_move (MoveType &mt, object_thawer &f) |
460 | { |
493 | { |
461 | static const struct flagstr { |
494 | static const struct flagstr { |
462 | const char *name; |
495 | const char *name; |
463 | MoveType flags; |
496 | MoveType flags; |
464 | } move_flags[] = { |
497 | } move_flags[] = { |
… | |
… | |
470 | { "boat" , MOVE_BOAT }, |
503 | { "boat" , MOVE_BOAT }, |
471 | { "ship" , MOVE_SHIP }, |
504 | { "ship" , MOVE_SHIP }, |
472 | { "all" , MOVE_ALL }, |
505 | { "all" , MOVE_ALL }, |
473 | }; |
506 | }; |
474 | |
507 | |
475 | if (!str) |
508 | const char *str = f.get_str (); |
476 | { |
|
|
477 | mt = 0; |
|
|
478 | return; |
|
|
479 | } |
|
|
480 | |
509 | |
481 | if (isdigit (*str)) |
510 | if (!*str || isdigit (*str)) |
482 | { |
511 | { |
483 | mt = atoi (str); |
512 | mt = atoi (str); |
484 | return; |
513 | return; |
485 | } |
514 | } |
486 | |
515 | |
487 | mt = 0; |
516 | mt = 0; |
488 | |
517 | |
489 | for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) |
518 | for (str = strtok ((char *)str, " "); str; str = strtok (0, " ")) |
490 | { |
519 | { |
491 | bool negate = 0; |
520 | bool negate = 0; |
492 | |
521 | |
493 | if (*str == '-') |
522 | if (*str == '-') |
494 | { |
523 | { |
495 | negate = 1; |
524 | negate = 1; |
496 | str++; |
525 | str++; |
497 | } |
526 | } |
498 | |
527 | |
499 | 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) |
500 | { |
529 | { |
501 | if (!strcmp (f->name, str)) |
530 | if (!strcmp (f->name, str)) |
502 | { |
531 | { |
503 | if (negate) |
532 | if (negate) |
504 | mt &= ~f->flags; |
533 | mt &= ~f->flags; |
… | |
… | |
513 | |
542 | |
514 | next: ; |
543 | next: ; |
515 | } |
544 | } |
516 | } |
545 | } |
517 | |
546 | |
|
|
547 | //-GPL |
|
|
548 | |
518 | #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () |
549 | #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () |
519 | |
550 | |
520 | bool |
551 | bool |
521 | object::parse_kv (object_thawer &f) |
552 | object::parse_kv (object_thawer &f) |
522 | { |
553 | { |
523 | object *op_inv = inv; |
554 | object *op_inv = inv; |
524 | key_value *last_kv = key_values; |
|
|
525 | |
555 | |
526 | for (;;) |
556 | for (;;) |
527 | { |
557 | { |
528 | switch (f.kw) |
558 | switch (f.kw) |
529 | { |
559 | { |
530 | case KW_uuid: |
560 | case KW_uuid: |
531 | if (const char *s = f.get_str ()) |
|
|
532 | if (!uuid.parse (s)) |
561 | if (!uuid.parse (f.get_str ())) |
533 | { |
562 | { |
534 | f.parse_warn ("unparseable uuid"); |
563 | f.parse_warn ("unparseable uuid"); |
535 | uuid = UUID::gen (); |
564 | uuid = UUID::gen (); |
536 | } |
565 | } |
537 | break; |
566 | break; |
538 | |
567 | |
539 | case KW_oid: |
568 | case KW_oid: |
540 | f.get (this, f.get_sint32 ()); |
569 | f.get (this, f.get_sint32 ()); |
541 | break; |
570 | break; |
… | |
… | |
550 | case KW_race: f.get_ornull (race); break; |
579 | case KW_race: f.get_ornull (race); break; |
551 | case KW_slaying: f.get_ornull (slaying); break; |
580 | case KW_slaying: f.get_ornull (slaying); break; |
552 | case KW_tag: f.get_ornull (tag); break; |
581 | case KW_tag: f.get_ornull (tag); break; |
553 | |
582 | |
554 | case KW_arch: |
583 | case KW_arch: |
555 | { |
|
|
556 | object *tmp = object::read (f); |
584 | if (object *tmp = object::read (f)) |
557 | tmp->deactivate (); |
|
|
558 | |
|
|
559 | { |
585 | { |
|
|
586 | tmp->deactivate (); |
|
|
587 | |
560 | // was: insert_ob_in_ob (tmp, op); |
588 | // was: insert_ob_in_ob (tmp, op); |
561 | // but manually adding it can improve map loading times a lot |
589 | // but manually adding it can improve map loading times a lot |
562 | // also, appending instead of prepending keeps the |
590 | // also, appending instead of prepending keeps the |
563 | // save ordering the same between repeated load/saves. |
591 | // save ordering the same between repeated load/saves. |
564 | // and finally we do not want any funny effects |
592 | // and finally we do not want any funny effects |
565 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
593 | tmp->clr_flag (FLAG_OBJ_ORIGINAL); |
566 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
594 | tmp->clr_flag (FLAG_REMOVED); |
567 | |
595 | |
568 | if (!op_inv) |
596 | if (!op_inv) |
569 | { |
597 | { |
570 | inv = tmp; |
598 | inv = tmp; |
571 | tmp->above = 0; |
599 | tmp->above = 0; |
… | |
… | |
581 | |
609 | |
582 | tmp->below = 0; |
610 | tmp->below = 0; |
583 | tmp->env = this; |
611 | tmp->env = this; |
584 | op_inv = tmp; |
612 | op_inv = tmp; |
585 | } |
613 | } |
586 | } |
614 | else |
|
|
615 | LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n"); |
|
|
616 | |
587 | continue; |
617 | continue; |
588 | |
618 | |
589 | case KW_other_arch: |
619 | case KW_other_arch: |
590 | if (loading_arch == this) |
620 | if (loading_arch == this) |
591 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
621 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
… | |
… | |
602 | f.delayed_deref (this, owner, f.get_str ()); |
632 | f.delayed_deref (this, owner, f.get_str ()); |
603 | break; |
633 | break; |
604 | |
634 | |
605 | case KW_animation: |
635 | case KW_animation: |
606 | { |
636 | { |
607 | CLEAR_FLAG (this, FLAG_ANIMATE); |
637 | this->clr_flag (FLAG_ANIMATE); |
608 | animation_id = 0; |
638 | animation_id = 0; |
609 | |
639 | |
610 | const char *str = f.get_str (); |
|
|
611 | if (str && (animation_id = find_animation (str))) |
640 | if (f.has_value () && (animation_id = find_animation (f.get_str ()))) |
612 | SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here |
641 | this->set_flag (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; |
618 | case KW_last_grace: f.get (last_grace); break; |
647 | case KW_last_grace: f.get (last_grace); break; |
619 | case KW_last_eat: f.get (last_eat); break; |
648 | case KW_last_eat: f.get (last_eat); break; |
|
|
649 | case KW_sl: |
620 | case KW_speed_left: f.get (speed_left); break; |
650 | case KW_speed_left: f.get (speed_left); break; |
621 | |
651 | |
622 | case KW_speed: |
652 | case KW_speed: |
623 | f.get (speed); |
653 | f.get (speed); |
624 | |
654 | |
… | |
… | |
633 | move_slow |= MOVE_WALK; |
663 | move_slow |= MOVE_WALK; |
634 | f.get (move_slow_penalty); |
664 | f.get (move_slow_penalty); |
635 | break; |
665 | break; |
636 | |
666 | |
637 | case KW_face: |
667 | case KW_face: |
638 | face = face_find (f.get_str ()); |
668 | face = f.has_value () ? face_find (f.get_str ()) : blank_face; |
639 | break; |
669 | break; |
640 | |
670 | |
641 | case KW_sound: |
671 | case KW_sound: |
|
|
672 | if (f.has_value ()) |
|
|
673 | { |
642 | sound = sound_find (f.get_str ()); |
674 | sound = sound_find (f.get_str ()); |
643 | if (!sound) |
675 | if (!sound) |
644 | f.parse_warn ("sound not found"); |
676 | f.parse_warn (format ("sound '%s' not found", f.get_str ())); |
|
|
677 | } |
|
|
678 | else |
|
|
679 | sound = 0; |
645 | break; |
680 | break; |
646 | |
681 | |
647 | case KW_sound_destroy: |
682 | case KW_sound_destroy: |
|
|
683 | if (f.has_value ()) |
|
|
684 | { |
648 | sound_destroy = sound_find (f.get_str ()); |
685 | sound_destroy = sound_find (f.get_str ()); |
649 | if (!sound_destroy) |
686 | if (!sound_destroy) |
650 | f.parse_warn ("sound not found"); |
687 | f.parse_warn (format ("sound '%s' not found", f.get_str ())); |
|
|
688 | } |
|
|
689 | else |
|
|
690 | sound_destroy = 0; |
651 | break; |
691 | break; |
652 | |
692 | |
653 | case KW_x: f.get (x); break; |
693 | case KW_x: f.get (x); break; |
654 | case KW_y: f.get (y); break; |
694 | case KW_y: f.get (y); break; |
655 | |
695 | |
… | |
… | |
696 | case KW_invisible: f.get (invisible); break; |
736 | case KW_invisible: f.get (invisible); break; |
697 | case KW_magic: f.get (magic); break; |
737 | case KW_magic: f.get (magic); break; |
698 | case KW_state: f.get (state); break; |
738 | case KW_state: f.get (state); break; |
699 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
739 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
700 | case KW_material: f.get (materials); break; //TODO: nuke |
740 | case KW_material: f.get (materials); break; //TODO: nuke |
701 | case KW_materialname: f.get (materialname); break; |
741 | case KW_materialname: f.get (material); break; |
702 | |
742 | |
703 | /* These are the new values */ |
743 | /* These are the new values */ |
704 | case KW_move_block: set_move (move_block, f.get_str ()); break; |
744 | case KW_move_block: set_move (move_block, f); break; |
705 | case KW_move_allow: set_move (move_allow, f.get_str ()); break; |
745 | case KW_move_allow: set_move (move_allow, f); break; |
706 | case KW_move_type: set_move (move_type, f.get_str ()); break; |
746 | case KW_move_type: set_move (move_type , f); break; |
707 | case KW_move_on: set_move (move_on, f.get_str ()); break; |
747 | case KW_move_on: set_move (move_on , f); break; |
708 | case KW_move_off: set_move (move_off, f.get_str ()); break; |
748 | case KW_move_off: set_move (move_off , f); break; |
709 | case KW_move_slow: set_move (move_slow, f.get_str ()); break; |
749 | case KW_move_slow: set_move (move_slow , f); break; |
710 | |
|
|
711 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
712 | case KW_no_pass: |
|
|
713 | { |
|
|
714 | if (f.get_sint32 ()) |
|
|
715 | move_block = MOVE_ALL; |
|
|
716 | else |
|
|
717 | move_block = 0; |
|
|
718 | } |
|
|
719 | |
|
|
720 | break; |
|
|
721 | |
|
|
722 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
723 | case KW_walk_on: |
|
|
724 | { |
|
|
725 | if (f.get_sint32 ()) |
|
|
726 | move_on |= MOVE_WALK; |
|
|
727 | else |
|
|
728 | move_on &= ~MOVE_WALK; |
|
|
729 | } |
|
|
730 | |
|
|
731 | break; |
|
|
732 | |
|
|
733 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
734 | case KW_walk_off: |
|
|
735 | { |
|
|
736 | if (f.get_sint32 ()) |
|
|
737 | move_off |= MOVE_WALK; |
|
|
738 | else |
|
|
739 | move_off &= ~MOVE_WALK; |
|
|
740 | } |
|
|
741 | break; |
|
|
742 | |
|
|
743 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
744 | case KW_fly_on: |
|
|
745 | { |
|
|
746 | if (f.get_sint32 ()) |
|
|
747 | move_on |= MOVE_FLY_LOW; |
|
|
748 | else |
|
|
749 | move_on &= ~MOVE_FLY_LOW; |
|
|
750 | } |
|
|
751 | break; |
|
|
752 | |
|
|
753 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
754 | case KW_fly_off: |
|
|
755 | { |
|
|
756 | if (f.get_sint32 ()) |
|
|
757 | move_off |= MOVE_FLY_LOW; |
|
|
758 | else |
|
|
759 | move_off &= ~MOVE_FLY_LOW; |
|
|
760 | } |
|
|
761 | break; |
|
|
762 | |
750 | |
763 | //TODO: remove these after converting archetypes |
751 | //TODO: remove these after converting archetypes |
764 | case KW_can_use_wand: |
752 | case KW_can_use_wand: |
765 | GET_FLAG (this, FLAG_USE_RANGE); |
753 | GET_FLAG (this, FLAG_USE_RANGE); |
766 | break; |
754 | break; |
767 | |
755 | |
768 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
769 | case KW_flying: |
|
|
770 | { |
|
|
771 | if (f.get_sint32 ()) |
|
|
772 | move_type |= MOVE_FLY_LOW; |
|
|
773 | else |
|
|
774 | move_type &= ~MOVE_FLY_LOW; |
|
|
775 | } |
|
|
776 | break; |
|
|
777 | |
|
|
778 | |
|
|
779 | case KW_identified: |
756 | case KW_identified: |
780 | GET_FLAG (this, FLAG_IDENTIFIED); |
757 | GET_FLAG (this, FLAG_IDENTIFIED); |
781 | //TODO: move to check_object or so |
758 | //TODO: move to check_object or so |
782 | if (QUERY_FLAG (this, FLAG_IDENTIFIED)) |
759 | if (this->flag [FLAG_IDENTIFIED]) |
783 | CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); |
760 | this->clr_flag (FLAG_KNOWN_MAGICAL); |
784 | |
761 | |
785 | break; |
762 | break; |
786 | |
763 | |
787 | case KW_friendly: |
764 | case KW_friendly: |
788 | if (f.get_bool ()) |
765 | if (f.get_bool ()) |
… | |
… | |
815 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
792 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
816 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
793 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
817 | case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; |
794 | case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; |
818 | case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; |
795 | case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; |
819 | case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; |
796 | case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; |
|
|
797 | case KW_is_transparent_floor: GET_FLAG (this, FLAG_IS_TRANSPARENT_FLOOR); break; |
820 | case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; |
798 | case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; |
821 | case KW_scared: GET_FLAG (this, FLAG_SCARED); break; |
799 | case KW_scared: GET_FLAG (this, FLAG_SCARED); break; |
822 | case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; |
800 | case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; |
823 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
801 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
824 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
802 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
825 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
803 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
826 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
804 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
827 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
805 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
828 | case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; |
|
|
829 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
806 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
830 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
807 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
831 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
808 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
832 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
809 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
833 | case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; |
810 | case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; |
… | |
… | |
877 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
854 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
878 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
855 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
879 | case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; |
856 | case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; |
880 | case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; |
857 | case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; |
881 | case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; |
858 | case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; |
|
|
859 | case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break; |
|
|
860 | case KW_is_quad: GET_FLAG (this, FLAG_IS_QUAD); break; |
882 | |
861 | |
883 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
862 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
884 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
863 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
885 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
864 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
886 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
865 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
… | |
… | |
916 | case KW_anim_speed: f.get (anim_speed); break; |
895 | case KW_anim_speed: f.get (anim_speed); break; |
917 | case KW_container: f.get (weight_limit); break; |
896 | case KW_container: f.get (weight_limit); break; |
918 | case KW_will_apply: f.get (will_apply); break; |
897 | case KW_will_apply: f.get (will_apply); break; |
919 | case KW_attack_movement: f.get (attack_movement); break; |
898 | case KW_attack_movement: f.get (attack_movement); break; |
920 | case KW_move_state: f.get (move_status); break; |
899 | case KW_move_state: f.get (move_status); break; |
921 | case KW_expmul: f.get (expmul); break; |
900 | //case KW_expmul: f.get (expmul); break;//D declared const for the time being |
922 | case KW_glow_radius: f.get (glow_radius); break; |
901 | case KW_glow_radius: f.get (glow_radius); break; |
923 | case KW_weapontype: f.get (weapontype); break; |
902 | case KW_weapontype: f.get (weapontype); break; |
924 | case KW_tooltype: f.get (tooltype); break; |
|
|
925 | case KW_casting_time: f.get (casting_time); break; |
903 | case KW_casting_time: f.get (casting_time); break; |
926 | |
904 | |
927 | // elevation is deprecated |
905 | // elevation is deprecated |
928 | case KW_elevation: break; |
906 | case KW_elevation: break; |
929 | |
907 | |
… | |
… | |
953 | case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; |
931 | case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; |
954 | case KW_can_apply: |
932 | case KW_can_apply: |
955 | break; |
933 | break; |
956 | |
934 | |
957 | case KW_connected: |
935 | case KW_connected: |
958 | add_button_link (this, map, f.get_sint32 ()); |
936 | { |
|
|
937 | shstr connected; |
|
|
938 | |
|
|
939 | f.get (connected); |
|
|
940 | add_link (map, connected); |
|
|
941 | } |
959 | break; |
942 | break; |
960 | |
943 | |
961 | case KW_randomitems: |
944 | case KW_randomitems: |
962 | if (f.get_str ()) |
945 | if (f.has_value ()) |
963 | { |
946 | { |
964 | randomitems = |
947 | randomitems = |
965 | loading_arch |
948 | loading_arch |
966 | ? treasurelist::get (f.get_str ()) |
949 | ? treasurelist::get (f.get_str ()) |
967 | : treasurelist::find (f.get_str ()); |
950 | : treasurelist::find (f.get_str ()); |
968 | |
951 | |
969 | if (!randomitems) |
952 | if (!randomitems) |
|
|
953 | { |
970 | LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); |
954 | LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); |
|
|
955 | randomitems = treasurelist::get (shstr_none); // avoid crashes |
|
|
956 | } |
971 | } |
957 | } |
972 | else |
958 | else |
973 | randomitems = 0; |
959 | randomitems = 0; |
974 | break; |
960 | break; |
975 | |
961 | |
… | |
… | |
991 | |
977 | |
992 | f.next (); |
978 | f.next (); |
993 | return true; |
979 | return true; |
994 | |
980 | |
995 | case KW_ERROR: |
981 | case KW_ERROR: |
996 | // append as key value pair (do not use kv_set as it prepends) |
|
|
997 | // we also do not even try to find old values, duplicate keys stay duplicate |
982 | // we do not even try to find old values, duplicate keys stay duplicate |
998 | { |
983 | // the list gets reversed after loading |
999 | key_value *kv = new key_value; |
984 | kv.add (shstr (f.kw_str), shstr (f.value)); |
1000 | |
|
|
1001 | kv->next = 0; |
|
|
1002 | kv->key = shstr (f.kw_str); |
|
|
1003 | kv->value = shstr (f.value); |
|
|
1004 | |
|
|
1005 | if (!last_kv) |
|
|
1006 | key_values = last_kv = kv; |
|
|
1007 | else |
|
|
1008 | { |
|
|
1009 | while (last_kv->next) |
|
|
1010 | last_kv = last_kv->next; |
|
|
1011 | |
|
|
1012 | last_kv->next = kv; |
|
|
1013 | last_kv = kv; |
|
|
1014 | } |
|
|
1015 | } |
|
|
1016 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
|
|
1017 | break; |
985 | break; |
1018 | |
986 | |
1019 | default: |
987 | default: |
1020 | if (!f.parse_error ("object", name)) |
988 | if (!f.parse_error ("object", name)) |
1021 | return false; |
989 | return false; |
… | |
… | |
1033 | |
1001 | |
1034 | archetype *arch = archetype::find (f.get_str ()); |
1002 | archetype *arch = archetype::find (f.get_str ()); |
1035 | |
1003 | |
1036 | if (!arch) |
1004 | if (!arch) |
1037 | { |
1005 | { |
1038 | LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); |
1006 | LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ()); |
1039 | arch = archetype::find ("earthwall"); |
1007 | arch = archetype::find (shstr_earthwall); |
1040 | } |
1008 | } |
1041 | |
1009 | |
1042 | assert (arch); //D maybe use exception handling of sorts? |
1010 | assert (arch); //D maybe use exception handling of sorts? |
1043 | |
1011 | |
1044 | f.next (); |
1012 | f.next (); |
… | |
… | |
1048 | // instance() activates, this should be fixed properly |
1016 | // instance() activates, this should be fixed properly |
1049 | op->deactivate (); |
1017 | op->deactivate (); |
1050 | |
1018 | |
1051 | if (!op->parse_kv (f)) |
1019 | if (!op->parse_kv (f)) |
1052 | { |
1020 | { |
1053 | op->destroy (true); |
1021 | op->destroy (); |
1054 | return 0; |
1022 | return 0; |
1055 | } |
1023 | } |
|
|
1024 | |
|
|
1025 | // the loader reverses the ordering of kv-pairs, so we reverse it again after loading |
|
|
1026 | // that greatly simplifies the loading code. |
|
|
1027 | op->kv.reverse (); |
1056 | |
1028 | |
1057 | op->post_load_check (); |
1029 | op->post_load_check (); |
1058 | return op; |
1030 | return op; |
1059 | } |
1031 | } |
1060 | |
1032 | |
… | |
… | |
1065 | * override values and in c_wiz to mutate values. |
1037 | * override values and in c_wiz to mutate values. |
1066 | */ |
1038 | */ |
1067 | int |
1039 | int |
1068 | set_variable (object *op, char *buf) |
1040 | set_variable (object *op, char *buf) |
1069 | { |
1041 | { |
1070 | object_thawer f (buf, (AV *)0); |
1042 | object_thawer f (format ("%s\nend", buf), (AV *)0); |
1071 | |
1043 | |
1072 | return op->parse_kv (f); |
1044 | return op->parse_kv (f); |
1073 | } |
1045 | } |
1074 | |
1046 | |
1075 | /* This returns a string of the integer movement type */ |
|
|
1076 | #if 0 |
|
|
1077 | // unused function |
|
|
1078 | static char * |
|
|
1079 | get_string_move_type (MoveType mt) |
|
|
1080 | { |
|
|
1081 | static char retbuf[MAX_BUF], retbuf_all[MAX_BUF]; |
|
|
1082 | int i, all_count = 0, count; |
|
|
1083 | |
|
|
1084 | strcpy (retbuf, ""); |
|
|
1085 | strcpy (retbuf_all, " all"); |
|
|
1086 | |
|
|
1087 | /* Quick check, and probably fairly common */ |
|
|
1088 | if (mt == MOVE_ALL) |
|
|
1089 | return retbuf_all + 1; |
|
|
1090 | if (mt == 0) |
|
|
1091 | { |
|
|
1092 | strcpy (retbuf, "0"); |
|
|
1093 | return retbuf; |
|
|
1094 | } |
|
|
1095 | |
|
|
1096 | /* We basically slide the bits down. Why look at MOVE_ALL? |
|
|
1097 | * because we may want to return a string like 'all -swim', |
|
|
1098 | * and if we just looked at mt, we couldn't get that. |
|
|
1099 | */ |
|
|
1100 | for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++) |
|
|
1101 | { |
|
|
1102 | if (mt & (1 << count)) |
|
|
1103 | { |
|
|
1104 | strcat (retbuf, " "); |
|
|
1105 | strcat (retbuf, move_name[count]); |
|
|
1106 | } |
|
|
1107 | else |
|
|
1108 | { |
|
|
1109 | strcat (retbuf_all, " -"); |
|
|
1110 | strcat (retbuf_all, move_name[count]); |
|
|
1111 | all_count++; |
|
|
1112 | } |
|
|
1113 | } |
|
|
1114 | /* Basically, if there is a single negation, return it, eg |
|
|
1115 | * 'all -swim'. But more than that, just return the |
|
|
1116 | * enumerated values. It doesn't make sense to return |
|
|
1117 | * 'all -walk -fly_low' - it is shorter to return 'fly_high swim' |
|
|
1118 | */ |
|
|
1119 | if (all_count <= 1) |
|
|
1120 | return retbuf_all + 1; |
|
|
1121 | else |
|
|
1122 | return retbuf + 1; |
|
|
1123 | } |
|
|
1124 | #endif |
|
|
1125 | |
|
|
1126 | // compare *op against *tmp and output differences |
1047 | // compare *op against *arch and output differences |
1127 | static void |
1048 | static void |
1128 | write_diff (object_freezer &f, object *op, object *tmp) |
1049 | write_diff (object_freezer &f, object *op, object *arch) |
1129 | { |
1050 | { |
1130 | static const keyword resist_save[NROFATTACKS] = { |
1051 | static const keyword resist_save[NROFATTACKS] = { |
1131 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1052 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1132 | # include "attackinc.h" |
1053 | # include "attackinc.h" |
1133 | # undef def |
1054 | # undef def |
… | |
… | |
1146 | KW_NULL, |
1067 | KW_NULL, |
1147 | KW_applied, |
1068 | KW_applied, |
1148 | KW_unpaid, |
1069 | KW_unpaid, |
1149 | KW_can_use_shield, |
1070 | KW_can_use_shield, |
1150 | KW_no_pick, |
1071 | KW_no_pick, |
1151 | KW_NULL, // walk_on |
1072 | KW_is_transparent_floor, |
|
|
1073 | /* 10 */ |
1152 | KW_NULL, // no_pass |
1074 | KW_NULL, // no_pass |
1153 | /* 10 */ |
|
|
1154 | KW_is_animated, |
1075 | KW_is_animated, |
1155 | KW_NULL, // slow_move |
1076 | KW_NULL, // slow_move |
1156 | KW_NULL, // flying |
1077 | KW_NULL, // flying |
1157 | KW_monster, |
1078 | KW_monster, |
1158 | KW_friendly, |
1079 | KW_friendly, |
1159 | KW_generator, |
1080 | KW_generator, |
1160 | KW_is_thrown, |
1081 | KW_is_thrown, |
1161 | KW_auto_apply, |
1082 | KW_auto_apply, |
1162 | KW_treasure_env, |
1083 | KW_treasure_env, |
|
|
1084 | /* 20 */ |
1163 | KW_player_sold, |
1085 | KW_player_sold, |
1164 | /* 20 */ |
|
|
1165 | KW_see_invisible, |
1086 | KW_see_invisible, |
1166 | KW_can_roll, |
1087 | KW_can_roll, |
1167 | KW_overlay_floor, |
1088 | KW_overlay_floor, |
1168 | KW_is_turnable, |
1089 | KW_is_turnable, |
1169 | KW_NULL, // walk_off |
1090 | KW_NULL, // walk_off |
1170 | KW_NULL, // fly_on |
1091 | KW_NULL, // fly_on |
1171 | KW_NULL, // fly_off |
1092 | KW_NULL, // fly_off |
1172 | KW_is_used_up, |
1093 | KW_is_used_up, |
1173 | KW_identified, |
1094 | KW_identified, |
|
|
1095 | /* 30 */ |
1174 | KW_reflecting, |
1096 | KW_reflecting, |
1175 | /* 30 */ |
|
|
1176 | KW_changing, |
1097 | KW_changing, |
1177 | KW_splitting, |
1098 | KW_splitting, |
1178 | KW_hitback, |
1099 | KW_hitback, |
1179 | KW_startequip, |
1100 | KW_startequip, |
1180 | KW_blocksview, |
1101 | KW_blocksview, |
1181 | KW_undead, |
1102 | KW_undead, |
1182 | KW_scared, |
1103 | KW_scared, |
1183 | KW_unaggressive, |
1104 | KW_unaggressive, |
1184 | KW_reflect_missile, |
1105 | KW_reflect_missile, |
|
|
1106 | /* 40 */ |
1185 | KW_reflect_spell, |
1107 | KW_reflect_spell, |
1186 | /* 40 */ |
|
|
1187 | KW_no_magic, |
1108 | KW_no_magic, |
1188 | KW_no_fix_player, |
1109 | KW_NULL, |
1189 | KW_is_lightable, |
1110 | KW_is_lightable, |
1190 | KW_tear_down, |
1111 | KW_tear_down, |
1191 | KW_run_away, |
1112 | KW_run_away, |
1192 | KW_NULL, // pass_thru |
1113 | KW_NULL, // pass_thru |
1193 | KW_NULL, // an_pass_thru |
1114 | KW_NULL, // an_pass_thru |
1194 | KW_pick_up, |
1115 | KW_pick_up, |
1195 | KW_unique, |
1116 | KW_unique, |
|
|
1117 | /* 50 */ |
1196 | KW_no_drop, |
1118 | KW_no_drop, |
1197 | /* 50 */ |
|
|
1198 | KW_NULL, // wizcast |
1119 | KW_NULL, // wizcast |
1199 | KW_can_cast_spell, |
1120 | KW_can_cast_spell, |
1200 | KW_can_use_scroll, |
1121 | KW_can_use_scroll, |
1201 | KW_can_use_range, |
1122 | KW_can_use_range, |
1202 | KW_can_use_bow, |
1123 | KW_can_use_bow, |
1203 | KW_can_use_armour, |
1124 | KW_can_use_armour, |
1204 | KW_can_use_weapon, |
1125 | KW_can_use_weapon, |
1205 | KW_can_use_ring, |
1126 | KW_can_use_ring, |
1206 | KW_has_ready_range, |
1127 | KW_has_ready_range, |
|
|
1128 | /* 60 */ |
1207 | KW_has_ready_bow, |
1129 | KW_has_ready_bow, |
1208 | /* 60 */ |
|
|
1209 | KW_xrays, |
1130 | KW_xrays, |
1210 | KW_NULL, |
1131 | KW_NULL, |
1211 | KW_is_floor, |
1132 | KW_is_floor, |
1212 | KW_lifesave, |
1133 | KW_lifesave, |
1213 | KW_no_strength, |
1134 | KW_no_strength, |
1214 | KW_sleep, |
1135 | KW_sleep, |
1215 | KW_stand_still, |
1136 | KW_stand_still, |
1216 | KW_random_move, |
1137 | KW_random_move, |
1217 | KW_only_attack, |
1138 | KW_only_attack, |
|
|
1139 | /* 70 */ |
1218 | KW_confused, |
1140 | KW_confused, |
1219 | /* 70 */ |
|
|
1220 | KW_stealth, |
1141 | KW_stealth, |
1221 | KW_NULL, |
1142 | KW_NULL, |
1222 | KW_NULL, |
1143 | KW_NULL, |
1223 | KW_cursed, |
1144 | KW_cursed, |
1224 | KW_damned, |
1145 | KW_damned, |
1225 | KW_see_anywhere, |
1146 | KW_see_anywhere, |
1226 | KW_known_magical, |
1147 | KW_known_magical, |
1227 | KW_known_cursed, |
1148 | KW_known_cursed, |
1228 | KW_can_use_skill, |
1149 | KW_can_use_skill, |
|
|
1150 | /* 80 */ |
1229 | KW_been_applied, |
1151 | KW_been_applied, |
1230 | /* 80 */ |
|
|
1231 | KW_has_ready_scroll, |
1152 | KW_has_ready_scroll, |
1232 | KW_can_use_rod, |
1153 | KW_can_use_rod, |
1233 | KW_precious, |
1154 | KW_precious, |
1234 | KW_can_use_horn, |
1155 | KW_can_use_horn, |
1235 | KW_make_invisible, |
1156 | KW_make_invisible, |
1236 | KW_inv_locked, |
1157 | KW_inv_locked, |
1237 | KW_is_wooded, |
1158 | KW_is_wooded, |
1238 | KW_is_hilly, |
1159 | KW_is_hilly, |
1239 | KW_has_ready_skill, |
1160 | KW_has_ready_skill, |
|
|
1161 | /* 90 */ |
1240 | KW_has_ready_weapon, |
1162 | KW_has_ready_weapon, |
1241 | /* 90 */ |
|
|
1242 | KW_no_skill_ident, |
1163 | KW_no_skill_ident, |
1243 | KW_is_blind, |
1164 | KW_is_blind, |
1244 | KW_can_see_in_dark, |
1165 | KW_can_see_in_dark, |
1245 | KW_is_cauldron, |
1166 | KW_is_cauldron, |
1246 | KW_NULL, |
1167 | KW_NULL, |
1247 | KW_no_steal, |
1168 | KW_no_steal, |
1248 | KW_one_hit, |
1169 | KW_one_hit, |
1249 | KW_NULL, |
1170 | KW_NULL, |
1250 | KW_berserk, |
1171 | KW_berserk, |
|
|
1172 | /* 100 */ |
1251 | KW_neutral, |
1173 | KW_neutral, |
1252 | /* 100 */ |
|
|
1253 | KW_no_attack, |
1174 | KW_no_attack, |
1254 | KW_no_damage, |
1175 | KW_no_damage, |
1255 | KW_obj_original, |
1176 | KW_obj_original, |
1256 | KW_NULL, |
1177 | KW_random_speed, |
1257 | KW_activate_on_push, |
1178 | KW_activate_on_push, |
1258 | KW_activate_on_release, |
1179 | KW_activate_on_release, |
1259 | KW_is_water, |
1180 | KW_is_water, |
1260 | KW_use_content_on_gen, |
1181 | KW_use_content_on_gen, |
1261 | KW_NULL, |
1182 | KW_NULL, |
|
|
1183 | /* 110 */ |
1262 | KW_is_buildable, |
1184 | KW_is_buildable, |
1263 | /* 110 */ |
|
|
1264 | KW_destroy_on_death, |
1185 | KW_destroy_on_death, |
1265 | KW_NULL, |
1186 | KW_NULL, |
1266 | }; |
1187 | }; |
1267 | |
1188 | |
|
|
1189 | // obj_original is the only commonly differing flag between archetype |
|
|
1190 | // and object, so special-case it here to be able to skip the loop |
|
|
1191 | static const struct flagmask : object::flags_t |
|
|
1192 | { |
|
|
1193 | flagmask () |
|
|
1194 | { |
|
|
1195 | for (int i = 0; i < NUM_FLAGS; i++) |
|
|
1196 | if (flag_names [i]) |
|
|
1197 | set (i); |
|
|
1198 | } |
|
|
1199 | } flagmask; |
|
|
1200 | |
1268 | /* This saves the key/value lists. We do it first so that any |
1201 | /* This saves the key/value lists. We do it first so that any |
1269 | * keys that match field names will be overwritten by the loader. |
1202 | * keys that match field names will be overwritten by the loader. |
1270 | */ |
1203 | */ |
1271 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1204 | for (key_value *kv = op->kv.first; kv; kv = kv->next) |
1272 | if (!tmp->key_values || tmp->kv (kv->key) != kv->value) |
1205 | if (arch->kv.empty () || arch->kv [kv->key] != kv->value) |
1273 | f.put (kv->key, kv->value); |
1206 | f.put (kv->key, kv->value); |
1274 | |
1207 | |
1275 | /* We don't need to worry about the arch's extra fields - they |
1208 | if (op->uuid) |
1276 | * will get taken care of the copy_to method. |
1209 | { |
1277 | */ |
1210 | // highly optimised - this is often 25% of all data written |
|
|
1211 | char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1); |
|
|
1212 | char *ptr = cur; |
1278 | |
1213 | |
1279 | f.put (KW_uuid, op->uuid.c_str ()); |
1214 | memcpy (ptr, "uuid ", sizeof ("uuid ") - 1); |
|
|
1215 | ptr += sizeof ("uuid ") - 1; |
|
|
1216 | ptr = op->uuid.append (ptr); |
|
|
1217 | *ptr++ = '\n'; |
1280 | |
1218 | |
|
|
1219 | f.alloc (ptr - cur); |
|
|
1220 | } |
|
|
1221 | |
1281 | #define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) |
1222 | #define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v) |
1282 | #define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) |
1223 | #define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v) |
1283 | |
1224 | |
1284 | if (object *owner = op->owner) |
1225 | CMP_OUT (x); |
1285 | f.put (KW_owner, static_cast<const char *>(owner->ref ())); |
1226 | CMP_OUT (y); |
|
|
1227 | |
|
|
1228 | CMP_OUT (type); |
|
|
1229 | CMP_OUT (subtype); |
|
|
1230 | CMP_OUT (direction); |
1286 | |
1231 | |
1287 | CMP_OUT (name); |
1232 | CMP_OUT (name); |
1288 | CMP_OUT (name_pl); |
1233 | CMP_OUT (name_pl); |
1289 | CMP_OUT (custom_name); |
1234 | CMP_OUT (speed); |
|
|
1235 | |
|
|
1236 | // speed_left is a major time-burner, and has good locality, so |
|
|
1237 | // we use a simple lookup-cache to avoid the very slow printf. |
|
|
1238 | if (op->speed_left != arch->speed_left) |
|
|
1239 | { |
|
|
1240 | static double last_speed_left = 0.; |
|
|
1241 | static char last_speed_left_str [256] = "sl 0\n"; |
|
|
1242 | static int last_speed_left_len = sizeof ("sl 0\n") - 1; |
|
|
1243 | |
|
|
1244 | if (last_speed_left != op->speed_left) |
|
|
1245 | { |
|
|
1246 | last_speed_left = op->speed_left; |
|
|
1247 | last_speed_left_len = sizeof ("sl ") - 1 |
|
|
1248 | + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left); |
|
|
1249 | } |
|
|
1250 | |
|
|
1251 | f.add (last_speed_left_str, last_speed_left_len); |
|
|
1252 | } |
|
|
1253 | |
1290 | CMP_OUT (title); |
1254 | CMP_OUT (title); |
1291 | CMP_OUT (race); |
1255 | CMP_OUT (race); |
|
|
1256 | CMP_OUT (slaying); |
1292 | CMP_OUT (skill); |
1257 | CMP_OUT (skill); |
1293 | CMP_OUT (slaying); |
1258 | |
1294 | CMP_OUT (tag); |
1259 | CMP_OUT (tag); |
|
|
1260 | CMP_OUT (custom_name); |
|
|
1261 | |
|
|
1262 | if (object *owner = op->owner) |
|
|
1263 | if (const char *ref = owner->ref ()) |
|
|
1264 | f.put (KW(owner), ref); |
|
|
1265 | |
|
|
1266 | // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved |
|
|
1267 | |
1295 | CMP_OUT (other_arch); |
1268 | CMP_OUT (other_arch); |
1296 | |
1269 | |
1297 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
1270 | if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg ); |
1298 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
1271 | if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore); |
1299 | |
1272 | |
1300 | if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); |
1273 | if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0); |
1301 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
1274 | if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0); |
1302 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1275 | if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1303 | |
1276 | |
1304 | if (op->animation_id != tmp->animation_id) |
1277 | if (op->animation_id != arch->animation_id) |
1305 | if (op->animation_id) |
1278 | if (op->has_anim ()) |
1306 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1279 | f.put (KW(animation), op->anim ().name); |
1307 | else |
1280 | else |
1308 | { |
1281 | { |
1309 | f.put (KW_animation, (const char *)0); |
1282 | f.put (KW(animation)); |
1310 | op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? |
1283 | op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? |
1311 | } |
1284 | } |
1312 | |
1285 | |
1313 | CMP_OUT2 (str, stats.Str); |
1286 | CMP_OUT2 (str, stats.Str); |
1314 | CMP_OUT2 (dex, stats.Dex); |
1287 | CMP_OUT2 (dex, stats.Dex); |
… | |
… | |
1325 | CMP_OUT2 (grace, stats.grace); |
1298 | CMP_OUT2 (grace, stats.grace); |
1326 | CMP_OUT2 (maxgrace, stats.maxgrace); |
1299 | CMP_OUT2 (maxgrace, stats.maxgrace); |
1327 | CMP_OUT2 (exp, stats.exp); |
1300 | CMP_OUT2 (exp, stats.exp); |
1328 | |
1301 | |
1329 | CMP_OUT (perm_exp); |
1302 | CMP_OUT (perm_exp); |
1330 | CMP_OUT (expmul); |
1303 | //CMP_OUT (expmul); |
1331 | |
1304 | |
1332 | CMP_OUT2 (food, stats.food); |
1305 | CMP_OUT2 (food, stats.food); |
1333 | CMP_OUT2 (dam, stats.dam); |
1306 | CMP_OUT2 (dam, stats.dam); |
1334 | CMP_OUT2 (luck, stats.luck); |
1307 | CMP_OUT2 (luck, stats.luck); |
1335 | CMP_OUT2 (wc, stats.wc); |
1308 | CMP_OUT2 (wc, stats.wc); |
1336 | CMP_OUT2 (ac, stats.ac); |
1309 | CMP_OUT2 (ac, stats.ac); |
1337 | |
1310 | |
1338 | CMP_OUT (x); |
|
|
1339 | CMP_OUT (y); |
|
|
1340 | CMP_OUT (speed); |
|
|
1341 | CMP_OUT (speed_left); |
|
|
1342 | CMP_OUT2 (move_state, move_status); |
1311 | CMP_OUT2 (move_state, move_status); |
1343 | CMP_OUT (attack_movement); |
1312 | CMP_OUT (attack_movement); |
1344 | CMP_OUT (nrof); |
1313 | CMP_OUT (nrof); |
1345 | CMP_OUT (level); |
1314 | CMP_OUT (level); |
1346 | CMP_OUT (direction); |
|
|
1347 | CMP_OUT (type); |
|
|
1348 | CMP_OUT (subtype); |
|
|
1349 | CMP_OUT (attacktype); |
1315 | CMP_OUT (attacktype); |
1350 | |
1316 | |
|
|
1317 | // using memcmp here seems to be a loss - is gcc vectorising? |
1351 | for (int i = 0; i < NROFATTACKS; i++) |
1318 | for (int i = 0; i < NROFATTACKS; i++) |
1352 | if (expect_false (op->resist[i] != tmp->resist[i])) |
1319 | if (expect_false (op->resist[i] != arch->resist[i])) |
1353 | f.put (resist_save[i], op->resist[i]); |
1320 | f.put (resist_save[i], op->resist[i]); |
1354 | |
1321 | |
1355 | CMP_OUT (path_attuned); |
1322 | CMP_OUT (path_attuned); |
1356 | CMP_OUT (path_repelled); |
1323 | CMP_OUT (path_repelled); |
1357 | CMP_OUT (path_denied); |
1324 | CMP_OUT (path_denied); |
|
|
1325 | |
1358 | CMP_OUT2 (material, materials);//TODO: nuke |
1326 | CMP_OUT2 (material, materials);//TODO: nuke |
1359 | CMP_OUT (materialname); |
1327 | if (op->material != arch->material) |
|
|
1328 | f.put (KW(materialname), op->material->name); |
|
|
1329 | |
1360 | CMP_OUT (value); |
1330 | CMP_OUT (value); |
1361 | CMP_OUT (carrying); |
1331 | CMP_OUT (carrying); |
1362 | CMP_OUT (weight); |
1332 | CMP_OUT (weight); |
1363 | CMP_OUT (invisible); |
1333 | CMP_OUT (invisible); |
1364 | CMP_OUT (state); |
1334 | CMP_OUT (state); |
… | |
… | |
1368 | CMP_OUT (last_grace); |
1338 | CMP_OUT (last_grace); |
1369 | CMP_OUT (last_eat); |
1339 | CMP_OUT (last_eat); |
1370 | CMP_OUT (glow_radius); |
1340 | CMP_OUT (glow_radius); |
1371 | |
1341 | |
1372 | if (op->flag [FLAG_IS_LINKED]) |
1342 | if (op->flag [FLAG_IS_LINKED]) |
1373 | if (int i = get_button_value (op)) |
1343 | if (auto (ol, op->find_link ())) |
1374 | f.put (KW_connected, i); |
1344 | f.put (KW(connected), ol->id); |
1375 | |
1345 | |
1376 | CMP_OUT (randomitems); |
1346 | CMP_OUT (randomitems); |
|
|
1347 | |
1377 | CMP_OUT2 (container, weight_limit); |
1348 | CMP_OUT2 (container, weight_limit); |
1378 | |
1349 | |
1379 | CMP_OUT (run_away); |
1350 | CMP_OUT (run_away); |
1380 | CMP_OUT (pick_up); |
1351 | CMP_OUT (pick_up); |
1381 | CMP_OUT (will_apply); |
1352 | CMP_OUT (will_apply); |
1382 | CMP_OUT (smoothlevel); |
1353 | CMP_OUT (smoothlevel); |
1383 | CMP_OUT (weapontype); |
1354 | CMP_OUT (weapontype); |
1384 | CMP_OUT (tooltype); |
|
|
1385 | CMP_OUT (client_type); |
1355 | CMP_OUT (client_type); |
1386 | CMP_OUT (item_power); |
1356 | CMP_OUT (item_power); |
1387 | CMP_OUT (duration); |
1357 | CMP_OUT (duration); |
1388 | CMP_OUT (range); |
1358 | CMP_OUT (range); |
1389 | CMP_OUT (range_modifier); |
1359 | CMP_OUT (range_modifier); |
… | |
… | |
1397 | CMP_OUT (move_on); |
1367 | CMP_OUT (move_on); |
1398 | CMP_OUT (move_off); |
1368 | CMP_OUT (move_off); |
1399 | CMP_OUT (move_slow); |
1369 | CMP_OUT (move_slow); |
1400 | CMP_OUT (move_slow_penalty); |
1370 | CMP_OUT (move_slow_penalty); |
1401 | |
1371 | |
1402 | if (op->flag != tmp->flag) |
1372 | object::flags_t diff = (op->flag ^ arch->flag) & flagmask; |
|
|
1373 | |
|
|
1374 | #if stdcpp // we need gcc, sorry |
|
|
1375 | if (diff [FLAG_OBJ_ORIGINAL]) |
|
|
1376 | f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); |
|
|
1377 | |
|
|
1378 | diff.reset (FLAG_OBJ_ORIGINAL); |
|
|
1379 | |
|
|
1380 | // quickly test whether any other flags differ |
|
|
1381 | if (expect_true (diff.any ())) |
1403 | for (int i = 0; i <= NUM_FLAGS; i++) |
1382 | for (int i = 0; i < NUM_FLAGS; i++) |
1404 | if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) |
1383 | if (expect_false (diff [i])) |
1405 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1384 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
|
|
1385 | #else |
|
|
1386 | // use sgi extensions |
|
|
1387 | for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i)) |
|
|
1388 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
|
|
1389 | #endif |
1406 | |
1390 | |
1407 | // save body locations |
1391 | // save body locations. gcc's memcmp does an abysmal job when used |
1408 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1392 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1409 | if (expect_false (op->slot[i].info != tmp->slot[i].info)) |
1393 | if (expect_false (op->slot[i].info != arch->slot[i].info)) |
1410 | f.put (body_locations[i].save_name, op->slot[i].info); |
1394 | f.put (body_locations[i].kw, op->slot[i].info); |
1411 | } |
1395 | } |
1412 | |
1396 | |
1413 | /* |
1397 | /* |
1414 | * Dumps all variables in an object to a file. |
1398 | * Dumps all variables in an object to a file. |
1415 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1399 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1416 | * the only place this is not set is when saving the player. |
1400 | * the only place this is not set is when saving the player. |
1417 | */ |
1401 | */ |
1418 | bool |
1402 | bool |
1419 | object::write (object_freezer &f) |
1403 | object::write (object_freezer &f) |
1420 | { |
1404 | { |
1421 | archetype *at = arch ? arch : archetype::empty; |
1405 | if (expect_false (is_arch ())) |
1422 | |
1406 | { |
|
|
1407 | f.put (KW(object), arch->archname); |
|
|
1408 | write_diff (f, this, archetype::empty); |
|
|
1409 | } |
|
|
1410 | else |
|
|
1411 | { |
1423 | f.put (KW_arch, at->archname); |
1412 | f.put (KW(arch), arch->archname); |
1424 | write_diff (f, this, at); |
1413 | write_diff (f, this, arch); |
|
|
1414 | } |
1425 | |
1415 | |
1426 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1416 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1427 | tmp->write (f); |
1417 | tmp->write (f); |
1428 | |
1418 | |
1429 | f.put (this); |
1419 | f.put (this); |
1430 | f.put (KW_end); |
1420 | f.put (KW(end)); |
1431 | |
1421 | |
1432 | return true; |
1422 | return true; |
1433 | } |
1423 | } |
1434 | |
1424 | |
1435 | ///////////////////////////////////////////////////////////////////////////// |
1425 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
1441 | { |
1431 | { |
1442 | object_thawer f (filename); |
1432 | object_thawer f (filename); |
1443 | |
1433 | |
1444 | for (;;) |
1434 | for (;;) |
1445 | { |
1435 | { |
|
|
1436 | coroapi::cede_to_tick (); |
|
|
1437 | |
1446 | switch (f.kw) |
1438 | switch (f.kw) |
1447 | { |
1439 | { |
1448 | case KW_region: |
1440 | case KW_region: |
1449 | if (!region::read (f)) |
1441 | if (!region::read (f)) |
1450 | return false; |
1442 | return false; |