1 | /* |
1 | /* |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2005,2006,2007,2008,2009,2010 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 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
|
|
25 | sub/add_weight will transcend the environment updating the carrying |
|
|
26 | variable. */ |
|
|
27 | |
|
|
28 | #include <global.h> |
25 | #include <global.h> |
29 | #include <loader.h> |
|
|
30 | #include <sproto.h> |
26 | #include <sproto.h> |
31 | |
27 | |
32 | ///////////////////////////////////////////////////////////////////////////// |
28 | ///////////////////////////////////////////////////////////////////////////// |
33 | |
29 | |
34 | extern archetype *loading_arch; |
30 | extern archetype *loading_arch; |
|
|
31 | |
|
|
32 | //+GPL |
35 | |
33 | |
36 | /* 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 |
37 | * spell object conversion to the new object. It was not practical |
35 | * spell object conversion to the new object. It was not practical |
38 | * 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 |
39 | * 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 |
… | |
… | |
261 | void |
259 | void |
262 | object::post_load_check () |
260 | object::post_load_check () |
263 | { |
261 | { |
264 | if (type >= NUM_TYPES) |
262 | if (type >= NUM_TYPES) |
265 | { |
263 | { |
266 | 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 ()); |
267 | type = 0; |
265 | type = 0; |
268 | } |
266 | } |
269 | |
267 | |
270 | switch (type) |
268 | switch (type) |
271 | { |
269 | { |
|
|
270 | case RANGED: |
272 | case BOW: |
271 | case BOW: |
273 | case WAND: |
272 | case WAND: |
274 | case ROD: |
273 | case ROD: |
275 | case HORN: |
274 | case HORN: |
276 | if (slot [body_range].info != -1) |
275 | if (slot [body_range].info != -1) |
277 | { |
276 | { |
278 | LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); |
277 | LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info); |
279 | slot [body_range].info = -1; |
278 | slot [body_range].info = -1; |
280 | } |
279 | } |
281 | break; |
280 | break; |
282 | |
281 | |
283 | case WEAPON: |
282 | case WEAPON: |
284 | if (slot [body_combat].info != -1) |
283 | if (slot [body_combat].info != -1) |
285 | { |
284 | { |
286 | LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); |
285 | LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); |
287 | slot [body_combat].info = -1; |
286 | slot [body_combat].info = -1; |
288 | } |
287 | } |
289 | break; |
288 | break; |
290 | |
289 | |
291 | case SHIELD: |
290 | case SHIELD: |
292 | if (slot [body_shield].info != -1) |
291 | if (slot [body_shield].info != -1) |
293 | { |
292 | { |
294 | LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); |
293 | LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); |
295 | slot [body_shield].info = -1; |
294 | slot [body_shield].info = -1; |
296 | } |
295 | } |
297 | break; |
296 | break; |
298 | |
297 | |
299 | case PLAYER: |
298 | case PLAYER: |
300 | if (slot [body_shield].info != 1) |
299 | if (slot [body_shield].info != 1) |
301 | { |
300 | { |
302 | LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); |
301 | LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); |
303 | slot [body_shield].info = 1; |
302 | slot [body_shield].info = 1; |
304 | } |
303 | } |
305 | |
304 | |
306 | if (slot [body_combat].info != 1) |
305 | if (slot [body_combat].info != 1) |
307 | { |
306 | { |
308 | LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); |
307 | LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); |
309 | slot [body_combat].info = 1; |
308 | slot [body_combat].info = 1; |
310 | } |
309 | } |
311 | |
310 | |
312 | if (slot [body_range].info != 1) |
311 | if (slot [body_range].info != 1) |
313 | { |
312 | { |
314 | LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); |
313 | LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info); |
315 | slot [body_range].info = 1; |
314 | slot [body_range].info = 1; |
316 | } |
315 | } |
317 | break; |
316 | break; |
318 | } |
317 | } |
319 | |
318 | |
… | |
… | |
331 | |
330 | |
332 | if (!name_pl) |
331 | if (!name_pl) |
333 | name_pl = name; |
332 | name_pl = name; |
334 | |
333 | |
335 | /* objects now have a materialname. try to patch it in */ |
334 | /* objects now have a materialname. try to patch it in */ |
336 | if (!(is_weapon () && level > 0)) |
335 | if (material == MATERIAL_NULL && !(is_weapon () && level > 0)) |
337 | 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 | } |
338 | |
344 | |
339 | /* only do these when program is first run - a bit |
345 | /* only do these when program is first run - a bit |
340 | * excessive to do this at every run - most of this is |
346 | * excessive to do this at every run - most of this is |
341 | * really just to catch any errors - program will still run, but |
347 | * really just to catch any errors - program will still run, but |
342 | * not in the ideal fashion. |
348 | * not in the ideal fashion. |
343 | */ |
349 | */ |
344 | 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)) |
345 | { |
351 | { |
346 | if (!skill) |
352 | if (!skill) |
347 | LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); |
353 | LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ()); |
348 | 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) || |
349 | (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) |
355 | (skill == shstr_two_handed_weapons && slot[body_arm].info != -2)) |
350 | LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); |
356 | LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); |
351 | } |
357 | } |
352 | |
358 | |
353 | /* 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 |
354 | * really does for many objects. Need to catch any in maps |
360 | * really does for many objects. Need to catch any in maps |
355 | * that may have an old value. |
361 | * that may have an old value. |
… | |
… | |
361 | || type == AMULET || type == GIRDLE |
367 | || type == AMULET || type == GIRDLE |
362 | || type == BRACERS || type == CLOAK) |
368 | || type == BRACERS || type == CLOAK) |
363 | { |
369 | { |
364 | if (last_heal) |
370 | if (last_heal) |
365 | { |
371 | { |
366 | LOG (llevDebug, "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 ()); |
367 | gen_sp_armour = last_heal; |
373 | gen_sp_armour = last_heal; |
368 | last_heal = 0; |
374 | last_heal = 0; |
369 | } |
375 | } |
370 | |
376 | |
371 | int ip = calc_item_power (this, 0); |
377 | int ip = calc_item_power (this, 0); |
372 | |
378 | |
373 | /* Legacy objects from before item power was in the game */ |
379 | /* Legacy objects from before item power was in the game */ |
374 | if (!item_power && ip) |
380 | if (!item_power && ip) |
375 | { |
381 | { |
376 | if (ip > 3) |
382 | if (ip > 3) |
377 | 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); |
378 | |
384 | |
379 | item_power = ip; |
385 | item_power = ip; |
380 | } |
386 | } |
381 | |
387 | |
382 | /* Check for possibly bogus values. Has to meet both these criteria - |
388 | /* Check for possibly bogus values. Has to meet both these criteria - |
… | |
… | |
389 | if (ip > 2 * item_power && ip > (item_power + 3)) |
395 | if (ip > 2 * item_power && ip > (item_power + 3)) |
390 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
396 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
391 | #endif |
397 | #endif |
392 | } |
398 | } |
393 | |
399 | |
394 | /* Old spellcasting object - need to load in the appropiate object */ |
400 | /* old style spellcasting object (pretty common) - need to load in the appropriate object */ |
395 | 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 |
396 | /* 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 */ |
397 | ((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 |
398 | { |
413 | { |
|
|
414 | // TODO: fix firewall object on map |
399 | /* 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' |
400 | * in that spell was stored in sp. |
416 | * in that spell was stored in sp. |
401 | */ |
417 | */ |
|
|
418 | //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
402 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
419 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
403 | insert_ob_in_ob (tmp, this); |
420 | insert_ob_in_ob (tmp, this); |
404 | randomitems = NULL; /* So another spell isn't created for this object */ |
421 | randomitems = 0; |
405 | } |
422 | } |
406 | |
423 | |
407 | /* 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 */ |
408 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
425 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
409 | { |
426 | { |
|
|
427 | LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ()); |
410 | object *tmp = get_archetype_by_object_name (slaying); |
428 | object *tmp = get_archetype_by_object_name (slaying); |
411 | insert_ob_in_ob (tmp, this); |
429 | insert_ob_in_ob (tmp, this); |
412 | randomitems = NULL; /* So another spell isn't created for this object */ |
430 | randomitems = 0; /* So another spell isn't created for this object */ |
413 | /* without this, value is all screwed up */ |
431 | /* without this, value is all screwed up */ |
414 | value = arch->value * inv->value; |
432 | value = arch->value * inv->value; |
415 | } |
433 | } |
416 | |
434 | |
417 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
435 | if (this->flag [FLAG_MONSTER]) |
418 | { |
436 | { |
419 | if (stats.hp > stats.maxhp) |
437 | if (stats.hp > stats.maxhp) |
420 | { |
438 | { |
421 | LOG (llevDebug, "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); |
422 | stats.maxhp = stats.hp; |
440 | stats.maxhp = stats.hp; |
423 | } |
441 | } |
424 | |
442 | |
425 | /* The archs just need to be updated for this */ |
443 | /* The archs just need to be updated for this */ |
426 | if (move_type == 0) |
444 | if (move_type == 0) |
427 | move_type = MOVE_WALK; |
445 | move_type = MOVE_WALK; |
428 | } |
446 | } |
429 | |
447 | |
430 | 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) |
431 | { |
|
|
432 | /* Object will duplicate it's content as part of the |
449 | /* Object will duplicate it's content as part of the |
433 | * generation process. To do this, we must flag inventory |
450 | * generation process. To do this, we must flag inventory |
434 | * so it remains unevaluated concerning the randomitems and |
451 | * so it remains unevaluated concerning the randomitems and |
435 | * the living (a demonlord shouldn't cast from inside generator!) |
452 | * the living (a demonlord shouldn't cast from inside generator!) |
436 | */ |
453 | */ |
|
|
454 | /* ??? this *should* be done elsewhere, e.g. after map loading etc. */ |
437 | flag_inv (this, FLAG_IS_A_TEMPLATE); |
455 | flag_inv (this, FLAG_IS_A_TEMPLATE); |
438 | } |
|
|
439 | |
456 | |
440 | /* Handle player movers. We use move_type for player movers |
457 | /* Handle player movers. We use move_type for player movers |
441 | * because they operate on their own time (move_on |
458 | * because they operate on their own time (move_on |
442 | * would potentially cause them to be triggered when someone steps |
459 | * would potentially cause them to be triggered when someone steps |
443 | * on them). If move_type is set, presume person knows what they |
460 | * on them). If move_type is set, presume person knows what they |
444 | * are doing, otherwise, set move_type based on maxhp value. |
461 | * are doing, otherwise, set move_type based on maxhp value. |
445 | */ |
462 | */ |
446 | if (type == PLAYERMOVER) |
463 | if (type == PLAYERMOVER) |
447 | { |
464 | { |
448 | if (!move_type) |
465 | if (!move_type) |
… | |
… | |
454 | } |
471 | } |
455 | else |
472 | else |
456 | move_type = MOVE_WALK; |
473 | move_type = MOVE_WALK; |
457 | } |
474 | } |
458 | } |
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 | } |
459 | } |
489 | } |
460 | |
490 | |
461 | static void |
491 | static void |
462 | set_move (MoveType &mt, const char *str) |
492 | set_move (MoveType &mt, object_thawer &f) |
463 | { |
493 | { |
464 | static const struct flagstr { |
494 | static const struct flagstr { |
465 | const char *name; |
495 | const char *name; |
466 | MoveType flags; |
496 | MoveType flags; |
467 | } move_flags[] = { |
497 | } move_flags[] = { |
… | |
… | |
473 | { "boat" , MOVE_BOAT }, |
503 | { "boat" , MOVE_BOAT }, |
474 | { "ship" , MOVE_SHIP }, |
504 | { "ship" , MOVE_SHIP }, |
475 | { "all" , MOVE_ALL }, |
505 | { "all" , MOVE_ALL }, |
476 | }; |
506 | }; |
477 | |
507 | |
478 | if (!str) |
508 | const char *str = f.get_str (); |
479 | { |
|
|
480 | mt = 0; |
|
|
481 | return; |
|
|
482 | } |
|
|
483 | |
509 | |
484 | if (isdigit (*str)) |
510 | if (!*str || isdigit (*str)) |
485 | { |
511 | { |
486 | mt = atoi (str); |
512 | mt = atoi (str); |
487 | return; |
513 | return; |
488 | } |
514 | } |
489 | |
515 | |
490 | mt = 0; |
516 | mt = 0; |
491 | |
517 | |
492 | for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) |
518 | for (str = strtok ((char *)str, " "); str; str = strtok (0, " ")) |
493 | { |
519 | { |
494 | bool negate = 0; |
520 | bool negate = 0; |
495 | |
521 | |
496 | if (*str == '-') |
522 | if (*str == '-') |
497 | { |
523 | { |
498 | negate = 1; |
524 | negate = 1; |
499 | str++; |
525 | str++; |
500 | } |
526 | } |
501 | |
527 | |
502 | 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) |
503 | { |
529 | { |
504 | if (!strcmp (f->name, str)) |
530 | if (!strcmp (f->name, str)) |
505 | { |
531 | { |
506 | if (negate) |
532 | if (negate) |
507 | mt &= ~f->flags; |
533 | mt &= ~f->flags; |
… | |
… | |
510 | |
536 | |
511 | goto next; |
537 | goto next; |
512 | } |
538 | } |
513 | } |
539 | } |
514 | |
540 | |
515 | LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); |
541 | LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str); |
516 | |
542 | |
517 | next: ; |
543 | next: ; |
518 | } |
544 | } |
519 | } |
545 | } |
|
|
546 | |
|
|
547 | //-GPL |
520 | |
548 | |
521 | #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () |
549 | #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () |
522 | |
550 | |
523 | bool |
551 | bool |
524 | object::parse_kv (object_thawer &f) |
552 | object::parse_kv (object_thawer &f) |
525 | { |
553 | { |
526 | object *op_inv = inv; |
554 | object *op_inv = inv; |
|
|
555 | key_value *last_kv = key_values; |
527 | |
556 | |
528 | for (;;) |
557 | for (;;) |
529 | { |
558 | { |
530 | switch (f.kw) |
559 | switch (f.kw) |
531 | { |
560 | { |
532 | case KW_uuid: |
561 | case KW_uuid: |
533 | if (const char *s = f.get_str ()) |
|
|
534 | if (!uuid.parse (s)) |
562 | if (!uuid.parse (f.get_str ())) |
535 | { |
563 | { |
536 | f.parse_warn ("unparseable uuid"); |
564 | f.parse_warn ("unparseable uuid"); |
537 | uuid = UUID::gen (); |
565 | uuid = UUID::gen (); |
538 | } |
566 | } |
539 | break; |
567 | break; |
540 | |
568 | |
541 | case KW_oid: |
569 | case KW_oid: |
542 | f.get (this, f.get_sint32 ()); |
570 | f.get (this, f.get_sint32 ()); |
543 | break; |
571 | break; |
… | |
… | |
552 | case KW_race: f.get_ornull (race); break; |
580 | case KW_race: f.get_ornull (race); break; |
553 | case KW_slaying: f.get_ornull (slaying); break; |
581 | case KW_slaying: f.get_ornull (slaying); break; |
554 | case KW_tag: f.get_ornull (tag); break; |
582 | case KW_tag: f.get_ornull (tag); break; |
555 | |
583 | |
556 | case KW_arch: |
584 | case KW_arch: |
557 | { |
|
|
558 | object *tmp = object::read (f); |
585 | if (object *tmp = object::read (f)) |
559 | tmp->deactivate (); |
|
|
560 | |
|
|
561 | { |
586 | { |
|
|
587 | tmp->deactivate (); |
|
|
588 | |
562 | // was: insert_ob_in_ob (tmp, op); |
589 | // was: insert_ob_in_ob (tmp, op); |
563 | // but manually adding it can improve map loading times a lot |
590 | // but manually adding it can improve map loading times a lot |
564 | // also, appending instead of prepending keeps the |
591 | // also, appending instead of prepending keeps the |
565 | // save ordering the same between repeated load/saves. |
592 | // save ordering the same between repeated load/saves. |
566 | // and finally we do not want any funny effects |
593 | // and finally we do not want any funny effects |
567 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
594 | tmp->clr_flag (FLAG_OBJ_ORIGINAL); |
568 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
595 | tmp->clr_flag (FLAG_REMOVED); |
569 | |
596 | |
570 | if (!op_inv) |
597 | if (!op_inv) |
571 | { |
598 | { |
572 | inv = tmp; |
599 | inv = tmp; |
573 | tmp->above = 0; |
600 | tmp->above = 0; |
… | |
… | |
583 | |
610 | |
584 | tmp->below = 0; |
611 | tmp->below = 0; |
585 | tmp->env = this; |
612 | tmp->env = this; |
586 | op_inv = tmp; |
613 | op_inv = tmp; |
587 | } |
614 | } |
588 | } |
615 | else |
|
|
616 | LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n"); |
|
|
617 | |
589 | continue; |
618 | continue; |
590 | |
619 | |
591 | case KW_other_arch: |
620 | case KW_other_arch: |
592 | other_arch = |
|
|
593 | loading_arch |
621 | if (loading_arch == this) |
594 | ? archetype::get (f.get_str ()) |
622 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
|
|
623 | else |
|
|
624 | { |
595 | : archetype::find (f.get_str ()); |
625 | other_arch = archetype::find (f.get_str ()); |
596 | |
626 | |
597 | if (!other_arch) |
627 | if (!other_arch) |
598 | f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ())); |
628 | f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ())); |
|
|
629 | } |
599 | break; |
630 | break; |
600 | |
631 | |
601 | case KW_owner: |
632 | case KW_owner: |
602 | f.delayed_deref (this, owner, f.get_str ()); |
633 | f.delayed_deref (this, owner, f.get_str ()); |
603 | break; |
634 | break; |
604 | |
635 | |
605 | case KW_animation: |
636 | case KW_animation: |
606 | { |
637 | { |
607 | CLEAR_FLAG (this, FLAG_ANIMATE); |
638 | this->clr_flag (FLAG_ANIMATE); |
608 | animation_id = 0; |
639 | animation_id = 0; |
609 | |
640 | |
610 | const char *str = f.get_str (); |
|
|
611 | if (str && (animation_id = find_animation (str))) |
641 | if (f.has_value () && (animation_id = find_animation (f.get_str ()))) |
612 | SET_FLAG (this, FLAG_ANIMATE); |
642 | this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here |
613 | } |
643 | } |
614 | break; |
644 | break; |
615 | |
645 | |
616 | case KW_last_heal: f.get (last_heal); break; |
646 | case KW_last_heal: f.get (last_heal); break; |
617 | case KW_last_sp: f.get (last_sp); break; |
647 | case KW_last_sp: f.get (last_sp); break; |
618 | case KW_last_grace: f.get (last_grace); break; |
648 | case KW_last_grace: f.get (last_grace); break; |
619 | case KW_last_eat: f.get (last_eat); break; |
649 | case KW_last_eat: f.get (last_eat); break; |
|
|
650 | case KW_sl: |
620 | case KW_speed_left: f.get (speed_left); break; |
651 | case KW_speed_left: f.get (speed_left); break; |
621 | |
652 | |
622 | case KW_speed: |
653 | case KW_speed: |
623 | f.get (speed); |
654 | f.get (speed); |
624 | |
655 | |
… | |
… | |
633 | move_slow |= MOVE_WALK; |
664 | move_slow |= MOVE_WALK; |
634 | f.get (move_slow_penalty); |
665 | f.get (move_slow_penalty); |
635 | break; |
666 | break; |
636 | |
667 | |
637 | case KW_face: |
668 | case KW_face: |
638 | face = face_find (f.get_str ()); |
669 | face = f.has_value () ? face_find (f.get_str ()) : blank_face; |
639 | break; |
670 | break; |
640 | |
671 | |
641 | case KW_sound: |
672 | case KW_sound: |
|
|
673 | if (f.has_value ()) |
|
|
674 | { |
642 | sound = sound_find (f.get_str ()); |
675 | sound = sound_find (f.get_str ()); |
643 | if (!sound) |
676 | if (!sound) |
644 | f.parse_warn ("sound not found"); |
677 | f.parse_warn (format ("sound '%s' not found", f.get_str ())); |
|
|
678 | } |
|
|
679 | else |
|
|
680 | sound = 0; |
645 | break; |
681 | break; |
646 | |
682 | |
647 | case KW_sound_destroy: |
683 | case KW_sound_destroy: |
|
|
684 | if (f.has_value ()) |
|
|
685 | { |
648 | sound_destroy = sound_find (f.get_str ()); |
686 | sound_destroy = sound_find (f.get_str ()); |
649 | if (!sound_destroy) |
687 | if (!sound_destroy) |
650 | f.parse_warn ("sound not found"); |
688 | f.parse_warn (format ("sound '%s' not found", f.get_str ())); |
|
|
689 | } |
|
|
690 | else |
|
|
691 | sound_destroy = 0; |
651 | break; |
692 | break; |
652 | |
693 | |
653 | case KW_x: f.get (x); break; |
694 | case KW_x: f.get (x); break; |
654 | case KW_y: f.get (y); break; |
695 | case KW_y: f.get (y); break; |
655 | |
696 | |
… | |
… | |
696 | case KW_invisible: f.get (invisible); break; |
737 | case KW_invisible: f.get (invisible); break; |
697 | case KW_magic: f.get (magic); break; |
738 | case KW_magic: f.get (magic); break; |
698 | case KW_state: f.get (state); break; |
739 | case KW_state: f.get (state); break; |
699 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
740 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
700 | case KW_material: f.get (materials); break; //TODO: nuke |
741 | case KW_material: f.get (materials); break; //TODO: nuke |
701 | case KW_materialname: f.get (materialname); break; |
742 | case KW_materialname: f.get (material); break; |
702 | |
743 | |
703 | /* These are the new values */ |
744 | /* These are the new values */ |
704 | case KW_move_block: set_move (move_block, f.get_str ()); break; |
745 | case KW_move_block: set_move (move_block, f); break; |
705 | case KW_move_allow: set_move (move_allow, f.get_str ()); break; |
746 | case KW_move_allow: set_move (move_allow, f); break; |
706 | case KW_move_type: set_move (move_type, f.get_str ()); break; |
747 | case KW_move_type: set_move (move_type , f); break; |
707 | case KW_move_on: set_move (move_on, f.get_str ()); break; |
748 | case KW_move_on: set_move (move_on , f); break; |
708 | case KW_move_off: set_move (move_off, f.get_str ()); break; |
749 | case KW_move_off: set_move (move_off , f); break; |
709 | case KW_move_slow: set_move (move_slow, f.get_str ()); break; |
750 | case KW_move_slow: set_move (move_slow , f); break; |
710 | |
751 | |
711 | /* These are all legacy - any new objects should use the move_ .. values */ |
752 | /* These are all legacy - any new objects should use the move_ .. values */ |
712 | case KW_no_pass: |
753 | case KW_no_pass: |
713 | { |
754 | { |
714 | if (f.get_sint32 ()) |
755 | if (f.get_sint32 ()) |
… | |
… | |
777 | |
818 | |
778 | |
819 | |
779 | case KW_identified: |
820 | case KW_identified: |
780 | GET_FLAG (this, FLAG_IDENTIFIED); |
821 | GET_FLAG (this, FLAG_IDENTIFIED); |
781 | //TODO: move to check_object or so |
822 | //TODO: move to check_object or so |
782 | if (QUERY_FLAG (this, FLAG_IDENTIFIED)) |
823 | if (this->flag [FLAG_IDENTIFIED]) |
783 | CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); |
824 | this->clr_flag (FLAG_KNOWN_MAGICAL); |
784 | |
825 | |
785 | break; |
826 | break; |
786 | |
827 | |
787 | case KW_friendly: |
828 | case KW_friendly: |
788 | if (f.get_bool ()) |
829 | if (f.get_bool ()) |
… | |
… | |
806 | case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; |
847 | case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; |
807 | case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; |
848 | case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; |
808 | case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; |
849 | case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; |
809 | case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; |
850 | case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; |
810 | case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; |
851 | case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; |
|
|
852 | case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break; |
811 | case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; |
853 | case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; |
812 | case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; |
854 | case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; |
813 | case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; |
855 | case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; |
814 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
856 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
815 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
857 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
… | |
… | |
822 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
864 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
823 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
865 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
824 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
866 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
825 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
867 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
826 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
868 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
827 | case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; |
|
|
828 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
869 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
829 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
870 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
830 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
871 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
831 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
872 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
832 | case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; |
873 | case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; |
… | |
… | |
876 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
917 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
877 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
918 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
878 | 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; |
879 | case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; |
920 | case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; |
880 | 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; |
881 | |
923 | |
882 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
924 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
883 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
925 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
884 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
926 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
885 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
927 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
… | |
… | |
915 | case KW_anim_speed: f.get (anim_speed); break; |
957 | case KW_anim_speed: f.get (anim_speed); break; |
916 | case KW_container: f.get (weight_limit); break; |
958 | case KW_container: f.get (weight_limit); break; |
917 | case KW_will_apply: f.get (will_apply); break; |
959 | case KW_will_apply: f.get (will_apply); break; |
918 | case KW_attack_movement: f.get (attack_movement); break; |
960 | case KW_attack_movement: f.get (attack_movement); break; |
919 | case KW_move_state: f.get (move_status); break; |
961 | case KW_move_state: f.get (move_status); break; |
920 | case KW_expmul: f.get (expmul); break; |
962 | //case KW_expmul: f.get (expmul); break;//D declared const for the time being |
921 | case KW_glow_radius: f.get (glow_radius); break; |
963 | case KW_glow_radius: f.get (glow_radius); break; |
922 | case KW_weapontype: f.get (weapontype); break; |
964 | 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; |
965 | case KW_casting_time: f.get (casting_time); break; |
|
|
966 | |
|
|
967 | // elevation is deprecated |
925 | case KW_elevation: f.get (elevation); break; |
968 | case KW_elevation: break; |
|
|
969 | |
926 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
970 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
927 | case KW_client_type: f.get (client_type); break; |
971 | case KW_client_type: f.get (client_type); break; |
928 | case KW_duration: f.get (duration); break; |
972 | case KW_duration: f.get (duration); break; |
929 | case KW_range: f.get (range); break; |
973 | case KW_range: f.get (range); break; |
930 | case KW_range_modifier: f.get (range_modifier); break; |
974 | case KW_range_modifier: f.get (range_modifier); break; |
… | |
… | |
949 | case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; |
993 | case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; |
950 | case KW_can_apply: |
994 | case KW_can_apply: |
951 | break; |
995 | break; |
952 | |
996 | |
953 | case KW_connected: |
997 | case KW_connected: |
954 | add_button_link (this, map, f.get_sint32 ()); |
998 | { |
|
|
999 | shstr connected; |
|
|
1000 | |
|
|
1001 | f.get (connected); |
|
|
1002 | add_link (map, connected); |
|
|
1003 | } |
955 | break; |
1004 | break; |
956 | |
1005 | |
957 | case KW_randomitems: |
1006 | case KW_randomitems: |
958 | if (f.get_str ()) |
1007 | if (f.has_value ()) |
959 | { |
1008 | { |
960 | randomitems = |
1009 | randomitems = |
961 | loading_arch |
1010 | loading_arch |
962 | ? treasurelist::get (f.get_str ()) |
1011 | ? treasurelist::get (f.get_str ()) |
963 | : treasurelist::find (f.get_str ()); |
1012 | : treasurelist::find (f.get_str ()); |
964 | |
1013 | |
965 | if (!randomitems) |
1014 | if (!randomitems) |
|
|
1015 | { |
966 | LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); |
1016 | LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); |
|
|
1017 | randomitems = treasurelist::get (shstr_none); // avoid crashes |
|
|
1018 | } |
967 | } |
1019 | } |
968 | else |
1020 | else |
969 | randomitems = 0; |
1021 | randomitems = 0; |
970 | break; |
1022 | break; |
971 | |
1023 | |
… | |
… | |
987 | |
1039 | |
988 | f.next (); |
1040 | f.next (); |
989 | return true; |
1041 | return true; |
990 | |
1042 | |
991 | case KW_ERROR: |
1043 | case KW_ERROR: |
992 | set_ob_key_value (this, f.kw_str, f.value, true); |
1044 | // append as key value pair (do not use kv_set as it prepends) |
|
|
1045 | // we also do not even try to find old values, duplicate keys stay duplicate |
|
|
1046 | { |
|
|
1047 | key_value *kv = new key_value; |
|
|
1048 | |
|
|
1049 | kv->next = 0; |
|
|
1050 | kv->key = shstr (f.kw_str); |
|
|
1051 | kv->value = shstr (f.value); |
|
|
1052 | |
|
|
1053 | if (!last_kv) |
|
|
1054 | key_values = last_kv = kv; |
|
|
1055 | else |
|
|
1056 | { |
|
|
1057 | while (last_kv->next) |
|
|
1058 | last_kv = last_kv->next; |
|
|
1059 | |
|
|
1060 | last_kv->next = kv; |
|
|
1061 | last_kv = kv; |
|
|
1062 | } |
|
|
1063 | } |
993 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
1064 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
994 | break; |
1065 | break; |
995 | |
1066 | |
996 | default: |
1067 | default: |
997 | if (!f.parse_error ("object", name)) |
1068 | if (!f.parse_error ("object", name)) |
… | |
… | |
1011 | archetype *arch = archetype::find (f.get_str ()); |
1082 | archetype *arch = archetype::find (f.get_str ()); |
1012 | |
1083 | |
1013 | if (!arch) |
1084 | if (!arch) |
1014 | { |
1085 | { |
1015 | LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); |
1086 | LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); |
1016 | arch = archetype::find ("earthwall"); |
1087 | arch = archetype::find (shstr_earthwall); |
1017 | } |
1088 | } |
1018 | |
1089 | |
1019 | assert (arch); //D maybe use exception handling of sorts? |
1090 | assert (arch); //D maybe use exception handling of sorts? |
1020 | |
1091 | |
1021 | f.next (); |
1092 | f.next (); |
1022 | |
1093 | |
1023 | object *op = object::create (); |
1094 | object *op = arch->instance (); |
1024 | |
|
|
1025 | op->map = map; |
1095 | op->map = map; |
1026 | arch->copy_to (op); |
|
|
1027 | // copy_to activates, this should be fixed properly |
1096 | // instance() activates, this should be fixed properly |
1028 | op->deactivate (); |
1097 | op->deactivate (); |
1029 | |
1098 | |
1030 | if (!op->parse_kv (f)) |
1099 | if (!op->parse_kv (f)) |
1031 | { |
1100 | { |
1032 | op->destroy (true); |
1101 | op->destroy (); |
1033 | return 0; |
1102 | return 0; |
1034 | } |
1103 | } |
1035 | |
1104 | |
1036 | op->post_load_check (); |
1105 | op->post_load_check (); |
1037 | return op; |
1106 | return op; |
… | |
… | |
1044 | * override values and in c_wiz to mutate values. |
1113 | * override values and in c_wiz to mutate values. |
1045 | */ |
1114 | */ |
1046 | int |
1115 | int |
1047 | set_variable (object *op, char *buf) |
1116 | set_variable (object *op, char *buf) |
1048 | { |
1117 | { |
1049 | object_thawer f (buf, (AV *)0); |
1118 | object_thawer f (format ("%s\nend", buf), (AV *)0); |
1050 | |
1119 | |
1051 | return op->parse_kv (f); |
1120 | return op->parse_kv (f); |
1052 | } |
1121 | } |
1053 | |
1122 | |
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 |
1123 | // compare *op against *arch and output differences |
1106 | static void |
1124 | static void |
1107 | write_diff (object_freezer &f, object *op, object *tmp) |
1125 | write_diff (object_freezer &f, object *op, object *arch) |
1108 | { |
1126 | { |
1109 | static const keyword resist_save[NROFATTACKS] = { |
1127 | static const keyword resist_save[NROFATTACKS] = { |
1110 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1128 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1111 | # include "attackinc.h" |
1129 | # include "attackinc.h" |
1112 | # undef def |
1130 | # undef def |
… | |
… | |
1126 | KW_applied, |
1144 | KW_applied, |
1127 | KW_unpaid, |
1145 | KW_unpaid, |
1128 | KW_can_use_shield, |
1146 | KW_can_use_shield, |
1129 | KW_no_pick, |
1147 | KW_no_pick, |
1130 | KW_NULL, // walk_on |
1148 | KW_NULL, // walk_on |
|
|
1149 | /* 10 */ |
1131 | KW_NULL, // no_pass |
1150 | KW_NULL, // no_pass |
1132 | /* 10 */ |
|
|
1133 | KW_is_animated, |
1151 | KW_is_animated, |
1134 | KW_NULL, // slow_move |
1152 | KW_NULL, // slow_move |
1135 | KW_NULL, // flying |
1153 | KW_NULL, // flying |
1136 | KW_monster, |
1154 | KW_monster, |
1137 | KW_friendly, |
1155 | KW_friendly, |
1138 | KW_generator, |
1156 | KW_generator, |
1139 | KW_is_thrown, |
1157 | KW_is_thrown, |
1140 | KW_auto_apply, |
1158 | KW_auto_apply, |
1141 | KW_treasure_env, |
1159 | KW_treasure_env, |
|
|
1160 | /* 20 */ |
1142 | KW_player_sold, |
1161 | KW_player_sold, |
1143 | /* 20 */ |
|
|
1144 | KW_see_invisible, |
1162 | KW_see_invisible, |
1145 | KW_can_roll, |
1163 | KW_can_roll, |
1146 | KW_overlay_floor, |
1164 | KW_overlay_floor, |
1147 | KW_is_turnable, |
1165 | KW_is_turnable, |
1148 | KW_NULL, // walk_off |
1166 | KW_NULL, // walk_off |
1149 | KW_NULL, // fly_on |
1167 | KW_NULL, // fly_on |
1150 | KW_NULL, // fly_off |
1168 | KW_NULL, // fly_off |
1151 | KW_is_used_up, |
1169 | KW_is_used_up, |
1152 | KW_identified, |
1170 | KW_identified, |
|
|
1171 | /* 30 */ |
1153 | KW_reflecting, |
1172 | KW_reflecting, |
1154 | /* 30 */ |
|
|
1155 | KW_changing, |
1173 | KW_changing, |
1156 | KW_splitting, |
1174 | KW_splitting, |
1157 | KW_hitback, |
1175 | KW_hitback, |
1158 | KW_startequip, |
1176 | KW_startequip, |
1159 | KW_blocksview, |
1177 | KW_blocksview, |
1160 | KW_undead, |
1178 | KW_undead, |
1161 | KW_scared, |
1179 | KW_scared, |
1162 | KW_unaggressive, |
1180 | KW_unaggressive, |
1163 | KW_reflect_missile, |
1181 | KW_reflect_missile, |
|
|
1182 | /* 40 */ |
1164 | KW_reflect_spell, |
1183 | KW_reflect_spell, |
1165 | /* 40 */ |
|
|
1166 | KW_no_magic, |
1184 | KW_no_magic, |
1167 | KW_no_fix_player, |
1185 | KW_NULL, |
1168 | KW_is_lightable, |
1186 | KW_is_lightable, |
1169 | KW_tear_down, |
1187 | KW_tear_down, |
1170 | KW_run_away, |
1188 | KW_run_away, |
1171 | KW_NULL, // pass_thru |
1189 | KW_NULL, // pass_thru |
1172 | KW_NULL, // an_pass_thru |
1190 | KW_NULL, // an_pass_thru |
1173 | KW_pick_up, |
1191 | KW_pick_up, |
1174 | KW_unique, |
1192 | KW_unique, |
|
|
1193 | /* 50 */ |
1175 | KW_no_drop, |
1194 | KW_no_drop, |
1176 | /* 50 */ |
|
|
1177 | KW_NULL, // wizcast |
1195 | KW_NULL, // wizcast |
1178 | KW_can_cast_spell, |
1196 | KW_can_cast_spell, |
1179 | KW_can_use_scroll, |
1197 | KW_can_use_scroll, |
1180 | KW_can_use_range, |
1198 | KW_can_use_range, |
1181 | KW_can_use_bow, |
1199 | KW_can_use_bow, |
1182 | KW_can_use_armour, |
1200 | KW_can_use_armour, |
1183 | KW_can_use_weapon, |
1201 | KW_can_use_weapon, |
1184 | KW_can_use_ring, |
1202 | KW_can_use_ring, |
1185 | KW_has_ready_range, |
1203 | KW_has_ready_range, |
|
|
1204 | /* 60 */ |
1186 | KW_has_ready_bow, |
1205 | KW_has_ready_bow, |
1187 | /* 60 */ |
|
|
1188 | KW_xrays, |
1206 | KW_xrays, |
1189 | KW_NULL, |
1207 | KW_NULL, |
1190 | KW_is_floor, |
1208 | KW_is_floor, |
1191 | KW_lifesave, |
1209 | KW_lifesave, |
1192 | KW_no_strength, |
1210 | KW_no_strength, |
1193 | KW_sleep, |
1211 | KW_sleep, |
1194 | KW_stand_still, |
1212 | KW_stand_still, |
1195 | KW_random_move, |
1213 | KW_random_move, |
1196 | KW_only_attack, |
1214 | KW_only_attack, |
|
|
1215 | /* 70 */ |
1197 | KW_confused, |
1216 | KW_confused, |
1198 | /* 70 */ |
|
|
1199 | KW_stealth, |
1217 | KW_stealth, |
1200 | KW_NULL, |
1218 | KW_NULL, |
1201 | KW_NULL, |
1219 | KW_NULL, |
1202 | KW_cursed, |
1220 | KW_cursed, |
1203 | KW_damned, |
1221 | KW_damned, |
1204 | KW_see_anywhere, |
1222 | KW_see_anywhere, |
1205 | KW_known_magical, |
1223 | KW_known_magical, |
1206 | KW_known_cursed, |
1224 | KW_known_cursed, |
1207 | KW_can_use_skill, |
1225 | KW_can_use_skill, |
|
|
1226 | /* 80 */ |
1208 | KW_been_applied, |
1227 | KW_been_applied, |
1209 | /* 80 */ |
|
|
1210 | KW_has_ready_scroll, |
1228 | KW_has_ready_scroll, |
1211 | KW_can_use_rod, |
1229 | KW_can_use_rod, |
1212 | KW_precious, |
1230 | KW_precious, |
1213 | KW_can_use_horn, |
1231 | KW_can_use_horn, |
1214 | KW_make_invisible, |
1232 | KW_make_invisible, |
1215 | KW_inv_locked, |
1233 | KW_inv_locked, |
1216 | KW_is_wooded, |
1234 | KW_is_wooded, |
1217 | KW_is_hilly, |
1235 | KW_is_hilly, |
1218 | KW_has_ready_skill, |
1236 | KW_has_ready_skill, |
|
|
1237 | /* 90 */ |
1219 | KW_has_ready_weapon, |
1238 | KW_has_ready_weapon, |
1220 | /* 90 */ |
|
|
1221 | KW_no_skill_ident, |
1239 | KW_no_skill_ident, |
1222 | KW_is_blind, |
1240 | KW_is_blind, |
1223 | KW_can_see_in_dark, |
1241 | KW_can_see_in_dark, |
1224 | KW_is_cauldron, |
1242 | KW_is_cauldron, |
1225 | KW_NULL, |
1243 | KW_NULL, |
1226 | KW_no_steal, |
1244 | KW_no_steal, |
1227 | KW_one_hit, |
1245 | KW_one_hit, |
1228 | KW_NULL, |
1246 | KW_NULL, |
1229 | KW_berserk, |
1247 | KW_berserk, |
|
|
1248 | /* 100 */ |
1230 | KW_neutral, |
1249 | KW_neutral, |
1231 | /* 100 */ |
|
|
1232 | KW_no_attack, |
1250 | KW_no_attack, |
1233 | KW_no_damage, |
1251 | KW_no_damage, |
1234 | KW_obj_original, |
1252 | KW_obj_original, |
1235 | KW_NULL, |
1253 | KW_random_speed, |
1236 | KW_activate_on_push, |
1254 | KW_activate_on_push, |
1237 | KW_activate_on_release, |
1255 | KW_activate_on_release, |
1238 | KW_is_water, |
1256 | KW_is_water, |
1239 | KW_use_content_on_gen, |
1257 | KW_use_content_on_gen, |
1240 | KW_NULL, |
1258 | KW_NULL, |
|
|
1259 | /* 110 */ |
1241 | KW_is_buildable, |
1260 | KW_is_buildable, |
1242 | /* 110 */ |
|
|
1243 | KW_destroy_on_death, |
1261 | KW_destroy_on_death, |
1244 | KW_NULL, |
1262 | KW_NULL, |
1245 | }; |
1263 | }; |
1246 | |
1264 | |
1247 | int i; |
1265 | // obj_original is the only commonly differing flag between archetype |
|
|
1266 | // and object, so special-case it here to be able to skip the loop |
|
|
1267 | static const struct flagmask : object::flags_t |
|
|
1268 | { |
|
|
1269 | flagmask () |
|
|
1270 | { |
|
|
1271 | for (int i = 0; i < NUM_FLAGS; i++) |
|
|
1272 | if (flag_names [i]) |
|
|
1273 | set (i); |
|
|
1274 | } |
|
|
1275 | } flagmask; |
1248 | |
1276 | |
1249 | /* This saves the key/value lists. We do it first so that any |
1277 | /* 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. |
1278 | * keys that match field names will be overwritten by the loader. |
1251 | */ |
1279 | */ |
1252 | for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) |
1280 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1253 | { |
1281 | if (!arch->key_values || arch->kv (kv->key) != kv->value) |
1254 | /* Find the field in the opposing member. */ |
1282 | f.put (kv->key, kv->value); |
1255 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
|
|
1256 | |
1283 | |
1257 | /* If there's no partnering field, or it's got a different value, save our field. */ |
1284 | if (op->uuid) |
1258 | if (!arch_field || my_field->value != arch_field->value) |
|
|
1259 | f.put (my_field->key, my_field->value); |
|
|
1260 | } |
1285 | { |
|
|
1286 | // highly optimised - this is often 25% of all data written |
|
|
1287 | char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1); |
|
|
1288 | char *ptr = cur; |
1261 | |
1289 | |
1262 | /* We don't need to worry about the arch's extra fields - they |
1290 | memcpy (ptr, "uuid ", sizeof ("uuid ") - 1); |
1263 | * will get taken care of the copy_to method. |
1291 | ptr += sizeof ("uuid ") - 1; |
1264 | */ |
1292 | ptr = op->uuid.append (ptr); |
|
|
1293 | *ptr++ = '\n'; |
1265 | |
1294 | |
1266 | f.put (KW_uuid, op->uuid.c_str ()); |
1295 | f.alloc (ptr - cur); |
|
|
1296 | } |
1267 | |
1297 | |
1268 | #define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) |
1298 | #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) |
1299 | #define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v) |
1270 | |
1300 | |
1271 | if (object *owner = op->owner) |
1301 | CMP_OUT (x); |
1272 | f.put (KW_owner, static_cast<const char *>(owner->ref ())); |
1302 | CMP_OUT (y); |
|
|
1303 | |
|
|
1304 | CMP_OUT (type); |
|
|
1305 | CMP_OUT (subtype); |
|
|
1306 | CMP_OUT (direction); |
1273 | |
1307 | |
1274 | CMP_OUT (name); |
1308 | CMP_OUT (name); |
1275 | CMP_OUT (name_pl); |
1309 | CMP_OUT (name_pl); |
1276 | CMP_OUT (custom_name); |
1310 | CMP_OUT (speed); |
|
|
1311 | |
|
|
1312 | // speed_left is a major time-burner, and has good locality, so |
|
|
1313 | // we use a simple lookup-cache to avoid the very slow printf. |
|
|
1314 | if (op->speed_left != arch->speed_left) |
|
|
1315 | { |
|
|
1316 | static double last_speed_left = 0.; |
|
|
1317 | static char last_speed_left_str [256] = "sl 0\n"; |
|
|
1318 | static int last_speed_left_len = sizeof ("sl 0\n") - 1; |
|
|
1319 | |
|
|
1320 | if (last_speed_left != op->speed_left) |
|
|
1321 | { |
|
|
1322 | last_speed_left = op->speed_left; |
|
|
1323 | last_speed_left_len = sizeof ("sl ") - 1 |
|
|
1324 | + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left); |
|
|
1325 | } |
|
|
1326 | |
|
|
1327 | f.add (last_speed_left_str, last_speed_left_len); |
|
|
1328 | } |
|
|
1329 | |
1277 | CMP_OUT (title); |
1330 | CMP_OUT (title); |
1278 | CMP_OUT (race); |
1331 | CMP_OUT (race); |
1279 | CMP_OUT (slaying); |
1332 | CMP_OUT (slaying); |
|
|
1333 | CMP_OUT (skill); |
|
|
1334 | |
1280 | CMP_OUT (tag); |
1335 | CMP_OUT (tag); |
|
|
1336 | CMP_OUT (custom_name); |
|
|
1337 | |
|
|
1338 | if (object *owner = op->owner) |
|
|
1339 | if (const char *ref = owner->ref ()) |
|
|
1340 | f.put (KW(owner), ref); |
|
|
1341 | |
|
|
1342 | // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved |
|
|
1343 | |
1281 | CMP_OUT (other_arch); |
1344 | CMP_OUT (other_arch); |
1282 | |
1345 | |
1283 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
1346 | 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); |
1347 | if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore); |
1285 | |
1348 | |
1286 | if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); |
1349 | 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); |
1350 | 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); |
1351 | if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1289 | |
1352 | |
1290 | if (op->animation_id != tmp->animation_id) |
1353 | if (op->animation_id != arch->animation_id) |
1291 | if (op->animation_id) |
1354 | if (op->has_anim ()) |
|
|
1355 | f.put (KW(animation), op->anim ().name); |
|
|
1356 | else |
1292 | { |
1357 | { |
1293 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
|
|
1294 | |
|
|
1295 | if (!QUERY_FLAG (op, FLAG_ANIMATE)) |
|
|
1296 | f.put (KW_is_animated, (sint32)0); |
1358 | f.put (KW(animation)); |
|
|
1359 | op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? |
1297 | } |
1360 | } |
1298 | else |
|
|
1299 | f.put (KW_animation, (const char *)0); |
|
|
1300 | |
1361 | |
1301 | CMP_OUT2 (str, stats.Str); |
1362 | CMP_OUT2 (str, stats.Str); |
1302 | CMP_OUT2 (dex, stats.Dex); |
1363 | CMP_OUT2 (dex, stats.Dex); |
1303 | CMP_OUT2 (con, stats.Con); |
1364 | CMP_OUT2 (con, stats.Con); |
1304 | CMP_OUT2 (wis, stats.Wis); |
1365 | CMP_OUT2 (wis, stats.Wis); |
… | |
… | |
1313 | CMP_OUT2 (grace, stats.grace); |
1374 | CMP_OUT2 (grace, stats.grace); |
1314 | CMP_OUT2 (maxgrace, stats.maxgrace); |
1375 | CMP_OUT2 (maxgrace, stats.maxgrace); |
1315 | CMP_OUT2 (exp, stats.exp); |
1376 | CMP_OUT2 (exp, stats.exp); |
1316 | |
1377 | |
1317 | CMP_OUT (perm_exp); |
1378 | CMP_OUT (perm_exp); |
1318 | CMP_OUT (expmul); |
1379 | //CMP_OUT (expmul); |
1319 | |
1380 | |
1320 | CMP_OUT2 (food, stats.food); |
1381 | CMP_OUT2 (food, stats.food); |
1321 | CMP_OUT2 (dam, stats.dam); |
1382 | CMP_OUT2 (dam, stats.dam); |
1322 | CMP_OUT2 (luck, stats.luck); |
1383 | CMP_OUT2 (luck, stats.luck); |
1323 | CMP_OUT2 (wc, stats.wc); |
1384 | CMP_OUT2 (wc, stats.wc); |
1324 | CMP_OUT2 (ac, stats.ac); |
1385 | CMP_OUT2 (ac, stats.ac); |
1325 | |
1386 | |
1326 | CMP_OUT (x); |
|
|
1327 | CMP_OUT (y); |
|
|
1328 | CMP_OUT (speed); |
|
|
1329 | CMP_OUT (speed_left); |
|
|
1330 | CMP_OUT2 (move_state, move_status); |
1387 | CMP_OUT2 (move_state, move_status); |
1331 | CMP_OUT (attack_movement); |
1388 | CMP_OUT (attack_movement); |
1332 | CMP_OUT (nrof); |
1389 | CMP_OUT (nrof); |
1333 | CMP_OUT (level); |
1390 | CMP_OUT (level); |
1334 | CMP_OUT (direction); |
|
|
1335 | CMP_OUT (type); |
|
|
1336 | CMP_OUT (subtype); |
|
|
1337 | CMP_OUT (attacktype); |
1391 | CMP_OUT (attacktype); |
1338 | |
1392 | |
|
|
1393 | // using memcmp here seems to be a loss - is gcc vectorising? |
1339 | for (i = 0; i < NROFATTACKS; i++) |
1394 | for (int i = 0; i < NROFATTACKS; i++) |
1340 | if (expect_false (op->resist[i] != tmp->resist[i])) |
1395 | if (expect_false (op->resist[i] != arch->resist[i])) |
1341 | f.put (resist_save[i], op->resist[i]); |
1396 | f.put (resist_save[i], op->resist[i]); |
1342 | |
1397 | |
1343 | CMP_OUT (path_attuned); |
1398 | CMP_OUT (path_attuned); |
1344 | CMP_OUT (path_repelled); |
1399 | CMP_OUT (path_repelled); |
1345 | CMP_OUT (path_denied); |
1400 | CMP_OUT (path_denied); |
|
|
1401 | |
1346 | CMP_OUT2 (material, materials);//TODO: nuke |
1402 | CMP_OUT2 (material, materials);//TODO: nuke |
1347 | CMP_OUT (materialname); |
1403 | if (op->material != arch->material) |
|
|
1404 | f.put (KW(materialname), op->material->name); |
|
|
1405 | |
1348 | CMP_OUT (value); |
1406 | CMP_OUT (value); |
1349 | CMP_OUT (carrying); |
1407 | CMP_OUT (carrying); |
1350 | CMP_OUT (weight); |
1408 | CMP_OUT (weight); |
1351 | CMP_OUT (invisible); |
1409 | CMP_OUT (invisible); |
1352 | CMP_OUT (state); |
1410 | CMP_OUT (state); |
… | |
… | |
1355 | CMP_OUT (last_sp); |
1413 | CMP_OUT (last_sp); |
1356 | CMP_OUT (last_grace); |
1414 | CMP_OUT (last_grace); |
1357 | CMP_OUT (last_eat); |
1415 | CMP_OUT (last_eat); |
1358 | CMP_OUT (glow_radius); |
1416 | CMP_OUT (glow_radius); |
1359 | |
1417 | |
1360 | if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) |
1418 | if (op->flag [FLAG_IS_LINKED]) |
|
|
1419 | if (auto (ol, op->find_link ())) |
1361 | f.put (KW_connected, i); |
1420 | f.put (KW(connected), ol->id); |
1362 | |
1421 | |
1363 | CMP_OUT (randomitems); |
1422 | CMP_OUT (randomitems); |
|
|
1423 | |
1364 | CMP_OUT2 (container, weight_limit); |
1424 | CMP_OUT2 (container, weight_limit); |
1365 | |
1425 | |
1366 | CMP_OUT (run_away); |
1426 | CMP_OUT (run_away); |
1367 | CMP_OUT (pick_up); |
1427 | CMP_OUT (pick_up); |
1368 | CMP_OUT (will_apply); |
1428 | CMP_OUT (will_apply); |
1369 | CMP_OUT (smoothlevel); |
1429 | CMP_OUT (smoothlevel); |
1370 | CMP_OUT (weapontype); |
1430 | CMP_OUT (weapontype); |
1371 | CMP_OUT (tooltype); |
|
|
1372 | CMP_OUT (elevation); |
|
|
1373 | CMP_OUT (client_type); |
1431 | CMP_OUT (client_type); |
1374 | CMP_OUT (item_power); |
1432 | CMP_OUT (item_power); |
1375 | CMP_OUT (duration); |
1433 | CMP_OUT (duration); |
1376 | CMP_OUT (range); |
1434 | CMP_OUT (range); |
1377 | CMP_OUT (range_modifier); |
1435 | CMP_OUT (range_modifier); |
… | |
… | |
1385 | CMP_OUT (move_on); |
1443 | CMP_OUT (move_on); |
1386 | CMP_OUT (move_off); |
1444 | CMP_OUT (move_off); |
1387 | CMP_OUT (move_slow); |
1445 | CMP_OUT (move_slow); |
1388 | CMP_OUT (move_slow_penalty); |
1446 | CMP_OUT (move_slow_penalty); |
1389 | |
1447 | |
1390 | if (op->flag != tmp->flag) |
1448 | object::flags_t diff = (op->flag ^ arch->flag) & flagmask; |
|
|
1449 | |
|
|
1450 | #if stdcpp // we need gcc, sorry |
|
|
1451 | if (diff [FLAG_OBJ_ORIGINAL]) |
|
|
1452 | f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); |
|
|
1453 | |
|
|
1454 | diff.reset (FLAG_OBJ_ORIGINAL); |
|
|
1455 | |
|
|
1456 | // quickly test whether any other flags differ |
|
|
1457 | if (expect_true (diff.any ())) |
1391 | for (i = 0; i <= NUM_FLAGS; i++) |
1458 | for (int i = 0; i < NUM_FLAGS; i++) |
1392 | if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) |
1459 | if (expect_false (diff [i])) |
1393 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1460 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
|
|
1461 | #else |
|
|
1462 | // use sgi extensions |
|
|
1463 | for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i)) |
|
|
1464 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
|
|
1465 | #endif |
1394 | |
1466 | |
1395 | // save body locations |
1467 | // save body locations. gcc's memcmp does an abysmal job when used |
1396 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1468 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1397 | if (expect_false (op->slot[i].info != tmp->slot[i].info)) |
1469 | if (expect_false (op->slot[i].info != arch->slot[i].info)) |
1398 | f.put (body_locations[i].save_name, op->slot[i].info); |
1470 | f.put (body_locations[i].save_name, op->slot[i].info); |
1399 | } |
1471 | } |
1400 | |
1472 | |
1401 | /* |
1473 | /* |
1402 | * Dumps all variables in an object to a file. |
1474 | * Dumps all variables in an object to a file. |
… | |
… | |
1404 | * the only place this is not set is when saving the player. |
1476 | * the only place this is not set is when saving the player. |
1405 | */ |
1477 | */ |
1406 | bool |
1478 | bool |
1407 | object::write (object_freezer &f) |
1479 | object::write (object_freezer &f) |
1408 | { |
1480 | { |
1409 | archetype *at = arch ? (archetype *)arch : empty_archetype; |
1481 | if (expect_false (is_arch ())) |
1410 | |
1482 | { |
|
|
1483 | f.put (KW(object), arch->archname); |
|
|
1484 | write_diff (f, this, archetype::empty); |
|
|
1485 | } |
|
|
1486 | else |
|
|
1487 | { |
1411 | f.put (KW_arch, at->archname); |
1488 | f.put (KW(arch), arch->archname); |
1412 | write_diff (f, this, at); |
1489 | write_diff (f, this, arch); |
|
|
1490 | } |
1413 | |
1491 | |
1414 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1492 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1415 | tmp->write (f); |
1493 | tmp->write (f); |
1416 | |
1494 | |
1417 | f.put (this); |
1495 | f.put (this); |
1418 | f.put (KW_end); |
1496 | f.put (KW(end)); |
1419 | |
1497 | |
1420 | return true; |
1498 | return true; |
1421 | } |
1499 | } |
1422 | |
1500 | |
1423 | ///////////////////////////////////////////////////////////////////////////// |
1501 | ///////////////////////////////////////////////////////////////////////////// |
1424 | |
1502 | |
1425 | // generic resource file load, |
1503 | // generic resource file load, |
1426 | // currently supports: region, treasures, archetypes |
1504 | // currently supports: region, treasures, archetypes |
|
|
1505 | bool |
1427 | bool load_resource_file (const char *filename) |
1506 | load_resource_file_ (const char *filename) |
1428 | { |
1507 | { |
1429 | object_thawer f (filename); |
1508 | object_thawer f (filename); |
1430 | |
1509 | |
1431 | bool success = false; |
|
|
1432 | bool seen_arch = false; |
|
|
1433 | |
|
|
1434 | for (;;) |
1510 | for (;;) |
1435 | { |
1511 | { |
|
|
1512 | coroapi::cede_to_tick (); |
|
|
1513 | |
1436 | switch (f.kw) |
1514 | switch (f.kw) |
1437 | { |
1515 | { |
1438 | case KW_region: |
1516 | case KW_region: |
1439 | if (!region::read (f)) |
1517 | if (!region::read (f)) |
1440 | goto finish; |
1518 | return false; |
1441 | break; |
1519 | break; |
1442 | |
1520 | |
1443 | case KW_treasure: |
1521 | case KW_treasure: |
1444 | case KW_treasureone: |
1522 | case KW_treasureone: |
1445 | if (!treasurelist::read (f)) |
1523 | if (!treasurelist::read (f)) |
1446 | goto finish; |
1524 | return false; |
1447 | break; |
1525 | break; |
1448 | |
1526 | |
1449 | case KW_object: |
1527 | case KW_object: |
1450 | seen_arch = true; |
|
|
1451 | if (!archetype::read (f)) |
1528 | if (!archetype::read (f)) |
1452 | goto finish; |
1529 | return false; |
1453 | break; |
1530 | break; |
1454 | |
1531 | |
1455 | case KW_EOF: |
1532 | case KW_EOF: |
1456 | success = true; |
1533 | return true; |
1457 | goto finish; |
|
|
1458 | |
1534 | |
1459 | default: |
1535 | default: |
1460 | if (!f.parse_error ("resource file")) |
1536 | if (!f.parse_error ("resource file")) |
1461 | goto finish; |
1537 | return false; |
1462 | |
1538 | |
1463 | f.next (); |
1539 | f.next (); |
1464 | break; |
1540 | break; |
1465 | } |
1541 | } |
1466 | } |
1542 | } |
1467 | |
|
|
1468 | finish: |
|
|
1469 | if (seen_arch) |
|
|
1470 | init_archetype_pointers (); |
|
|
1471 | |
|
|
1472 | return success; |
|
|
1473 | } |
1543 | } |
1474 | |
1544 | |