1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game for X-windows |
3 | |
3 | * |
|
|
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | |
7 | * |
7 | This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
8 | it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
9 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | (at your option) any later version. |
11 | * (at your option) any later version. |
11 | |
12 | * |
12 | 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, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
16 | |
17 | * |
17 | You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License |
18 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | |
21 | * |
21 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
25 | sub/add_weight will transcend the environment updating the carrying |
26 | sub/add_weight will transcend the environment updating the carrying |
26 | variable. */ |
27 | variable. */ |
27 | |
28 | |
28 | |
|
|
29 | #include <global.h> |
29 | #include <global.h> |
30 | #include <loader.h> |
30 | #include <loader.h> |
31 | #include <newserver.h> |
|
|
32 | #include <sproto.h> |
31 | #include <sproto.h> |
|
|
32 | |
|
|
33 | ///////////////////////////////////////////////////////////////////////////// |
33 | |
34 | |
34 | /* Maps the MOVE_* values to names */ |
35 | /* Maps the MOVE_* values to names */ |
35 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
36 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
36 | |
37 | |
37 | /* This table is only necessary to convert objects that existed before the |
38 | /* This table is only necessary to convert objects that existed before the |
… | |
… | |
262 | * to check for objects to make sure there are no common errors. |
263 | * to check for objects to make sure there are no common errors. |
263 | */ |
264 | */ |
264 | static void |
265 | static void |
265 | check_loaded_object (object *op) |
266 | check_loaded_object (object *op) |
266 | { |
267 | { |
267 | int ip; |
|
|
268 | |
|
|
269 | /* We do some specialized handling to handle legacy cases of name_pl. |
268 | /* We do some specialised handling to handle legacy cases of name_pl. |
270 | * If the object doesn't have a name_pl, we just use the object name - |
269 | * If the object doesn't have a name_pl, we just use the object name - |
271 | * this isn't perfect (things won't be properly pluralized), but works to |
270 | * this isn't perfect (things won't be properly pluralised), but works to |
272 | * that degree (5 heart is still quite understandable). But the case we |
271 | * that degree (5 heart is still quite understandable). But the case we |
273 | * also have to catch is if this object is not using the normal name for |
272 | * also have to catch is if this object is not using the normal name for |
274 | * the object. In that case, we also want to use the loaded name. |
273 | * the object. In that case, we also want to use the loaded name. |
275 | * Otherwise, what happens is that the the plural name will lose |
274 | * Otherwise, what happens is that the the plural name will lose |
276 | * information (appear as just 'hearts' and not 'goblins heart') |
275 | * information (appear as just 'hearts' and not 'goblins heart') |
277 | */ |
276 | */ |
278 | if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) |
277 | if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) |
279 | op->name_pl = NULL; |
278 | op->name_pl = 0; |
280 | |
279 | |
281 | if (!op->name_pl) |
280 | if (!op->name_pl) |
282 | op->name_pl = op->name; |
281 | op->name_pl = op->name; |
283 | |
282 | |
284 | /* objects now have a materialname. try to patch it in */ |
283 | /* objects now have a materialname. try to patch it in */ |
285 | if (!(IS_WEAPON (op) && op->level > 0)) |
284 | if (!(op->is_weapon () && op->level > 0)) |
286 | { |
285 | { |
287 | if (op->map != NULL) |
286 | if (op->map != NULL) |
288 | set_materialname (op, op->map->difficulty, NULL); |
287 | set_materialname (op, op->map->difficulty, NULL); |
289 | else |
288 | else |
290 | set_materialname (op, 5, NULL); |
289 | set_materialname (op, 5, NULL); |
291 | } |
290 | } |
|
|
291 | |
292 | /* only do these when program is first run - a bit |
292 | /* only do these when program is first run - a bit |
293 | * excessive to do this at every run - most of this is |
293 | * excessive to do this at every run - most of this is |
294 | * really just to catch any errors - program will still run, but |
294 | * really just to catch any errors - program will still run, but |
295 | * not in the ideal fashion. |
295 | * not in the ideal fashion. |
296 | */ |
296 | */ |
297 | if ((op->type == WEAPON || op->type == BOW) && arch_init) |
297 | if ((op->type == WEAPON || op->type == BOW) && arch_init) |
298 | { |
298 | { |
299 | if (!op->skill) |
299 | if (!op->skill) |
300 | { |
|
|
301 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
300 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
302 | } |
|
|
303 | else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || |
301 | else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || |
304 | (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) |
302 | (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) |
305 | { |
|
|
306 | LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); |
303 | LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); |
307 | } |
|
|
308 | } |
304 | } |
309 | |
305 | |
310 | /* We changed last_heal to gen_sp_armour, which is what it |
306 | /* We changed last_heal to gen_sp_armour, which is what it |
311 | * really does for many objects. Need to catch any in maps |
307 | * really does for many objects. Need to catch any in maps |
312 | * that may have an old value. |
308 | * that may have an old value. |
313 | */ |
309 | */ |
314 | if ((op->type == WEAPON) || |
310 | if (op->type == WEAPON |
315 | (op->type == ARMOUR) || (op->type == HELMET) || |
311 | || op->type == ARMOUR || op->type == HELMET |
316 | (op->type == SHIELD) || (op->type == RING) || |
312 | || op->type == SHIELD || op->type == RING |
317 | (op->type == BOOTS) || (op->type == GLOVES) || |
313 | || op->type == BOOTS || op->type == GLOVES |
318 | (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) |
314 | || op->type == AMULET || op->type == GIRDLE |
|
|
315 | || op->type == BRACERS || op->type == CLOAK) |
319 | { |
316 | { |
320 | if (op->last_heal) |
317 | if (op->last_heal) |
321 | { |
318 | { |
322 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
319 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
323 | op->gen_sp_armour = op->last_heal; |
320 | op->gen_sp_armour = op->last_heal; |
324 | op->last_heal = 0; |
321 | op->last_heal = 0; |
325 | } |
322 | } |
326 | if (editor) |
323 | |
327 | ip = 0; |
|
|
328 | else |
|
|
329 | ip = calc_item_power (op, 0); |
324 | int ip = calc_item_power (op, 0); |
|
|
325 | |
330 | /* Legacy objects from before item power was in the game */ |
326 | /* Legacy objects from before item power was in the game */ |
331 | if (!op->item_power && ip) |
327 | if (!op->item_power && ip) |
332 | { |
328 | { |
333 | if (ip > 3) |
329 | if (ip > 3) |
334 | { |
|
|
335 | LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); |
330 | LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); |
336 | } |
331 | |
337 | op->item_power = ip; |
332 | op->item_power = ip; |
338 | } |
333 | } |
|
|
334 | |
339 | /* Check for possibly bogus values. Has to meet both these criteria - |
335 | /* Check for possibly bogus values. Has to meet both these criteria - |
340 | * something that has item_power 1 is probably just fine if our calculated |
336 | * something that has item_power 1 is probably just fine if our calculated |
341 | * value is 1 or 2 - these values are small enough that hard to be precise. |
337 | * value is 1 or 2 - these values are small enough that hard to be precise. |
342 | * similarly, it item_power is 0, the first check will always pass, |
338 | * similarly, it item_power is 0, the first check will always pass, |
343 | * but not the second one. |
339 | * but not the second one. |
344 | */ |
340 | */ |
345 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
341 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
346 | { |
|
|
347 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); |
342 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); |
348 | } |
|
|
349 | |
|
|
350 | } |
343 | } |
|
|
344 | |
351 | /* Old spellcasting object - need to load in the appropiate object */ |
345 | /* Old spellcasting object - need to load in the appropiate object */ |
352 | if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || |
346 | if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || |
353 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
347 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
354 | ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) |
348 | ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) |
355 | { |
349 | { |
356 | object *tmp; |
|
|
357 | |
|
|
358 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
350 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
359 | * in that spell was stored in sp. |
351 | * in that spell was stored in sp. |
360 | */ |
352 | */ |
361 | tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); |
353 | object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); |
362 | insert_ob_in_ob (tmp, op); |
354 | insert_ob_in_ob (tmp, op); |
363 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
355 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
364 | } |
356 | } |
|
|
357 | |
365 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
358 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
366 | |
|
|
367 | if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) |
359 | if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) |
368 | { |
360 | { |
369 | object *tmp; |
|
|
370 | |
|
|
371 | tmp = get_archetype_by_object_name (op->slaying); |
361 | object *tmp = get_archetype_by_object_name (op->slaying); |
372 | insert_ob_in_ob (tmp, op); |
362 | insert_ob_in_ob (tmp, op); |
373 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
363 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
374 | /* without this, value is all screwed up */ |
364 | /* without this, value is all screwed up */ |
375 | op->value = op->arch->clone.value * op->inv->value; |
365 | op->value = op->arch->clone.value * op->inv->value; |
376 | } |
366 | } |
377 | |
367 | |
378 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
368 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
379 | { |
369 | { |
380 | if (op->stats.hp > op->stats.maxhp) |
370 | if (op->stats.hp > op->stats.maxhp) |
|
|
371 | { |
381 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); |
372 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); |
|
|
373 | op->stats.maxhp = op->stats.hp; |
|
|
374 | } |
382 | |
375 | |
383 | /* The archs just need to be updated for this */ |
376 | /* The archs just need to be updated for this */ |
384 | if (op->move_type == 0) |
377 | if (op->move_type == 0) |
385 | op->move_type = MOVE_WALK; |
378 | op->move_type = MOVE_WALK; |
386 | } |
379 | } |
… | |
… | |
409 | { |
402 | { |
410 | op->move_type = MOVE_ALL; |
403 | op->move_type = MOVE_ALL; |
411 | op->stats.maxhp = 0; |
404 | op->stats.maxhp = 0; |
412 | } |
405 | } |
413 | else |
406 | else |
414 | { |
|
|
415 | op->move_type = MOVE_WALK; |
407 | op->move_type = MOVE_WALK; |
416 | } |
|
|
417 | } |
408 | } |
418 | } |
409 | } |
419 | |
410 | |
420 | } |
411 | } |
421 | |
412 | |
… | |
… | |
482 | } |
473 | } |
483 | } |
474 | } |
484 | } |
475 | } |
485 | |
476 | |
486 | #define GET_FLAG(op,flag) \ |
477 | #define GET_FLAG(op,flag) \ |
487 | if (thawer.get_sint32 ()) \ |
478 | if (f.get_sint32 ()) \ |
488 | SET_FLAG (op, flag); \ |
479 | SET_FLAG (op, flag); \ |
489 | else \ |
480 | else \ |
490 | CLEAR_FLAG (op, flag) \ |
481 | CLEAR_FLAG (op, flag) \ |
491 | |
482 | |
492 | int |
483 | bool |
493 | parse_object (object *op, object_thawer & thawer, int map_flags) |
484 | object::parse_kv (object_thawer &f) |
494 | { |
485 | { |
495 | bool ismore = 0; |
486 | assert (f.kw == KW_object || f.kw == KW_arch); |
|
|
487 | |
|
|
488 | if (f.kw == KW_object) |
|
|
489 | f.get (name); // preset name from object name |
|
|
490 | |
|
|
491 | f.next (); |
|
|
492 | |
496 | object *op_inv = op->inv; |
493 | object *op_inv = inv; |
497 | |
494 | |
498 | for (;;) |
495 | for (;;) |
499 | { |
496 | { |
500 | keyword kw = thawer.get_kv (); |
|
|
501 | |
|
|
502 | switch (kw) |
497 | switch (f.kw) |
503 | { |
498 | { |
504 | case KW_Object: // uppercase alias |
|
|
505 | case KW_object: |
|
|
506 | thawer.get (op->name); |
|
|
507 | |
|
|
508 | if (op->arch != NULL) |
|
|
509 | op->arch->name = op->name; |
|
|
510 | |
|
|
511 | break; |
|
|
512 | |
|
|
513 | case KW_uuid: |
499 | case KW_uuid: |
514 | if (const char *s = thawer.get_str ()) |
500 | if (const char *s = f.get_str ()) |
515 | { |
501 | { |
516 | unsigned int version; |
502 | unsigned int version; |
517 | unsigned long long seq; |
503 | unsigned long long seq; |
518 | |
504 | |
519 | if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) |
505 | if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) |
520 | { |
506 | { |
521 | op->uuid.seq = seq; |
507 | uuid.seq = seq; |
522 | break; |
508 | break; |
523 | } |
509 | } |
524 | } |
510 | } |
525 | |
511 | |
526 | op->uuid = gen_uuid (); |
512 | uuid = gen_uuid (); |
527 | break; |
513 | break; |
528 | |
514 | |
529 | case KW_oid: |
515 | case KW_oid: |
530 | thawer.get (op, thawer.get_sint32 ()); |
516 | f.get (this, f.get_sint32 ()); |
531 | break; |
517 | break; |
532 | |
518 | |
533 | case KW_name: |
519 | case KW_name: f.get (name); break; |
534 | thawer.get (op->name); |
520 | case KW_name_pl: f.get (name_pl); break; |
535 | break; |
521 | case KW_title: f.get (title); break; |
536 | case KW_name_pl: |
522 | case KW_custom_name: f.get (custom_name); break; |
537 | thawer.get (op->name_pl); |
523 | |
538 | break; |
524 | case KW_attach: f.get_ornull (attach); break; |
539 | case KW_title: |
525 | case KW_skill: f.get_ornull (skill); break; |
540 | thawer.get (op->title); |
526 | case KW_race: f.get_ornull (race); break; |
541 | break; |
527 | case KW_slaying: f.get_ornull (slaying); break; |
542 | case KW_custom_name: |
|
|
543 | thawer.get (op->custom_name); |
|
|
544 | break; |
|
|
545 | case KW_attach: |
|
|
546 | thawer.get_ornull (op->attach); |
|
|
547 | break; |
|
|
548 | case KW_skill: |
|
|
549 | thawer.get_ornull (op->skill); |
|
|
550 | break; |
|
|
551 | case KW_race: |
|
|
552 | thawer.get_ornull (op->race); |
|
|
553 | break; |
|
|
554 | case KW_slaying: |
|
|
555 | thawer.get_ornull (op->slaying); |
|
|
556 | break; |
|
|
557 | |
528 | |
558 | case KW_arch: |
529 | case KW_arch: |
559 | { |
530 | { |
560 | const char *str = thawer.get_str (); |
531 | object *tmp = object::read (f); |
|
|
532 | tmp->deactivate (); |
561 | |
533 | |
562 | if (op->arch) |
|
|
563 | { |
534 | { |
564 | /* If op->arch has been set, then this new object |
|
|
565 | * must be part of the inventory. So process |
|
|
566 | * appropriately. |
|
|
567 | */ |
|
|
568 | archetype *arch = archetype::find (str); |
|
|
569 | |
|
|
570 | object *tmp; |
|
|
571 | |
|
|
572 | if (arch != NULL) |
|
|
573 | tmp = arch_to_object (arch); |
|
|
574 | else |
|
|
575 | { |
|
|
576 | tmp = get_object (); |
|
|
577 | /* record the name of the broken object */ |
|
|
578 | tmp->name = str; |
|
|
579 | } |
|
|
580 | |
|
|
581 | parse_object (tmp, thawer, map_flags); |
|
|
582 | |
|
|
583 | if (tmp->arch) |
|
|
584 | { |
|
|
585 | // was: insert_ob_in_ob (tmp, op); |
535 | // was: insert_ob_in_ob (tmp, op); |
586 | // but manually adding it can improve map loading times a lot |
536 | // but manually adding it can improve map loading times a lot |
587 | // also, appending instead of prepending keeps the |
537 | // also, appending instead of prepending keeps the |
588 | // save ordering the same between repeated load/saves. |
538 | // save ordering the same between repeated load/saves. |
589 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
539 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
590 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
540 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
591 | |
541 | |
592 | if (!op_inv) |
542 | if (!op_inv) |
593 | { |
543 | { |
594 | op->inv = tmp; |
|
|
595 | tmp->above = 0; |
|
|
596 | } |
|
|
597 | else |
|
|
598 | { |
|
|
599 | while (op_inv->below) |
|
|
600 | op_inv = op_inv->below; |
|
|
601 | |
|
|
602 | op_inv->below = tmp; |
|
|
603 | tmp->above = op_inv; |
|
|
604 | } |
|
|
605 | |
|
|
606 | tmp->below = 0; |
|
|
607 | tmp->env = op; |
|
|
608 | op_inv = tmp; |
544 | inv = tmp; |
|
|
545 | tmp->above = 0; |
609 | } |
546 | } |
610 | else |
547 | else |
611 | { |
548 | { |
612 | LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); |
549 | while (op_inv->below) |
613 | free_object (tmp); |
550 | op_inv = op_inv->below; |
|
|
551 | |
|
|
552 | op_inv->below = tmp; |
|
|
553 | tmp->above = op_inv; |
614 | } |
554 | } |
|
|
555 | |
|
|
556 | tmp->below = 0; |
|
|
557 | tmp->env = this; |
|
|
558 | op_inv = tmp; |
615 | } |
559 | } |
616 | else |
|
|
617 | { |
|
|
618 | /* This is the actual archetype definition then */ |
|
|
619 | op->arch = archetype::find (str); |
|
|
620 | |
|
|
621 | if (op->arch != NULL) |
|
|
622 | copy_object (&op->arch->clone, op); |
|
|
623 | else if (!arch_init) |
|
|
624 | /* record the name of the broken object */ |
|
|
625 | op->name = str; |
|
|
626 | } |
|
|
627 | } |
560 | } |
628 | break; |
561 | continue; |
629 | |
562 | |
630 | case KW_other_arch: |
563 | case KW_other_arch: |
631 | op->other_arch = archetype::find (thawer.get_str ()); |
564 | other_arch = archetype::find (f.get_str ()); |
632 | break; |
565 | break; |
633 | |
566 | |
634 | case KW_animation: |
567 | case KW_animation: |
635 | { |
568 | { |
|
|
569 | CLEAR_FLAG (this, FLAG_ANIMATE); |
|
|
570 | animation_id = 0; |
|
|
571 | |
636 | const char *str = thawer.get_str (); |
572 | const char *str = f.get_str (); |
637 | |
|
|
638 | if (!str) |
|
|
639 | { |
|
|
640 | op->animation_id = 0; |
|
|
641 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
642 | } |
|
|
643 | else |
|
|
644 | { |
|
|
645 | op->animation_id = find_animation (str); |
573 | if (str && (animation_id = find_animation (str))) |
646 | SET_FLAG (op, FLAG_ANIMATE); |
574 | SET_FLAG (this, FLAG_ANIMATE); |
647 | } |
|
|
648 | } |
575 | } |
649 | |
|
|
650 | break; |
576 | break; |
651 | |
577 | |
652 | case KW_last_heal: |
578 | case KW_last_heal: f.get (last_heal); break; |
653 | thawer.get (op->last_heal); |
579 | case KW_last_sp: f.get (last_sp); break; |
654 | break; |
580 | case KW_last_grace: f.get (last_grace); break; |
655 | case KW_last_sp: |
581 | case KW_last_eat: f.get (last_eat); break; |
656 | thawer.get (op->last_sp); |
582 | case KW_speed_left: f.get (speed_left); break; |
657 | break; |
|
|
658 | case KW_last_grace: |
|
|
659 | thawer.get (op->last_grace); |
|
|
660 | break; |
|
|
661 | case KW_last_eat: |
|
|
662 | thawer.get (op->last_eat); |
|
|
663 | break; |
|
|
664 | case KW_speed_left: |
|
|
665 | thawer.get (op->speed_left); |
|
|
666 | break; |
|
|
667 | |
583 | |
668 | case KW_speed: |
584 | case KW_speed: |
669 | thawer.get (op->speed); |
585 | f.get (speed); |
670 | |
586 | |
671 | //TODO: maybe do in check_object |
587 | //TODO: maybe do in check_object |
672 | if (!(map_flags & MAP_STYLE)) |
588 | // removed check for style maps |
673 | { |
|
|
674 | if (op->speed < 0) |
589 | if (speed < 0) |
675 | op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; |
590 | speed_left = speed_left - rndm (); |
676 | |
|
|
677 | update_ob_speed (op); |
|
|
678 | } |
|
|
679 | |
591 | |
680 | break; |
592 | break; |
681 | |
593 | |
682 | case KW_slow_move: |
594 | case KW_slow_move: |
683 | op->move_slow |= MOVE_WALK; |
595 | move_slow |= MOVE_WALK; |
684 | thawer.get (op->move_slow_penalty); |
596 | f.get (move_slow_penalty); |
685 | break; |
597 | break; |
686 | |
598 | |
687 | case KW_face: |
599 | case KW_face: |
688 | op->face = &new_faces[FindFace (thawer.get_str (), 0)]; |
600 | face = &new_faces[FindFace (f.get_str (), 0)]; |
689 | break; |
601 | break; |
690 | |
602 | |
691 | case KW_x: |
603 | case KW_x: f.get (x); break; |
692 | thawer.get (op->x); |
604 | case KW_y: f.get (y); break; |
693 | break; |
605 | |
694 | case KW_y: |
|
|
695 | thawer.get (op->y); |
|
|
696 | break; |
|
|
697 | case KW_Str: // uppercase alias |
606 | case KW_Str: // uppercase alias |
698 | case KW_str: |
607 | case KW_str: f.get (stats.Str); break; |
699 | thawer.get (op->stats.Str); |
|
|
700 | break; |
|
|
701 | case KW_Dex: // uppercase alias |
608 | case KW_Dex: // uppercase alias |
702 | case KW_dex: |
609 | case KW_dex: f.get (stats.Dex); break; |
703 | thawer.get (op->stats.Dex); |
|
|
704 | break; |
|
|
705 | case KW_Con: // uppercase alias |
610 | case KW_Con: // uppercase alias |
706 | case KW_con: |
611 | case KW_con: f.get (stats.Con); break; |
707 | thawer.get (op->stats.Con); |
|
|
708 | break; |
|
|
709 | case KW_Wis: // uppercase alias |
612 | case KW_Wis: // uppercase alias |
710 | case KW_wis: |
613 | case KW_wis: f.get (stats.Wis); break; |
711 | thawer.get (op->stats.Wis); |
|
|
712 | break; |
|
|
713 | case KW_Cha: // uppercase alias |
614 | case KW_Cha: // uppercase alias |
714 | case KW_cha: |
615 | case KW_cha: f.get (stats.Cha); break; |
715 | thawer.get (op->stats.Cha); |
|
|
716 | break; |
|
|
717 | case KW_Int: // uppercase alias |
616 | case KW_Int: // uppercase alias |
718 | case KW_int: |
617 | case KW_int: f.get (stats.Int); break; |
719 | thawer.get (op->stats.Int); |
|
|
720 | break; |
|
|
721 | case KW_Pow: // uppercase alias |
618 | case KW_Pow: // uppercase alias |
722 | case KW_pow: |
619 | case KW_pow: f.get (stats.Pow); break; |
723 | thawer.get (op->stats.Pow); |
|
|
724 | break; |
|
|
725 | case KW_hp: |
|
|
726 | thawer.get (op->stats.hp); |
|
|
727 | break; |
|
|
728 | case KW_maxhp: |
|
|
729 | thawer.get (op->stats.maxhp); |
|
|
730 | break; |
|
|
731 | case KW_sp: |
|
|
732 | thawer.get (op->stats.sp); |
|
|
733 | break; |
|
|
734 | case KW_maxsp: |
|
|
735 | thawer.get (op->stats.maxsp); |
|
|
736 | break; |
|
|
737 | case KW_grace: |
|
|
738 | thawer.get (op->stats.grace); |
|
|
739 | break; |
|
|
740 | case KW_maxgrace: |
|
|
741 | thawer.get (op->stats.maxgrace); |
|
|
742 | break; |
|
|
743 | |
620 | |
744 | case KW_exp: |
621 | case KW_hp: f.get (stats.hp); break; |
745 | thawer.get (op->stats.exp); |
622 | case KW_maxhp: f.get (stats.maxhp); break; |
746 | break; |
623 | case KW_sp: f.get (stats.sp); break; |
747 | case KW_perm_exp: |
624 | case KW_maxsp: f.get (stats.maxsp); break; |
748 | thawer.get (op->perm_exp); |
625 | case KW_grace: f.get (stats.grace); break; |
749 | break; |
626 | case KW_maxgrace: f.get (stats.maxgrace); break; |
750 | case KW_food: |
627 | |
751 | thawer.get (op->stats.food); |
628 | case KW_exp: f.get (stats.exp); break; |
752 | break; |
629 | case KW_perm_exp: f.get (perm_exp); break; |
753 | case KW_dam: |
630 | case KW_food: f.get (stats.food); break; |
754 | thawer.get (op->stats.dam); |
631 | case KW_dam: f.get (stats.dam); break; |
755 | break; |
632 | case KW_wc: f.get (stats.wc); break; |
756 | case KW_wc: |
633 | case KW_ac: f.get (stats.ac); break; |
757 | thawer.get (op->stats.wc); |
634 | case KW_nrof: f.get (nrof); break; |
758 | break; |
635 | case KW_level: f.get (level); break; |
759 | case KW_ac: |
636 | case KW_direction: f.get (direction); break; |
760 | thawer.get (op->stats.ac); |
637 | case KW_type: f.get (type); break; |
761 | break; |
638 | case KW_subtype: f.get (subtype); break; |
762 | case KW_nrof: |
639 | case KW_value: f.get (value); break; |
763 | thawer.get (op->nrof); |
640 | case KW_weight: f.get (weight); break; |
764 | break; |
641 | case KW_carrying: f.get (carrying); break; |
765 | case KW_level: |
642 | case KW_attacktype: f.get (attacktype); break; |
766 | thawer.get (op->level); |
643 | case KW_path_attuned: f.get (path_attuned); break; |
767 | break; |
644 | case KW_path_repelled: f.get (path_repelled); break; |
768 | case KW_direction: |
645 | case KW_path_denied: f.get (path_denied); break; |
769 | thawer.get (op->direction); |
646 | case KW_invisible: f.get (invisible); break; |
770 | break; |
647 | case KW_magic: f.get (magic); break; |
771 | case KW_type: |
648 | case KW_state: f.get (state); break; |
772 | thawer.get (op->type); |
649 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
773 | break; |
650 | case KW_material: f.get (materials); break; //TODO: nuke |
774 | case KW_subtype: |
651 | case KW_materialname: f.get (materialname); break; |
775 | thawer.get (op->subtype); |
|
|
776 | break; |
|
|
777 | case KW_value: |
|
|
778 | thawer.get (op->value); |
|
|
779 | break; |
|
|
780 | case KW_weight: |
|
|
781 | thawer.get (op->weight); |
|
|
782 | break; |
|
|
783 | case KW_carrying: |
|
|
784 | thawer.get (op->carrying); |
|
|
785 | break; |
|
|
786 | case KW_attacktype: |
|
|
787 | thawer.get (op->attacktype); |
|
|
788 | break; |
|
|
789 | case KW_path_attuned: |
|
|
790 | thawer.get (op->path_attuned); |
|
|
791 | break; |
|
|
792 | case KW_path_repelled: |
|
|
793 | thawer.get (op->path_repelled); |
|
|
794 | break; |
|
|
795 | case KW_path_denied: |
|
|
796 | thawer.get (op->path_denied); |
|
|
797 | break; |
|
|
798 | case KW_invisible: |
|
|
799 | thawer.get (op->invisible); |
|
|
800 | break; |
|
|
801 | case KW_magic: |
|
|
802 | thawer.get (op->magic); |
|
|
803 | break; |
|
|
804 | case KW_state: |
|
|
805 | thawer.get (op->state); |
|
|
806 | break; |
|
|
807 | case KW_move_slow_penalty: |
|
|
808 | thawer.get (op->move_slow_penalty); |
|
|
809 | break; |
|
|
810 | case KW_material: |
|
|
811 | thawer.get (op->material); |
|
|
812 | break; |
|
|
813 | case KW_materialname: |
|
|
814 | thawer.get (op->materialname); |
|
|
815 | break; |
|
|
816 | |
652 | |
817 | /* These are the new values */ |
653 | /* These are the new values */ |
818 | case KW_move_block: |
654 | case KW_move_block: set_move (move_block, f.get_str ()); break; |
819 | set_move (op->move_block, thawer.get_str ()); |
655 | case KW_move_allow: set_move (move_allow, f.get_str ()); break; |
820 | break; |
656 | case KW_move_type: set_move (move_type, f.get_str ()); break; |
821 | case KW_move_allow: |
657 | case KW_move_on: set_move (move_on, f.get_str ()); break; |
822 | set_move (op->move_allow, thawer.get_str ()); |
658 | case KW_move_off: set_move (move_off, f.get_str ()); break; |
823 | break; |
659 | case KW_move_slow: set_move (move_slow, f.get_str ()); break; |
824 | case KW_move_type: |
|
|
825 | set_move (op->move_type, thawer.get_str ()); |
|
|
826 | break; |
|
|
827 | case KW_move_on: |
|
|
828 | set_move (op->move_on, thawer.get_str ()); |
|
|
829 | break; |
|
|
830 | case KW_move_off: |
|
|
831 | set_move (op->move_off, thawer.get_str ()); |
|
|
832 | break; |
|
|
833 | case KW_move_slow: |
|
|
834 | set_move (op->move_slow, thawer.get_str ()); |
|
|
835 | break; |
|
|
836 | |
660 | |
837 | /* These are all legacy - any new objects should use the move_ .. values */ |
661 | /* These are all legacy - any new objects should use the move_ .. values */ |
838 | case KW_no_pass: |
662 | case KW_no_pass: |
839 | { |
663 | { |
840 | if (thawer.get_sint32 ()) |
664 | if (f.get_sint32 ()) |
841 | op->move_block = MOVE_ALL; |
665 | move_block = MOVE_ALL; |
842 | else |
666 | else |
843 | op->move_block = 0; |
667 | move_block = 0; |
844 | } |
668 | } |
845 | |
669 | |
846 | break; |
670 | break; |
847 | |
671 | |
848 | /* These are all legacy - any new objects should use the move_ .. values */ |
672 | /* These are all legacy - any new objects should use the move_ .. values */ |
849 | case KW_walk_on: |
673 | case KW_walk_on: |
850 | { |
674 | { |
851 | if (thawer.get_sint32 ()) |
675 | if (f.get_sint32 ()) |
852 | op->move_on |= MOVE_WALK; |
676 | move_on |= MOVE_WALK; |
853 | else |
677 | else |
854 | op->move_on &= ~MOVE_WALK; |
678 | move_on &= ~MOVE_WALK; |
855 | } |
679 | } |
856 | |
680 | |
857 | break; |
681 | break; |
858 | |
682 | |
859 | /* These are all legacy - any new objects should use the move_ .. values */ |
683 | /* These are all legacy - any new objects should use the move_ .. values */ |
860 | case KW_walk_off: |
684 | case KW_walk_off: |
861 | { |
685 | { |
862 | if (thawer.get_sint32 ()) |
686 | if (f.get_sint32 ()) |
863 | op->move_off |= MOVE_WALK; |
687 | move_off |= MOVE_WALK; |
864 | else |
688 | else |
865 | op->move_off &= ~MOVE_WALK; |
689 | move_off &= ~MOVE_WALK; |
866 | } |
690 | } |
867 | break; |
691 | break; |
868 | |
692 | |
869 | /* These are all legacy - any new objects should use the move_ .. values */ |
693 | /* These are all legacy - any new objects should use the move_ .. values */ |
870 | case KW_fly_on: |
694 | case KW_fly_on: |
871 | { |
695 | { |
872 | if (thawer.get_sint32 ()) |
696 | if (f.get_sint32 ()) |
873 | op->move_on |= MOVE_FLY_LOW; |
697 | move_on |= MOVE_FLY_LOW; |
874 | else |
698 | else |
875 | op->move_on &= ~MOVE_FLY_LOW; |
699 | move_on &= ~MOVE_FLY_LOW; |
876 | } |
700 | } |
877 | break; |
701 | break; |
878 | |
702 | |
879 | /* These are all legacy - any new objects should use the move_ .. values */ |
703 | /* These are all legacy - any new objects should use the move_ .. values */ |
880 | case KW_fly_off: |
704 | case KW_fly_off: |
881 | { |
705 | { |
882 | if (thawer.get_sint32 ()) |
706 | if (f.get_sint32 ()) |
883 | op->move_off |= MOVE_FLY_LOW; |
707 | move_off |= MOVE_FLY_LOW; |
884 | else |
708 | else |
885 | op->move_off &= ~MOVE_FLY_LOW; |
709 | move_off &= ~MOVE_FLY_LOW; |
886 | } |
710 | } |
887 | break; |
711 | break; |
888 | |
712 | |
889 | //TODO: remove these after converting archetypes |
713 | //TODO: remove these after converting archetypes |
890 | case KW_can_use_wand: |
714 | case KW_can_use_wand: |
891 | GET_FLAG (op, FLAG_USE_RANGE); |
715 | GET_FLAG (this, FLAG_USE_RANGE); |
892 | break; |
716 | break; |
893 | |
717 | |
894 | /* These are all legacy - any new objects should use the move_ .. values */ |
718 | /* These are all legacy - any new objects should use the move_ .. values */ |
895 | case KW_flying: |
719 | case KW_flying: |
896 | { |
720 | { |
897 | if (thawer.get_sint32 ()) |
721 | if (f.get_sint32 ()) |
898 | op->move_type |= MOVE_FLY_LOW; |
722 | move_type |= MOVE_FLY_LOW; |
899 | else |
723 | else |
900 | op->move_type &= ~MOVE_FLY_LOW; |
724 | move_type &= ~MOVE_FLY_LOW; |
901 | } |
725 | } |
902 | break; |
726 | break; |
903 | |
727 | |
904 | |
728 | |
905 | case KW_identified: |
729 | case KW_identified: |
906 | GET_FLAG (op, FLAG_IDENTIFIED); |
730 | GET_FLAG (this, FLAG_IDENTIFIED); |
907 | //TODO: move to check_object or so |
731 | //TODO: move to check_object or so |
908 | if (QUERY_FLAG (op, FLAG_IDENTIFIED)) |
732 | if (QUERY_FLAG (this, FLAG_IDENTIFIED)) |
909 | CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); |
733 | CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); |
910 | |
734 | |
911 | break; |
735 | break; |
912 | |
736 | |
913 | case KW_wiz: |
737 | case KW_wiz: |
914 | GET_FLAG (op, FLAG_WIZ); |
738 | GET_FLAG (this, FLAG_WIZ); |
915 | //TODO: move to check_object |
739 | //TODO: move to check_object |
916 | if (QUERY_FLAG (op, FLAG_WIZ)) |
740 | if (QUERY_FLAG (this, FLAG_WIZ)) |
917 | { |
741 | { |
918 | SET_FLAG (op, FLAG_WAS_WIZ); |
742 | SET_FLAG (this, FLAG_WAS_WIZ); |
919 | SET_FLAG (op, FLAG_WIZPASS); |
743 | SET_FLAG (this, FLAG_WIZPASS); |
920 | SET_FLAG (op, FLAG_WIZCAST); |
744 | SET_FLAG (this, FLAG_WIZCAST); |
921 | } |
745 | } |
922 | else |
746 | else |
923 | { |
747 | { |
924 | CLEAR_FLAG (op, FLAG_WIZPASS); |
748 | CLEAR_FLAG (this, FLAG_WIZPASS); |
925 | CLEAR_FLAG (op, FLAG_WIZCAST); |
749 | CLEAR_FLAG (this, FLAG_WIZCAST); |
926 | } |
750 | } |
927 | break; |
751 | break; |
928 | |
752 | |
929 | case KW_friendly: |
753 | case KW_friendly: |
930 | GET_FLAG (op, FLAG_FRIENDLY); |
754 | if (f.get_sint32 ()) |
931 | //TODO: move to check_object or so |
755 | if (type != PLAYER) |
932 | if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY)) |
|
|
933 | add_friendly_object (op); |
756 | add_friendly_object (this); |
934 | break; |
|
|
935 | |
757 | |
936 | case KW_monster: |
|
|
937 | GET_FLAG (op, FLAG_MONSTER); |
|
|
938 | break; |
758 | break; |
939 | case KW_neutral: |
|
|
940 | GET_FLAG (op, FLAG_NEUTRAL); |
|
|
941 | break; |
|
|
942 | case KW_no_attack: |
|
|
943 | GET_FLAG (op, FLAG_NO_ATTACK); |
|
|
944 | break; |
|
|
945 | case KW_no_damage: |
|
|
946 | GET_FLAG (op, FLAG_NO_DAMAGE); |
|
|
947 | break; |
|
|
948 | case KW_generator: |
|
|
949 | GET_FLAG (op, FLAG_GENERATOR); |
|
|
950 | break; |
|
|
951 | case KW_use_content_on_gen: |
|
|
952 | GET_FLAG (op, FLAG_CONTENT_ON_GEN); |
|
|
953 | break; |
|
|
954 | case KW_is_thrown: |
|
|
955 | GET_FLAG (op, FLAG_IS_THROWN); |
|
|
956 | break; |
|
|
957 | case KW_auto_apply: |
|
|
958 | GET_FLAG (op, FLAG_AUTO_APPLY); |
|
|
959 | break; |
|
|
960 | case KW_treasure: |
|
|
961 | GET_FLAG (op, FLAG_TREASURE); |
|
|
962 | break; |
|
|
963 | case KW_see_invisible: |
|
|
964 | GET_FLAG (op, FLAG_SEE_INVISIBLE); |
|
|
965 | break; |
|
|
966 | case KW_can_roll: |
|
|
967 | GET_FLAG (op, FLAG_CAN_ROLL); |
|
|
968 | break; |
|
|
969 | case KW_overlay_floor: |
|
|
970 | GET_FLAG (op, FLAG_OVERLAY_FLOOR); |
|
|
971 | break; |
|
|
972 | case KW_is_turnable: |
|
|
973 | GET_FLAG (op, FLAG_IS_TURNABLE); |
|
|
974 | break; |
|
|
975 | case KW_is_used_up: |
|
|
976 | GET_FLAG (op, FLAG_IS_USED_UP); |
|
|
977 | break; |
|
|
978 | case KW_alive: |
|
|
979 | GET_FLAG (op, FLAG_ALIVE); |
|
|
980 | break; |
|
|
981 | case KW_applied: |
|
|
982 | GET_FLAG (op, FLAG_APPLIED); |
|
|
983 | break; |
|
|
984 | case KW_unpaid: |
|
|
985 | GET_FLAG (op, FLAG_UNPAID); |
|
|
986 | break; |
|
|
987 | case KW_is_animated: |
|
|
988 | GET_FLAG (op, FLAG_ANIMATE); |
|
|
989 | break; |
|
|
990 | case KW_no_pick: |
|
|
991 | GET_FLAG (op, FLAG_NO_PICK); |
|
|
992 | break; |
|
|
993 | case KW_reflecting: |
|
|
994 | GET_FLAG (op, FLAG_REFLECTING); |
|
|
995 | break; |
|
|
996 | case KW_changing: |
|
|
997 | GET_FLAG (op, FLAG_CHANGING); |
|
|
998 | break; |
|
|
999 | case KW_splitting: |
|
|
1000 | GET_FLAG (op, FLAG_SPLITTING); |
|
|
1001 | break; |
|
|
1002 | case KW_hitback: |
|
|
1003 | GET_FLAG (op, FLAG_HITBACK); |
|
|
1004 | break; |
|
|
1005 | case KW_startequip: |
|
|
1006 | GET_FLAG (op, FLAG_STARTEQUIP); |
|
|
1007 | break; |
|
|
1008 | case KW_blocksview: |
|
|
1009 | GET_FLAG (op, FLAG_BLOCKSVIEW); |
|
|
1010 | break; |
|
|
1011 | case KW_undead: |
|
|
1012 | GET_FLAG (op, FLAG_UNDEAD); |
|
|
1013 | break; |
|
|
1014 | case KW_scared: |
|
|
1015 | GET_FLAG (op, FLAG_SCARED); |
|
|
1016 | break; |
|
|
1017 | case KW_unaggressive: |
|
|
1018 | GET_FLAG (op, FLAG_UNAGGRESSIVE); |
|
|
1019 | break; |
|
|
1020 | case KW_reflect_missile: |
|
|
1021 | GET_FLAG (op, FLAG_REFL_MISSILE); |
|
|
1022 | break; |
|
|
1023 | case KW_reflect_spell: |
|
|
1024 | GET_FLAG (op, FLAG_REFL_SPELL); |
|
|
1025 | break; |
|
|
1026 | case KW_no_magic: |
|
|
1027 | GET_FLAG (op, FLAG_NO_MAGIC); |
|
|
1028 | break; |
|
|
1029 | case KW_no_drop: |
|
|
1030 | GET_FLAG (op, FLAG_NO_DROP); |
|
|
1031 | break; |
|
|
1032 | case KW_random_movement: |
|
|
1033 | GET_FLAG (op, FLAG_RANDOM_MOVE); |
|
|
1034 | break; |
|
|
1035 | case KW_was_wiz: |
|
|
1036 | GET_FLAG (op, FLAG_WAS_WIZ); |
|
|
1037 | break; |
|
|
1038 | case KW_no_fix_player: |
|
|
1039 | GET_FLAG (op, FLAG_NO_FIX_PLAYER); |
|
|
1040 | break; |
|
|
1041 | case KW_is_lightable: |
|
|
1042 | GET_FLAG (op, FLAG_IS_LIGHTABLE); |
|
|
1043 | break; |
|
|
1044 | case KW_tear_down: |
|
|
1045 | GET_FLAG (op, FLAG_TEAR_DOWN); |
|
|
1046 | break; |
|
|
1047 | case KW_can_use_shield: |
|
|
1048 | GET_FLAG (op, FLAG_USE_SHIELD); |
|
|
1049 | break; |
|
|
1050 | case KW_can_cast_spell: |
|
|
1051 | GET_FLAG (op, FLAG_CAST_SPELL); |
|
|
1052 | break; |
|
|
1053 | case KW_can_use_scroll: |
|
|
1054 | GET_FLAG (op, FLAG_USE_SCROLL); |
|
|
1055 | break; |
|
|
1056 | case KW_can_use_range: |
|
|
1057 | GET_FLAG (op, FLAG_USE_RANGE); |
|
|
1058 | break; |
|
|
1059 | case KW_can_use_bow: |
|
|
1060 | GET_FLAG (op, FLAG_USE_BOW); |
|
|
1061 | break; |
|
|
1062 | case KW_can_use_armour: |
|
|
1063 | GET_FLAG (op, FLAG_USE_ARMOUR); |
|
|
1064 | break; |
|
|
1065 | case KW_can_use_weapon: |
|
|
1066 | GET_FLAG (op, FLAG_USE_WEAPON); |
|
|
1067 | break; |
|
|
1068 | case KW_can_use_ring: |
|
|
1069 | GET_FLAG (op, FLAG_USE_RING); |
|
|
1070 | break; |
|
|
1071 | case KW_has_ready_bow: |
|
|
1072 | GET_FLAG (op, FLAG_READY_BOW); |
|
|
1073 | break; |
|
|
1074 | case KW_xrays: |
|
|
1075 | GET_FLAG (op, FLAG_XRAYS); |
|
|
1076 | break; |
|
|
1077 | case KW_is_floor: |
|
|
1078 | GET_FLAG (op, FLAG_IS_FLOOR); |
|
|
1079 | break; |
|
|
1080 | case KW_lifesave: |
|
|
1081 | GET_FLAG (op, FLAG_LIFESAVE); |
|
|
1082 | break; |
|
|
1083 | case KW_no_strength: |
|
|
1084 | GET_FLAG (op, FLAG_NO_STRENGTH); |
|
|
1085 | break; |
|
|
1086 | case KW_sleep: |
|
|
1087 | GET_FLAG (op, FLAG_SLEEP); |
|
|
1088 | break; |
|
|
1089 | case KW_stand_still: |
|
|
1090 | GET_FLAG (op, FLAG_STAND_STILL); |
|
|
1091 | break; |
|
|
1092 | case KW_random_move: |
|
|
1093 | GET_FLAG (op, FLAG_RANDOM_MOVE); |
|
|
1094 | break; |
|
|
1095 | case KW_only_attack: |
|
|
1096 | GET_FLAG (op, FLAG_ONLY_ATTACK); |
|
|
1097 | break; |
|
|
1098 | case KW_activate_on_push: |
|
|
1099 | GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); |
|
|
1100 | break; |
|
|
1101 | case KW_activate_on_release: |
|
|
1102 | GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); |
|
|
1103 | break; |
|
|
1104 | case KW_confused: |
|
|
1105 | GET_FLAG (op, FLAG_CONFUSED); |
|
|
1106 | break; |
|
|
1107 | case KW_stealth: |
|
|
1108 | GET_FLAG (op, FLAG_STEALTH); |
|
|
1109 | break; |
|
|
1110 | case KW_cursed: |
|
|
1111 | GET_FLAG (op, FLAG_CURSED); |
|
|
1112 | break; |
|
|
1113 | case KW_damned: |
|
|
1114 | GET_FLAG (op, FLAG_DAMNED); |
|
|
1115 | break; |
|
|
1116 | case KW_see_anywhere: |
|
|
1117 | GET_FLAG (op, FLAG_SEE_ANYWHERE); |
|
|
1118 | break; |
|
|
1119 | case KW_known_magical: |
|
|
1120 | GET_FLAG (op, FLAG_KNOWN_MAGICAL); |
|
|
1121 | break; |
|
|
1122 | case KW_known_cursed: |
|
|
1123 | GET_FLAG (op, FLAG_KNOWN_CURSED); |
|
|
1124 | break; |
|
|
1125 | case KW_can_use_skill: |
|
|
1126 | GET_FLAG (op, FLAG_CAN_USE_SKILL); |
|
|
1127 | break; |
|
|
1128 | case KW_been_applied: |
|
|
1129 | GET_FLAG (op, FLAG_BEEN_APPLIED); |
|
|
1130 | break; |
|
|
1131 | case KW_has_ready_scroll: |
|
|
1132 | GET_FLAG (op, FLAG_READY_SCROLL); |
|
|
1133 | break; |
|
|
1134 | case KW_can_use_rod: |
|
|
1135 | GET_FLAG (op, FLAG_USE_ROD); |
|
|
1136 | break; |
|
|
1137 | case KW_can_use_horn: |
|
|
1138 | GET_FLAG (op, FLAG_USE_HORN); |
|
|
1139 | break; |
|
|
1140 | case KW_unique: |
|
|
1141 | GET_FLAG (op, FLAG_UNIQUE); |
|
|
1142 | break; |
|
|
1143 | case KW_make_invisible: |
|
|
1144 | GET_FLAG (op, FLAG_MAKE_INVIS); |
|
|
1145 | break; |
|
|
1146 | case KW_inv_locked: |
|
|
1147 | GET_FLAG (op, FLAG_INV_LOCKED); |
|
|
1148 | break; |
|
|
1149 | case KW_is_wooded: |
|
|
1150 | GET_FLAG (op, FLAG_IS_WOODED); |
|
|
1151 | break; |
|
|
1152 | case KW_is_hilly: |
|
|
1153 | GET_FLAG (op, FLAG_IS_HILLY); |
|
|
1154 | break; |
|
|
1155 | case KW_is_water: |
|
|
1156 | GET_FLAG (op, FLAG_IS_WATER); |
|
|
1157 | break; |
|
|
1158 | case KW_has_ready_skill: |
|
|
1159 | GET_FLAG (op, FLAG_READY_SKILL); |
|
|
1160 | break; |
|
|
1161 | case KW_has_ready_weapon: |
|
|
1162 | GET_FLAG (op, FLAG_READY_WEAPON); |
|
|
1163 | break; |
|
|
1164 | case KW_no_skill_ident: |
|
|
1165 | GET_FLAG (op, FLAG_NO_SKILL_IDENT); |
|
|
1166 | break; |
|
|
1167 | case KW_is_blind: |
|
|
1168 | GET_FLAG (op, FLAG_BLIND); |
|
|
1169 | break; |
|
|
1170 | case KW_can_see_in_dark: |
|
|
1171 | GET_FLAG (op, FLAG_SEE_IN_DARK); |
|
|
1172 | break; |
|
|
1173 | case KW_is_cauldron: |
|
|
1174 | GET_FLAG (op, FLAG_IS_CAULDRON); |
|
|
1175 | break; |
|
|
1176 | case KW_no_steal: |
|
|
1177 | GET_FLAG (op, FLAG_NO_STEAL); |
|
|
1178 | break; |
|
|
1179 | case KW_one_hit: |
|
|
1180 | GET_FLAG (op, FLAG_ONE_HIT); |
|
|
1181 | break; |
|
|
1182 | case KW_berserk: |
|
|
1183 | GET_FLAG (op, FLAG_BERSERK); |
|
|
1184 | break; |
|
|
1185 | case KW_is_buildable: |
|
|
1186 | GET_FLAG (op, FLAG_IS_BUILDABLE); |
|
|
1187 | break; |
|
|
1188 | |
759 | |
1189 | case KW_armour: |
760 | case KW_monster: GET_FLAG (this, FLAG_MONSTER); break; |
1190 | thawer.get (op->resist[ATNR_PHYSICAL]); |
761 | case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break; |
1191 | break; |
762 | case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break; |
1192 | case KW_resist_physical: |
763 | case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break; |
1193 | thawer.get (op->resist[ATNR_PHYSICAL]); |
764 | case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break; |
1194 | break; |
765 | case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break; |
1195 | case KW_resist_magic: |
766 | case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break; |
1196 | thawer.get (op->resist[ATNR_MAGIC]); |
767 | case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break; |
1197 | break; |
768 | case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break; |
1198 | case KW_resist_fire: |
769 | case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break; |
1199 | thawer.get (op->resist[ATNR_FIRE]); |
770 | case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break; |
1200 | break; |
771 | case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break; |
1201 | case KW_resist_electricity: |
772 | case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; |
1202 | thawer.get (op->resist[ATNR_ELECTRICITY]); |
773 | case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; |
1203 | break; |
774 | case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; |
1204 | case KW_resist_cold: |
775 | case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; |
1205 | thawer.get (op->resist[ATNR_COLD]); |
776 | case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; |
1206 | break; |
777 | case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; |
1207 | case KW_resist_confusion: |
778 | case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; |
1208 | thawer.get (op->resist[ATNR_CONFUSION]); |
779 | case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; |
1209 | break; |
780 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
1210 | case KW_resist_acid: |
781 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
1211 | thawer.get (op->resist[ATNR_ACID]); |
782 | case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; |
1212 | break; |
783 | case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; |
1213 | case KW_resist_drain: |
784 | case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; |
1214 | thawer.get (op->resist[ATNR_DRAIN]); |
785 | case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; |
1215 | break; |
786 | case KW_scared: GET_FLAG (this, FLAG_SCARED); break; |
1216 | case KW_resist_weaponmagic: |
787 | case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; |
1217 | thawer.get (op->resist[ATNR_WEAPONMAGIC]); |
788 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
1218 | break; |
789 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
1219 | case KW_resist_ghosthit: |
790 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
1220 | thawer.get (op->resist[ATNR_GHOSTHIT]); |
791 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
1221 | break; |
792 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
1222 | case KW_resist_poison: |
793 | case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break; |
1223 | thawer.get (op->resist[ATNR_POISON]); |
794 | case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; |
1224 | break; |
795 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
1225 | case KW_resist_slow: |
796 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
1226 | thawer.get (op->resist[ATNR_SLOW]); |
797 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
1227 | break; |
798 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
1228 | case KW_resist_paralyze: |
799 | case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; |
1229 | thawer.get (op->resist[ATNR_PARALYZE]); |
800 | case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break; |
1230 | break; |
801 | case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break; |
1231 | case KW_resist_turn_undead: |
802 | case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break; |
1232 | thawer.get (op->resist[ATNR_TURN_UNDEAD]); |
803 | case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break; |
1233 | break; |
804 | case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break; |
1234 | case KW_resist_fear: |
805 | case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break; |
1235 | thawer.get (op->resist[ATNR_FEAR]); |
806 | case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break; |
1236 | break; |
807 | case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break; |
1237 | case KW_resist_cancellation: |
808 | case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break; |
1238 | thawer.get (op->resist[ATNR_CANCELLATION]); |
809 | case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break; |
1239 | break; |
810 | case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break; |
1240 | case KW_resist_deplete: |
811 | case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break; |
1241 | thawer.get (op->resist[ATNR_DEPLETE]); |
812 | case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break; |
1242 | break; |
813 | case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
1243 | case KW_resist_death: |
814 | case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break; |
1244 | thawer.get (op->resist[ATNR_DEATH]); |
815 | case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break; |
1245 | break; |
816 | case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break; |
1246 | case KW_resist_chaos: |
817 | case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break; |
1247 | thawer.get (op->resist[ATNR_CHAOS]); |
818 | case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break; |
1248 | break; |
819 | case KW_cursed: GET_FLAG (this, FLAG_CURSED); break; |
1249 | case KW_resist_counterspell: |
820 | case KW_damned: GET_FLAG (this, FLAG_DAMNED); break; |
1250 | thawer.get (op->resist[ATNR_COUNTERSPELL]); |
821 | case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break; |
1251 | break; |
822 | case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break; |
1252 | case KW_resist_godpower: |
823 | case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break; |
1253 | thawer.get (op->resist[ATNR_GODPOWER]); |
824 | case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break; |
1254 | break; |
825 | case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break; |
1255 | case KW_resist_holyword: |
826 | case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break; |
1256 | thawer.get (op->resist[ATNR_HOLYWORD]); |
827 | case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break; |
1257 | break; |
828 | case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break; |
1258 | case KW_resist_blind: |
829 | case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break; |
1259 | thawer.get (op->resist[ATNR_BLIND]); |
830 | case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break; |
1260 | break; |
831 | case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break; |
1261 | case KW_resist_internal: |
832 | case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break; |
1262 | thawer.get (op->resist[ATNR_INTERNAL]); |
833 | case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break; |
1263 | break; |
834 | case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break; |
1264 | case KW_resist_life_stealing: |
835 | case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break; |
1265 | thawer.get (op->resist[ATNR_LIFE_STEALING]); |
836 | case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break; |
1266 | break; |
837 | case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break; |
1267 | case KW_resist_disease: |
838 | case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break; |
1268 | thawer.get (op->resist[ATNR_DISEASE]); |
839 | case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break; |
1269 | break; |
840 | case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break; |
|
|
841 | case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break; |
|
|
842 | case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break; |
|
|
843 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
|
|
844 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
|
|
845 | case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; |
1270 | |
846 | |
1271 | case KW_luck: |
847 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
1272 | thawer.get (op->stats.luck); |
848 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
1273 | break; |
849 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
1274 | case KW_run_away: |
850 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
1275 | thawer.get (op->run_away); |
851 | case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break; |
1276 | break; |
852 | case KW_resist_cold: f.get (resist[ATNR_COLD]); break; |
1277 | case KW_pick_up: |
853 | case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break; |
1278 | thawer.get (op->pick_up); |
854 | case KW_resist_acid: f.get (resist[ATNR_ACID]); break; |
1279 | break; |
855 | case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break; |
1280 | case KW_item_power: |
856 | case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break; |
1281 | thawer.get (op->item_power); |
857 | case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break; |
1282 | break; |
858 | case KW_resist_poison: f.get (resist[ATNR_POISON]); break; |
1283 | case KW_gen_sp_armour: |
859 | case KW_resist_slow: f.get (resist[ATNR_SLOW]); break; |
1284 | thawer.get (op->gen_sp_armour); |
860 | case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break; |
1285 | break; |
861 | case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break; |
1286 | case KW_anim_speed: |
862 | case KW_resist_fear: f.get (resist[ATNR_FEAR]); break; |
1287 | thawer.get (op->anim_speed); |
863 | case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break; |
1288 | break; |
864 | case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break; |
1289 | case KW_container: |
865 | case KW_resist_death: f.get (resist[ATNR_DEATH]); break; |
1290 | thawer.get (op->weight_limit); |
866 | case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break; |
1291 | break; |
867 | case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break; |
1292 | case KW_will_apply: |
868 | case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break; |
1293 | thawer.get (op->will_apply); |
869 | case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break; |
1294 | break; |
870 | case KW_resist_blind: f.get (resist[ATNR_BLIND]); break; |
1295 | case KW_attack_movement: |
871 | case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break; |
1296 | thawer.get (op->attack_movement); |
872 | case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break; |
1297 | break; |
873 | case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break; |
1298 | case KW_move_state: |
874 | |
1299 | thawer.get (op->move_status); |
875 | case KW_luck: f.get (stats.luck); break; |
1300 | break; |
876 | case KW_run_away: f.get (run_away); break; |
1301 | case KW_expmul: |
877 | case KW_pick_up: f.get (pick_up); break; |
1302 | thawer.get (op->expmul); |
878 | case KW_item_power: f.get (item_power); break; |
1303 | break; |
879 | case KW_gen_sp_armour: f.get (gen_sp_armour); break; |
1304 | case KW_glow_radius: |
880 | case KW_anim_speed: f.get (anim_speed); break; |
1305 | thawer.get (op->glow_radius); |
881 | case KW_container: f.get (weight_limit); break; |
1306 | break; |
882 | case KW_will_apply: f.get (will_apply); break; |
1307 | case KW_weapontype: |
883 | case KW_attack_movement: f.get (attack_movement); break; |
1308 | thawer.get (op->weapontype); |
884 | case KW_move_state: f.get (move_status); break; |
1309 | break; |
885 | case KW_expmul: f.get (expmul); break; |
1310 | case KW_tooltype: |
886 | case KW_glow_radius: f.get (glow_radius); break; |
1311 | thawer.get (op->tooltype); |
887 | case KW_weapontype: f.get (weapontype); break; |
1312 | break; |
888 | case KW_tooltype: f.get (tooltype); break; |
1313 | case KW_casting_time: |
889 | case KW_casting_time: f.get (casting_time); break; |
1314 | thawer.get (op->casting_time); |
890 | case KW_elevation: f.get (elevation); break; |
1315 | break; |
891 | case KW_smoothlevel: f.get (smoothlevel); break; |
1316 | case KW_elevation: |
892 | case KW_client_type: f.get (client_type); break; |
1317 | thawer.get (op->elevation); |
893 | case KW_duration: f.get (duration); break; |
1318 | break; |
894 | case KW_range: f.get (range); break; |
1319 | case KW_smoothlevel: |
895 | case KW_range_modifier: f.get (range_modifier); break; |
1320 | thawer.get (op->smoothlevel); |
896 | case KW_dam_modifier: f.get (dam_modifier); break; |
1321 | break; |
897 | case KW_duration_modifier: f.get (duration_modifier); break; |
1322 | case KW_client_type: |
|
|
1323 | thawer.get (op->client_type); |
|
|
1324 | break; |
|
|
1325 | case KW_duration: |
|
|
1326 | thawer.get (op->duration); |
|
|
1327 | break; |
|
|
1328 | case KW_range: |
|
|
1329 | thawer.get (op->range); |
|
|
1330 | break; |
|
|
1331 | case KW_range_modifier: |
|
|
1332 | thawer.get (op->range_modifier); |
|
|
1333 | break; |
|
|
1334 | case KW_dam_modifier: |
|
|
1335 | thawer.get (op->dam_modifier); |
|
|
1336 | break; |
|
|
1337 | case KW_duration_modifier: |
|
|
1338 | thawer.get (op->duration_modifier); |
|
|
1339 | break; |
|
|
1340 | |
898 | |
1341 | //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess |
899 | //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess |
1342 | //TODO: parse from other include files |
900 | //TODO: parse from other include files |
1343 | case KW_body_range: |
901 | case KW_body_range: f.get (body_info[0]); break; |
1344 | thawer.get (op->body_info[0]); |
902 | case KW_body_arm: f.get (body_info[1]); break; |
1345 | break; |
903 | case KW_body_torso: f.get (body_info[2]); break; |
1346 | case KW_body_arm: |
904 | case KW_body_head: f.get (body_info[3]); break; |
1347 | thawer.get (op->body_info[1]); |
905 | case KW_body_neck: f.get (body_info[4]); break; |
1348 | break; |
906 | case KW_body_skill: f.get (body_info[5]); break; |
1349 | case KW_body_torso: |
907 | case KW_body_finger: f.get (body_info[6]); break; |
1350 | thawer.get (op->body_info[2]); |
908 | case KW_body_shoulder: f.get (body_info[7]); break; |
1351 | break; |
909 | case KW_body_foot: f.get (body_info[8]); break; |
1352 | case KW_body_head: |
910 | case KW_body_hand: f.get (body_info[9]); break; |
1353 | thawer.get (op->body_info[3]); |
911 | case KW_body_wrist: f.get (body_info[10]); break; |
1354 | break; |
912 | case KW_body_waist: f.get (body_info[11]); break; |
1355 | case KW_body_neck: |
|
|
1356 | thawer.get (op->body_info[4]); |
|
|
1357 | break; |
|
|
1358 | case KW_body_skill: |
|
|
1359 | thawer.get (op->body_info[5]); |
|
|
1360 | break; |
|
|
1361 | case KW_body_finger: |
|
|
1362 | thawer.get (op->body_info[6]); |
|
|
1363 | break; |
|
|
1364 | case KW_body_shoulder: |
|
|
1365 | thawer.get (op->body_info[7]); |
|
|
1366 | break; |
|
|
1367 | case KW_body_foot: |
|
|
1368 | thawer.get (op->body_info[8]); |
|
|
1369 | break; |
|
|
1370 | case KW_body_hand: |
|
|
1371 | thawer.get (op->body_info[9]); |
|
|
1372 | break; |
|
|
1373 | case KW_body_wrist: |
|
|
1374 | thawer.get (op->body_info[10]); |
|
|
1375 | break; |
|
|
1376 | case KW_body_waist: |
|
|
1377 | thawer.get (op->body_info[11]); |
|
|
1378 | break; |
|
|
1379 | case KW_can_apply: |
913 | case KW_can_apply: |
1380 | break; |
914 | break; |
1381 | |
915 | |
1382 | case KW_connected: |
916 | case KW_connected: |
1383 | add_button_link (op, op->map, thawer.get_sint32 ()); |
917 | add_button_link (this, map, f.get_sint32 ()); |
1384 | break; |
918 | break; |
1385 | |
919 | |
1386 | case KW_randomitems: |
920 | case KW_randomitems: |
1387 | op->randomitems = find_treasurelist (thawer.get_str ()); |
921 | randomitems = find_treasurelist (f.get_str ()); |
|
|
922 | //if (!randomitems) |
|
|
923 | // LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); |
1388 | break; |
924 | break; |
1389 | |
925 | |
1390 | case KW_msg: |
926 | case KW_msg: |
1391 | { |
|
|
1392 | thawer.get_ml (KW_endmsg, op->msg); |
927 | f.get_ml (KW_endmsg, msg); |
1393 | //TODO: allow longer messages |
928 | //TODO: allow longer messages |
1394 | if (strlen (op->msg) >= HUGE_BUF) |
929 | if (strlen (msg) >= HUGE_BUF) |
1395 | { |
930 | { |
1396 | LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
931 | LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg); |
1397 | op->msg = "ERROR, please report: string too long, winged.\n"; |
932 | msg = "ERROR, please report: string too long, winged.\n"; |
1398 | } |
933 | } |
1399 | } |
|
|
1400 | break; |
934 | break; |
1401 | |
935 | |
1402 | case KW_lore: |
936 | case KW_lore: |
1403 | { |
|
|
1404 | shstr msgbuf; |
|
|
1405 | |
|
|
1406 | thawer.get_ml (KW_endlore, op->lore); |
937 | f.get_ml (KW_endlore, lore); |
1407 | //TODO: allow longer messages |
938 | //TODO: allow longer messages |
1408 | /* Just print a warning so we can be reasonably safe |
939 | /* Just print a warning so we can be reasonably safe |
1409 | * about not overflowing the buffer. |
940 | * about not overflowing the buffer. |
1410 | */ |
941 | */ |
1411 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
942 | if (strlen (lore) > (HUGE_BUF / 2)) |
1412 | LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
943 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
1413 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
944 | HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore); |
1414 | } |
|
|
1415 | break; |
945 | break; |
1416 | |
946 | |
1417 | case KW_editable: |
947 | case KW_editable: |
1418 | case KW_editor_folder: |
948 | case KW_editor_folder: |
1419 | break; |
949 | break; |
1420 | |
950 | |
1421 | case KW_More: // uppercase alias |
|
|
1422 | case KW_more: |
|
|
1423 | /* We need to record that this is a multipart object, |
|
|
1424 | * so the calling function can glue things back together |
|
|
1425 | */ |
|
|
1426 | ismore = 1; |
|
|
1427 | break; |
|
|
1428 | |
|
|
1429 | case KW_end: |
951 | case KW_end: |
1430 | check_loaded_object (op); |
952 | check_loaded_object (this); |
1431 | |
953 | |
1432 | if (!arch_init) |
954 | if (!arch_init) |
1433 | op->instantiate (); |
955 | instantiate (); |
1434 | |
956 | |
1435 | return ismore ? LL_MORE : LL_NORMAL; |
957 | f.next (); |
1436 | |
|
|
1437 | case KW_EOF: |
|
|
1438 | return LL_EOF; |
958 | return true; |
1439 | |
959 | |
1440 | case KW_ERROR: |
960 | case KW_ERROR: |
1441 | set_ob_key_value (op, thawer.line, thawer.last_value, true); |
961 | set_ob_key_value (this, f.kw_str, f.value, true); |
1442 | //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D |
962 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
1443 | |
|
|
1444 | //TODO: skip line, ugly, factor parsing better |
|
|
1445 | if (thawer.last_value) |
|
|
1446 | thawer.line = thawer.last_value; |
|
|
1447 | |
|
|
1448 | thawer.line += strlen (thawer.line) + 1; |
|
|
1449 | |
|
|
1450 | break; |
963 | break; |
1451 | |
964 | |
1452 | default: |
965 | default: |
1453 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
966 | if (!f.parse_error ("object", name)) |
|
|
967 | return false; |
1454 | break; |
968 | break; |
1455 | } |
969 | } |
|
|
970 | |
|
|
971 | f.next (); |
1456 | } |
972 | } |
1457 | } |
973 | } |
1458 | |
974 | |
1459 | /* |
975 | object * |
1460 | * Loads an object from the given file-pointer. |
976 | object::read (object_thawer &f, maptile *map) |
1461 | * Variables will be read and parsed and patched into the object |
|
|
1462 | * until the string "end" is reached, or the end of the file. |
|
|
1463 | * |
|
|
1464 | * bufstat is used to determine various file attributes: |
|
|
1465 | * LO_REPATE (0): We are reading from the same buffer as the last call. |
|
|
1466 | * LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions |
|
|
1467 | * will also be reading from this (treasure file, artifacts.) |
|
|
1468 | * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should |
|
|
1469 | * be reset. |
|
|
1470 | * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) |
|
|
1471 | * |
|
|
1472 | */ |
|
|
1473 | |
|
|
1474 | int |
|
|
1475 | load_object (object_thawer & fp, object *op, int map_flags) |
|
|
1476 | { |
977 | { |
1477 | return parse_object (op, fp, map_flags); |
978 | assert (f.kw == KW_arch); |
|
|
979 | |
|
|
980 | archetype *arch = archetype::find (f.get_str ()); |
|
|
981 | assert (arch); //D maybe use exception handling of sorts? |
|
|
982 | |
|
|
983 | object *op = object::create (); |
|
|
984 | |
|
|
985 | op->map = map; |
|
|
986 | op->arch = arch; |
|
|
987 | arch->clone.copy_to (op); |
|
|
988 | // copy_to activates, this should be fixed properly |
|
|
989 | op->deactivate (); |
|
|
990 | |
|
|
991 | if (!op->parse_kv (f)) |
|
|
992 | { |
|
|
993 | delete op; |
|
|
994 | return 0; |
|
|
995 | } |
|
|
996 | |
|
|
997 | return op; |
1478 | } |
998 | } |
1479 | |
|
|
1480 | |
999 | |
1481 | /* This takes a buffer, scans it for variables, and sets those variables |
1000 | /* This takes a buffer, scans it for variables, and sets those variables |
1482 | * as appropriate in op. |
1001 | * as appropriate in op. |
1483 | * |
1002 | * |
1484 | * This function appears to be used in only 2 places - in crossedit to |
1003 | * This function appears to be used in only 2 places - in crossedit to |
1485 | * override values and in c_wiz to mutate values. |
1004 | * override values and in c_wiz to mutate values. |
1486 | */ |
1005 | */ |
1487 | int |
1006 | int |
1488 | set_variable (object *op, char *buf) |
1007 | set_variable (object *op, char *buf) |
1489 | { |
1008 | { |
1490 | return 0; |
1009 | object_thawer f (buf, (AV *)0); |
1491 | #if 0 |
|
|
1492 | int retval; |
|
|
1493 | object_thawer thawer (0); |
|
|
1494 | |
1010 | |
1495 | strcpy (msgbuf, ""); |
1011 | return op->parse_kv (f); |
1496 | strcpy (lorebuf, ""); |
|
|
1497 | retval = parse_object (op, thawer, 0); |
|
|
1498 | yy_switch_to_buffer (yycurbuf); |
|
|
1499 | yy_delete_buffer (yybufstate); |
|
|
1500 | yy_pop_state (); |
|
|
1501 | return retval; |
|
|
1502 | #endif |
|
|
1503 | } |
|
|
1504 | |
|
|
1505 | /* This array equates the FLAG_ values with the V_ values. Use -1 to |
|
|
1506 | * put gaps in the array that should not be processed. |
|
|
1507 | * The order matches the order of the define values in 'define.h'. |
|
|
1508 | */ |
|
|
1509 | |
|
|
1510 | /* This is a list of pointers that correspond to the FLAG_.. values. |
|
|
1511 | * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then |
|
|
1512 | * the 15'th element of this array should match that name. |
|
|
1513 | * If an entry is NULL, that is a flag not to loaded/saved. |
|
|
1514 | */ |
|
|
1515 | static const char *const flag_names[NUM_FLAGS + 1] = { |
|
|
1516 | "alive", "wiz", NULL, NULL, "was_wiz", "applied", "unpaid", |
|
|
1517 | "can_use_shield", "no_pick", NULL /* walk_on */ , NULL /* no_pass */ , /* 10 */ |
|
|
1518 | "is_animated", NULL /* slow_move */ , |
|
|
1519 | NULL /* flying */ , "monster", "friendly", "generator", |
|
|
1520 | "is_thrown", "auto_apply", "treasure", "player sold", /* 20 */ |
|
|
1521 | "see_invisible", "can_roll", "overlay_floor", |
|
|
1522 | "is_turnable", NULL /* walk_off */ , NULL /* fly_on */ , |
|
|
1523 | NULL /*fly_off */ , "is_used_up", "identified", "reflecting", /* 30 */ |
|
|
1524 | "changing", "splitting", "hitback", "startequip", |
|
|
1525 | "blocksview", "undead", "scared", "unaggressive", |
|
|
1526 | "reflect_missile", "reflect_spell", /* 40 */ |
|
|
1527 | "no_magic", "no_fix_player", "is_lightable", "tear_down", |
|
|
1528 | "run_away", NULL /*pass_thru */ , NULL /*can_pass_thru */ , |
|
|
1529 | "pick_up", "unique", "no_drop", /* 50 */ |
|
|
1530 | NULL /* wizcast */ , "can_cast_spell", "can_use_scroll", "can_use_range", |
|
|
1531 | "can_use_bow", "can_use_armour", "can_use_weapon", |
|
|
1532 | "can_use_ring", "has_ready_range", "has_ready_bow", /* 60 */ |
|
|
1533 | "xrays", NULL, "is_floor", "lifesave", "no_strength", "sleep", |
|
|
1534 | "stand_still", "random_move", "only_attack", "confused", /* 70 */ |
|
|
1535 | "stealth", NULL, NULL, "cursed", "damned", |
|
|
1536 | "see_anywhere", "known_magical", "known_cursed", |
|
|
1537 | "can_use_skill", "been_applied", /* 80 */ |
|
|
1538 | "has_ready_scroll", "can_use_rod", NULL, |
|
|
1539 | "can_use_horn", "make_invisible", "inv_locked", "is_wooded", |
|
|
1540 | "is_hilly", "has_ready_skill", "has_ready_weapon", /* 90 */ |
|
|
1541 | "no_skill_ident", "is_blind", "can_see_in_dark", "is_cauldron", |
|
|
1542 | "is_dust", "no_steal", "one_hit", NULL, "berserk", "neutral", /* 100 */ |
|
|
1543 | "no_attack", "no_damage", NULL, NULL, "activate_on_push", |
|
|
1544 | "activate_on_release", "is_water", "use_content_on_gen", NULL, "is_buildable", /* 110 */ |
|
|
1545 | NULL |
|
|
1546 | }; |
|
|
1547 | |
|
|
1548 | |
|
|
1549 | /* |
|
|
1550 | * Initialises the array of variable-names. Needed before any |
|
|
1551 | * objects can be loaded. Called by init_library(). |
|
|
1552 | */ |
|
|
1553 | |
|
|
1554 | void |
|
|
1555 | init_vars () |
|
|
1556 | { |
|
|
1557 | } |
1012 | } |
1558 | |
1013 | |
1559 | /* This returns a string of the integer movement type */ |
1014 | /* This returns a string of the integer movement type */ |
1560 | #if 0 |
1015 | #if 0 |
1561 | // unused function |
1016 | // unused function |
… | |
… | |
1606 | return retbuf + 1; |
1061 | return retbuf + 1; |
1607 | } |
1062 | } |
1608 | #endif |
1063 | #endif |
1609 | |
1064 | |
1610 | // compare *op against *tmp and output differences |
1065 | // compare *op against *tmp and output differences |
1611 | void |
1066 | static void |
1612 | put (object_freezer &f, object *op, object *tmp) |
1067 | write_diff (object_freezer &f, object *op, object *tmp) |
1613 | { |
1068 | { |
|
|
1069 | static const keyword resist_save[NROFATTACKS] = { |
|
|
1070 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
|
|
1071 | # include "attackinc.h" |
|
|
1072 | # undef def |
|
|
1073 | }; |
|
|
1074 | |
|
|
1075 | /* This is a list of keywords that correspond to the FLAG_.. values. |
|
|
1076 | * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then |
|
|
1077 | * the 15'th element of this array should match that name. |
|
|
1078 | * If an entry is NULL, that is a flag not to loaded/saved. |
|
|
1079 | */ |
|
|
1080 | static const keyword flag_names [NUM_FLAGS] = { |
|
|
1081 | KW_alive, |
|
|
1082 | KW_wiz, |
|
|
1083 | KW_NULL, |
|
|
1084 | KW_NULL, |
|
|
1085 | KW_was_wiz, |
|
|
1086 | KW_applied, |
|
|
1087 | KW_unpaid, |
|
|
1088 | KW_can_use_shield, |
|
|
1089 | KW_no_pick, |
|
|
1090 | KW_NULL, // walk_on |
|
|
1091 | KW_NULL, // no_pass |
|
|
1092 | /* 10 */ |
|
|
1093 | KW_is_animated, |
|
|
1094 | KW_NULL, // slow_move |
|
|
1095 | KW_NULL, // flying |
|
|
1096 | KW_monster, |
|
|
1097 | KW_friendly, |
|
|
1098 | KW_generator, |
|
|
1099 | KW_is_thrown, |
|
|
1100 | KW_auto_apply, |
|
|
1101 | KW_NULL, // was KW_treasure |
|
|
1102 | KW_player_sold, |
|
|
1103 | /* 20 */ |
|
|
1104 | KW_see_invisible, |
|
|
1105 | KW_can_roll, |
|
|
1106 | KW_overlay_floor, |
|
|
1107 | KW_is_turnable, |
|
|
1108 | KW_NULL, // walk_off |
|
|
1109 | KW_NULL, // fly_on |
|
|
1110 | KW_NULL, // fly_off |
|
|
1111 | KW_is_used_up, |
|
|
1112 | KW_identified, |
|
|
1113 | KW_reflecting, |
|
|
1114 | /* 30 */ |
|
|
1115 | KW_changing, |
|
|
1116 | KW_splitting, |
|
|
1117 | KW_hitback, |
|
|
1118 | KW_startequip, |
|
|
1119 | KW_blocksview, |
|
|
1120 | KW_undead, |
|
|
1121 | KW_scared, |
|
|
1122 | KW_unaggressive, |
|
|
1123 | KW_reflect_missile, |
|
|
1124 | KW_reflect_spell, |
|
|
1125 | /* 40 */ |
|
|
1126 | KW_no_magic, |
|
|
1127 | KW_no_fix_player, |
|
|
1128 | KW_is_lightable, |
|
|
1129 | KW_tear_down, |
|
|
1130 | KW_run_away, |
|
|
1131 | KW_NULL, // pass_thru |
|
|
1132 | KW_NULL, // an_pass_thru |
|
|
1133 | KW_pick_up, |
|
|
1134 | KW_unique, |
|
|
1135 | KW_no_drop, |
|
|
1136 | /* 50 */ |
|
|
1137 | KW_NULL, // wizcast |
|
|
1138 | KW_can_cast_spell, |
|
|
1139 | KW_can_use_scroll, |
|
|
1140 | KW_can_use_range, |
|
|
1141 | KW_can_use_bow, |
|
|
1142 | KW_can_use_armour, |
|
|
1143 | KW_can_use_weapon, |
|
|
1144 | KW_can_use_ring, |
|
|
1145 | KW_has_ready_range, |
|
|
1146 | KW_has_ready_bow, |
|
|
1147 | /* 60 */ |
|
|
1148 | KW_xrays, |
|
|
1149 | KW_NULL, |
|
|
1150 | KW_is_floor, |
|
|
1151 | KW_lifesave, |
|
|
1152 | KW_no_strength, |
|
|
1153 | KW_sleep, |
|
|
1154 | KW_stand_still, |
|
|
1155 | KW_random_move, |
|
|
1156 | KW_only_attack, |
|
|
1157 | KW_confused, |
|
|
1158 | /* 70 */ |
|
|
1159 | KW_stealth, |
|
|
1160 | KW_NULL, |
|
|
1161 | KW_NULL, |
|
|
1162 | KW_cursed, |
|
|
1163 | KW_damned, |
|
|
1164 | KW_see_anywhere, |
|
|
1165 | KW_known_magical, |
|
|
1166 | KW_known_cursed, |
|
|
1167 | KW_can_use_skill, |
|
|
1168 | KW_been_applied, |
|
|
1169 | /* 80 */ |
|
|
1170 | KW_has_ready_scroll, |
|
|
1171 | KW_can_use_rod, |
|
|
1172 | KW_NULL, |
|
|
1173 | KW_can_use_horn, |
|
|
1174 | KW_make_invisible, |
|
|
1175 | KW_inv_locked, |
|
|
1176 | KW_is_wooded, |
|
|
1177 | KW_is_hilly, |
|
|
1178 | KW_has_ready_skill, |
|
|
1179 | KW_has_ready_weapon, |
|
|
1180 | /* 90 */ |
|
|
1181 | KW_no_skill_ident, |
|
|
1182 | KW_is_blind, |
|
|
1183 | KW_can_see_in_dark, |
|
|
1184 | KW_is_cauldron, |
|
|
1185 | KW_NULL, |
|
|
1186 | KW_no_steal, |
|
|
1187 | KW_one_hit, |
|
|
1188 | KW_NULL, |
|
|
1189 | KW_berserk, |
|
|
1190 | KW_neutral, |
|
|
1191 | /* 100 */ |
|
|
1192 | KW_no_attack, |
|
|
1193 | KW_no_damage, |
|
|
1194 | KW_obj_original, |
|
|
1195 | KW_NULL, |
|
|
1196 | KW_activate_on_push, |
|
|
1197 | KW_activate_on_release, |
|
|
1198 | KW_is_water, |
|
|
1199 | KW_use_content_on_gen, |
|
|
1200 | KW_NULL, |
|
|
1201 | KW_is_buildable, |
|
|
1202 | /* 110 */ |
|
|
1203 | KW_destroy_on_death, |
|
|
1204 | KW_NULL, |
|
|
1205 | }; |
|
|
1206 | |
1614 | int i; |
1207 | int i; |
1615 | |
1208 | |
1616 | /* This saves the key/value lists. We do it first so that any |
1209 | /* This saves the key/value lists. We do it first so that any |
1617 | * keys that match field names will be overwritten by the loader. |
1210 | * keys that match field names will be overwritten by the loader. |
1618 | */ |
1211 | */ |
1619 | for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) |
1212 | for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) |
1620 | { |
1213 | { |
1621 | /* Find the field in the opposing member. */ |
1214 | /* Find the field in the opposing member. */ |
1622 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
1215 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
1623 | |
1216 | |
1624 | /* If there's no partnering field, or it's got a different value, save our field. */ |
1217 | /* If there's no partnering field, or it's got a different value, save our field. */ |
1625 | if (arch_field == NULL || my_field->value != arch_field->value) |
1218 | if (!arch_field || my_field->value != arch_field->value) |
1626 | f.put (my_field->key, my_field->value); |
1219 | f.put (my_field->key, my_field->value); |
1627 | } |
1220 | } |
1628 | |
1221 | |
1629 | /* We don't need to worry about the arch's extra fields - they |
1222 | /* We don't need to worry about the arch's extra fields - they |
1630 | * will get taken care of the copy_object function. |
1223 | * will get taken care of the copy_to method. |
1631 | */ |
1224 | */ |
1632 | |
1225 | |
1633 | { |
1226 | { |
1634 | char uids[64]; |
1227 | char uids[64]; |
1635 | snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); |
1228 | snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); |
… | |
… | |
1651 | if (op->lore != tmp->lore) |
1244 | if (op->lore != tmp->lore) |
1652 | f.put (KW_lore, KW_endlore, op->lore); |
1245 | f.put (KW_lore, KW_endlore, op->lore); |
1653 | |
1246 | |
1654 | CMP_OUT (other_arch); |
1247 | CMP_OUT (other_arch); |
1655 | CMP_OUT (face); |
1248 | CMP_OUT (face); |
1656 | |
|
|
1657 | if (!op->face || !op->face->name) |
|
|
1658 | printf ("ERRFACE<%s,%s, face %p,%p, fname%s>\n", &tmp->name, &op->name, tmp->face, op->face, op->face ? &op->face->name : "<noface>"); //D |
|
|
1659 | |
1249 | |
1660 | if (op->animation_id != tmp->animation_id) |
1250 | if (op->animation_id != tmp->animation_id) |
1661 | if (op->animation_id) |
1251 | if (op->animation_id) |
1662 | { |
1252 | { |
1663 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1253 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
… | |
… | |
1711 | f.put (resist_save[i], op->resist[i]); |
1301 | f.put (resist_save[i], op->resist[i]); |
1712 | |
1302 | |
1713 | CMP_OUT (path_attuned); |
1303 | CMP_OUT (path_attuned); |
1714 | CMP_OUT (path_repelled); |
1304 | CMP_OUT (path_repelled); |
1715 | CMP_OUT (path_denied); |
1305 | CMP_OUT (path_denied); |
1716 | CMP_OUT (material); |
1306 | CMP_OUT2 (material, materials);//TODO: nuke |
1717 | CMP_OUT (materialname); |
1307 | CMP_OUT (materialname); |
1718 | CMP_OUT (value); |
1308 | CMP_OUT (value); |
1719 | CMP_OUT (carrying); |
1309 | CMP_OUT (carrying); |
1720 | CMP_OUT (weight); |
1310 | CMP_OUT (weight); |
1721 | CMP_OUT (invisible); |
1311 | CMP_OUT (invisible); |
… | |
… | |
1755 | CMP_OUT (move_on); |
1345 | CMP_OUT (move_on); |
1756 | CMP_OUT (move_off); |
1346 | CMP_OUT (move_off); |
1757 | CMP_OUT (move_slow); |
1347 | CMP_OUT (move_slow); |
1758 | CMP_OUT (move_slow_penalty); |
1348 | CMP_OUT (move_slow_penalty); |
1759 | |
1349 | |
1760 | if (!COMPARE_FLAGS (op, tmp)) |
1350 | if (op->flag != tmp->flag) |
1761 | for (i = 0; i <= NUM_FLAGS; i++) |
1351 | for (i = 0; i <= NUM_FLAGS; i++) |
1762 | if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) |
1352 | if (flag_names [i] && op->flag [i] != tmp->flag [i]) |
1763 | f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); |
1353 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1764 | |
1354 | |
1765 | /* Save body locations */ |
1355 | /* Save body locations */ |
1766 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1356 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1767 | if (op->body_info[i] != tmp->body_info[i]) |
1357 | if (op->body_info[i] != tmp->body_info[i]) |
1768 | f.put (body_locations[i].save_name, op->body_info[i]); |
1358 | f.put (body_locations[i].save_name, op->body_info[i]); |
… | |
… | |
1770 | |
1360 | |
1771 | /* |
1361 | /* |
1772 | * Dumps all variables in an object to a file. |
1362 | * Dumps all variables in an object to a file. |
1773 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1363 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1774 | * the only place this is not set is when saving the player. |
1364 | * the only place this is not set is when saving the player. |
1775 | * If bit 1 of flag is set, don't remove the object after save. As of now, |
|
|
1776 | * all of the callers are setting this. |
|
|
1777 | */ |
1365 | */ |
1778 | |
1366 | bool |
1779 | void |
1367 | object::write (object_freezer &f) |
1780 | save_object (object_freezer & fp, object *op, int flag) |
|
|
1781 | { |
1368 | { |
1782 | archetype *at; |
|
|
1783 | object *tmp, *old; |
|
|
1784 | |
|
|
1785 | /* Even if the object does have an owner, it would seem that we should |
1369 | /* Even if the object does have an owner, it would seem that we should |
1786 | * still save it. |
1370 | * still save it. |
1787 | */ |
1371 | */ |
1788 | if (op->owner) |
1372 | if (owner) |
1789 | return; |
1373 | return true; |
1790 | |
1374 | |
1791 | /* If it is unpaid and we don't want to save those, just return. */ |
1375 | archetype *at = arch ? (archetype *)arch : empty_archetype; |
1792 | if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) |
|
|
1793 | return; |
|
|
1794 | |
1376 | |
1795 | if ((at = op->arch) == NULL) |
|
|
1796 | at = empty_archetype; |
|
|
1797 | |
|
|
1798 | fp.put (KW_arch, at->name); |
1377 | f.put (KW_arch, at->name); |
|
|
1378 | write_diff (f, this, &at->clone); |
1799 | |
1379 | |
1800 | put (fp, op, &at->clone); |
|
|
1801 | |
|
|
1802 | /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ |
|
|
1803 | |
|
|
1804 | old = NULL; |
|
|
1805 | |
|
|
1806 | if (flag & 2) |
|
|
1807 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1380 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1808 | save_object (fp, tmp, flag); |
1381 | tmp->write (f); |
1809 | else |
|
|
1810 | /* Slightly different logic because tmp/op will be removed by |
|
|
1811 | * the save_object we call. So we just keep looking at op->inv |
|
|
1812 | * until there is nothing left. In theory, the variable old |
|
|
1813 | * should not be needed, as recursive loops shouldn't happen. |
|
|
1814 | */ |
|
|
1815 | while ((tmp = op->inv) != NULL) |
|
|
1816 | { |
|
|
1817 | if (old == tmp) |
|
|
1818 | { |
|
|
1819 | LOG (llevError, " Recursive loop in inventory\n"); |
|
|
1820 | break; |
|
|
1821 | } |
|
|
1822 | |
1382 | |
1823 | save_object (fp, tmp, flag); |
|
|
1824 | old = tmp; |
|
|
1825 | } |
|
|
1826 | |
|
|
1827 | if (!(flag & 2)) |
|
|
1828 | { |
|
|
1829 | remove_ob (op); |
|
|
1830 | free_object (op); |
|
|
1831 | } |
|
|
1832 | |
|
|
1833 | fp.put (op); |
1383 | f.put (this); |
1834 | fprintf (fp, "end\n"); |
1384 | f.put (KW_end); |
|
|
1385 | |
|
|
1386 | return true; |
1835 | } |
1387 | } |
1836 | |
1388 | |
|
|
1389 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1390 | |
|
|
1391 | bool load_resource_file (const char *filename) |
|
|
1392 | { |
|
|
1393 | object_thawer f (filename); |
|
|
1394 | |
|
|
1395 | f.next (); |
|
|
1396 | |
|
|
1397 | for (;;) |
|
|
1398 | { |
|
|
1399 | switch (f.kw) |
|
|
1400 | { |
|
|
1401 | case KW_region: |
|
|
1402 | if (!region::read (f)) |
|
|
1403 | return false; |
|
|
1404 | break; |
|
|
1405 | |
|
|
1406 | case KW_EOF: |
|
|
1407 | return true; |
|
|
1408 | |
|
|
1409 | default: |
|
|
1410 | if (!f.parse_error ("resource file")) |
|
|
1411 | return false; |
|
|
1412 | } |
|
|
1413 | |
|
|
1414 | f.next (); |
|
|
1415 | } |
|
|
1416 | } |
|
|
1417 | |