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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
5 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
6 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
7 | |
7 | * |
8 | 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 |
9 | 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 |
10 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
11 | (at your option) any later version. |
11 | * (at your 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 GNU General Public License |
19 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | |
21 | * |
22 | 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> |
23 | */ |
23 | */ |
24 | |
24 | |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
26 | sub/add_weight will transcend the environment updating the carrying |
26 | sub/add_weight will transcend the environment updating the carrying |
27 | variable. */ |
27 | variable. */ |
28 | |
28 | |
29 | |
|
|
30 | #include <global.h> |
29 | #include <global.h> |
31 | #include <loader.h> |
30 | #include <loader.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 specialised 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 pluralised), 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 */ |
… | |
… | |
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 | |
323 | |
327 | ip = calc_item_power (op, 0); |
324 | int ip = calc_item_power (op, 0); |
|
|
325 | |
328 | /* Legacy objects from before item power was in the game */ |
326 | /* Legacy objects from before item power was in the game */ |
329 | if (!op->item_power && ip) |
327 | if (!op->item_power && ip) |
330 | { |
328 | { |
331 | if (ip > 3) |
329 | if (ip > 3) |
332 | { |
|
|
333 | 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); |
334 | } |
331 | |
335 | op->item_power = ip; |
332 | op->item_power = ip; |
336 | } |
333 | } |
|
|
334 | |
337 | /* Check for possibly bogus values. Has to meet both these criteria - |
335 | /* Check for possibly bogus values. Has to meet both these criteria - |
338 | * 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 |
339 | * 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. |
340 | * 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, |
341 | * but not the second one. |
339 | * but not the second one. |
342 | */ |
340 | */ |
343 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
341 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
344 | { |
|
|
345 | 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); |
346 | } |
|
|
347 | |
|
|
348 | } |
343 | } |
|
|
344 | |
349 | /* Old spellcasting object - need to load in the appropiate object */ |
345 | /* Old spellcasting object - need to load in the appropiate object */ |
350 | 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 || |
351 | /* 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 */ |
352 | ((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) |
353 | { |
349 | { |
354 | object *tmp; |
|
|
355 | |
|
|
356 | /* 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' |
357 | * in that spell was stored in sp. |
351 | * in that spell was stored in sp. |
358 | */ |
352 | */ |
359 | 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]); |
360 | insert_ob_in_ob (tmp, op); |
354 | insert_ob_in_ob (tmp, op); |
361 | 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 */ |
362 | } |
356 | } |
|
|
357 | |
363 | /* 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 */ |
364 | |
|
|
365 | 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) |
366 | { |
360 | { |
367 | object *tmp; |
|
|
368 | |
|
|
369 | tmp = get_archetype_by_object_name (op->slaying); |
361 | object *tmp = get_archetype_by_object_name (op->slaying); |
370 | insert_ob_in_ob (tmp, op); |
362 | insert_ob_in_ob (tmp, op); |
371 | 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 */ |
372 | /* without this, value is all screwed up */ |
364 | /* without this, value is all screwed up */ |
373 | op->value = op->arch->clone.value * op->inv->value; |
365 | op->value = op->arch->clone.value * op->inv->value; |
374 | } |
366 | } |
375 | |
367 | |
376 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
368 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
377 | { |
369 | { |
378 | if (op->stats.hp > op->stats.maxhp) |
370 | if (op->stats.hp > op->stats.maxhp) |
|
|
371 | { |
379 | 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 | } |
380 | |
375 | |
381 | /* The archs just need to be updated for this */ |
376 | /* The archs just need to be updated for this */ |
382 | if (op->move_type == 0) |
377 | if (op->move_type == 0) |
383 | op->move_type = MOVE_WALK; |
378 | op->move_type = MOVE_WALK; |
384 | } |
379 | } |
… | |
… | |
407 | { |
402 | { |
408 | op->move_type = MOVE_ALL; |
403 | op->move_type = MOVE_ALL; |
409 | op->stats.maxhp = 0; |
404 | op->stats.maxhp = 0; |
410 | } |
405 | } |
411 | else |
406 | else |
412 | { |
|
|
413 | op->move_type = MOVE_WALK; |
407 | op->move_type = MOVE_WALK; |
414 | } |
|
|
415 | } |
408 | } |
416 | } |
409 | } |
417 | |
410 | |
418 | } |
411 | } |
419 | |
412 | |
… | |
… | |
480 | } |
473 | } |
481 | } |
474 | } |
482 | } |
475 | } |
483 | |
476 | |
484 | #define GET_FLAG(op,flag) \ |
477 | #define GET_FLAG(op,flag) \ |
485 | if (thawer.get_sint32 ()) \ |
478 | if (f.get_sint32 ()) \ |
486 | SET_FLAG (op, flag); \ |
479 | SET_FLAG (op, flag); \ |
487 | else \ |
480 | else \ |
488 | CLEAR_FLAG (op, flag) \ |
481 | CLEAR_FLAG (op, flag) \ |
489 | |
482 | |
490 | int |
483 | bool |
491 | parse_object (object *op, object_thawer &thawer, int map_flags) |
484 | object::parse_kv (object_thawer &f) |
492 | { |
485 | { |
493 | 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 | |
494 | object *op_inv = op->inv; |
493 | object *op_inv = inv; |
495 | |
494 | |
496 | for (;;) |
495 | for (;;) |
497 | { |
496 | { |
498 | keyword kw = thawer.get_kv (); |
|
|
499 | |
|
|
500 | switch (kw) |
497 | switch (f.kw) |
501 | { |
498 | { |
502 | case KW_Object: // uppercase alias |
|
|
503 | case KW_object: |
|
|
504 | thawer.get (op->name); |
|
|
505 | |
|
|
506 | if (op->arch) |
|
|
507 | op->arch->name = op->name; |
|
|
508 | |
|
|
509 | break; |
|
|
510 | |
|
|
511 | case KW_uuid: |
499 | case KW_uuid: |
512 | if (const char *s = thawer.get_str ()) |
500 | if (const char *s = f.get_str ()) |
513 | { |
501 | { |
514 | unsigned int version; |
502 | unsigned int version; |
515 | unsigned long long seq; |
503 | unsigned long long seq; |
516 | |
504 | |
517 | if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) |
505 | if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) |
518 | { |
506 | { |
519 | op->uuid.seq = seq; |
507 | uuid.seq = seq; |
520 | break; |
508 | break; |
521 | } |
509 | } |
522 | } |
510 | } |
523 | |
511 | |
524 | op->uuid = gen_uuid (); |
512 | uuid = gen_uuid (); |
525 | break; |
513 | break; |
526 | |
514 | |
527 | case KW_oid: |
515 | case KW_oid: |
528 | thawer.get (op, thawer.get_sint32 ()); |
516 | f.get (this, f.get_sint32 ()); |
529 | break; |
517 | break; |
530 | |
518 | |
531 | case KW_name: thawer.get (op->name); break; |
519 | case KW_name: f.get (name); break; |
532 | case KW_name_pl: thawer.get (op->name_pl); break; |
520 | case KW_name_pl: f.get (name_pl); break; |
533 | case KW_title: thawer.get (op->title); break; |
521 | case KW_title: f.get (title); break; |
534 | case KW_custom_name: thawer.get (op->custom_name); break; |
522 | case KW_custom_name: f.get (custom_name); break; |
535 | |
523 | |
536 | case KW_attach: thawer.get_ornull (op->attach); break; |
524 | case KW_attach: f.get_ornull (attach); break; |
537 | case KW_skill: thawer.get_ornull (op->skill); break; |
525 | case KW_skill: f.get_ornull (skill); break; |
538 | case KW_race: thawer.get_ornull (op->race); break; |
526 | case KW_race: f.get_ornull (race); break; |
539 | case KW_slaying: thawer.get_ornull (op->slaying); break; |
527 | case KW_slaying: f.get_ornull (slaying); break; |
540 | |
528 | |
541 | case KW_arch: |
529 | case KW_arch: |
542 | { |
530 | { |
543 | const char *str = thawer.get_str (); |
|
|
544 | |
|
|
545 | if (op->arch) |
|
|
546 | { |
|
|
547 | /* If op->arch has been set, then this new object |
|
|
548 | * must be part of the inventory. So process |
|
|
549 | * appropriately. |
|
|
550 | */ |
|
|
551 | archetype *arch = archetype::find (str); |
|
|
552 | |
|
|
553 | object *tmp; |
|
|
554 | |
|
|
555 | if (arch) |
|
|
556 | tmp = arch_to_object (arch); |
|
|
557 | else |
|
|
558 | { |
|
|
559 | tmp = object::create (); |
531 | object *tmp = object::read (f); |
560 | /* record the name of the broken object */ |
|
|
561 | tmp->name = str; |
|
|
562 | } |
|
|
563 | |
|
|
564 | // decativate the object we, as we are still going |
|
|
565 | // to read the speed value. Objects should be activated |
|
|
566 | // when the map, object or player is completly loaded. |
|
|
567 | tmp->deactivate (); |
532 | tmp->deactivate (); |
568 | |
533 | |
569 | parse_object (tmp, thawer, map_flags); |
|
|
570 | |
|
|
571 | if (tmp->arch) |
|
|
572 | { |
534 | { |
573 | // was: insert_ob_in_ob (tmp, op); |
535 | // was: insert_ob_in_ob (tmp, op); |
574 | // but manually adding it can improve map loading times a lot |
536 | // but manually adding it can improve map loading times a lot |
575 | // also, appending instead of prepending keeps the |
537 | // also, appending instead of prepending keeps the |
576 | // save ordering the same between repeated load/saves. |
538 | // save ordering the same between repeated load/saves. |
577 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
539 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
578 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
540 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
579 | |
541 | |
580 | if (!op_inv) |
542 | if (!op_inv) |
581 | { |
543 | { |
582 | op->inv = tmp; |
|
|
583 | tmp->above = 0; |
|
|
584 | } |
|
|
585 | else |
|
|
586 | { |
|
|
587 | while (op_inv->below) |
|
|
588 | op_inv = op_inv->below; |
|
|
589 | |
|
|
590 | op_inv->below = tmp; |
|
|
591 | tmp->above = op_inv; |
|
|
592 | } |
|
|
593 | |
|
|
594 | tmp->below = 0; |
|
|
595 | tmp->env = op; |
|
|
596 | op_inv = tmp; |
544 | inv = tmp; |
|
|
545 | tmp->above = 0; |
597 | } |
546 | } |
598 | else |
547 | else |
599 | { |
548 | { |
600 | LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); |
549 | while (op_inv->below) |
601 | tmp->destroy (); |
550 | op_inv = op_inv->below; |
|
|
551 | |
|
|
552 | op_inv->below = tmp; |
|
|
553 | tmp->above = op_inv; |
602 | } |
554 | } |
|
|
555 | |
|
|
556 | tmp->below = 0; |
|
|
557 | tmp->env = this; |
|
|
558 | op_inv = tmp; |
603 | } |
559 | } |
604 | else |
|
|
605 | { |
|
|
606 | /* This is the actual archetype definition then */ |
|
|
607 | op->arch = archetype::find (str); |
|
|
608 | |
|
|
609 | if (op->arch) |
|
|
610 | { |
|
|
611 | op->arch->clone.copy_to (op); |
|
|
612 | // copy_to activates, this should be fixed properly |
|
|
613 | op->deactivate (); |
|
|
614 | } |
|
|
615 | else if (!arch_init) |
|
|
616 | /* record the name of the broken object */ |
|
|
617 | op->name = str; |
|
|
618 | } |
|
|
619 | } |
560 | } |
620 | break; |
561 | continue; |
621 | |
562 | |
622 | case KW_other_arch: |
563 | case KW_other_arch: |
623 | op->other_arch = archetype::find (thawer.get_str ()); |
564 | other_arch = archetype::find (f.get_str ()); |
624 | break; |
565 | break; |
625 | |
566 | |
626 | case KW_animation: |
567 | case KW_animation: |
627 | { |
568 | { |
|
|
569 | CLEAR_FLAG (this, FLAG_ANIMATE); |
|
|
570 | animation_id = 0; |
|
|
571 | |
628 | const char *str = thawer.get_str (); |
572 | const char *str = f.get_str (); |
629 | |
|
|
630 | if (!str) |
|
|
631 | { |
|
|
632 | op->animation_id = 0; |
|
|
633 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
634 | } |
|
|
635 | else if ((op->animation_id = find_animation (str))) |
573 | if (str && (animation_id = find_animation (str))) |
636 | SET_FLAG (op, FLAG_ANIMATE); |
574 | SET_FLAG (this, FLAG_ANIMATE); |
637 | } |
575 | } |
638 | |
|
|
639 | break; |
576 | break; |
640 | |
577 | |
641 | case KW_last_heal: thawer.get (op->last_heal); break; |
578 | case KW_last_heal: f.get (last_heal); break; |
642 | case KW_last_sp: thawer.get (op->last_sp); break; |
579 | case KW_last_sp: f.get (last_sp); break; |
643 | case KW_last_grace: thawer.get (op->last_grace); break; |
580 | case KW_last_grace: f.get (last_grace); break; |
644 | case KW_last_eat: thawer.get (op->last_eat); break; |
581 | case KW_last_eat: f.get (last_eat); break; |
645 | case KW_speed_left: thawer.get (op->speed_left); break; |
582 | case KW_speed_left: f.get (speed_left); break; |
646 | |
583 | |
647 | case KW_speed: |
584 | case KW_speed: |
648 | thawer.get (op->speed); |
585 | f.get (speed); |
649 | |
586 | |
650 | //TODO: maybe do in check_object |
587 | //TODO: maybe do in check_object |
651 | // removed check for style maps |
588 | // removed check for style maps |
652 | if (op->speed < 0) |
589 | if (speed < 0) |
653 | op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; |
590 | speed_left = speed_left - rndm (); |
654 | |
591 | |
655 | break; |
592 | break; |
656 | |
593 | |
657 | case KW_slow_move: |
594 | case KW_slow_move: |
658 | op->move_slow |= MOVE_WALK; |
595 | move_slow |= MOVE_WALK; |
659 | thawer.get (op->move_slow_penalty); |
596 | f.get (move_slow_penalty); |
660 | break; |
597 | break; |
661 | |
598 | |
662 | case KW_face: |
599 | case KW_face: |
663 | op->face = &new_faces[FindFace (thawer.get_str (), 0)]; |
600 | face = &new_faces[FindFace (f.get_str (), 0)]; |
664 | break; |
601 | break; |
665 | |
602 | |
666 | case KW_x: thawer.get (op->x); break; |
603 | case KW_x: f.get (x); break; |
667 | case KW_y: thawer.get (op->y); break; |
604 | case KW_y: f.get (y); break; |
668 | |
605 | |
669 | case KW_Str: // uppercase alias |
606 | case KW_Str: // uppercase alias |
670 | case KW_str: thawer.get (op->stats.Str); break; |
607 | case KW_str: f.get (stats.Str); break; |
671 | case KW_Dex: // uppercase alias |
608 | case KW_Dex: // uppercase alias |
672 | case KW_dex: thawer.get (op->stats.Dex); break; |
609 | case KW_dex: f.get (stats.Dex); break; |
673 | case KW_Con: // uppercase alias |
610 | case KW_Con: // uppercase alias |
674 | case KW_con: thawer.get (op->stats.Con); break; |
611 | case KW_con: f.get (stats.Con); break; |
675 | case KW_Wis: // uppercase alias |
612 | case KW_Wis: // uppercase alias |
676 | case KW_wis: thawer.get (op->stats.Wis); break; |
613 | case KW_wis: f.get (stats.Wis); break; |
677 | case KW_Cha: // uppercase alias |
614 | case KW_Cha: // uppercase alias |
678 | case KW_cha: thawer.get (op->stats.Cha); break; |
615 | case KW_cha: f.get (stats.Cha); break; |
679 | case KW_Int: // uppercase alias |
616 | case KW_Int: // uppercase alias |
680 | case KW_int: thawer.get (op->stats.Int); break; |
617 | case KW_int: f.get (stats.Int); break; |
681 | case KW_Pow: // uppercase alias |
618 | case KW_Pow: // uppercase alias |
682 | case KW_pow: thawer.get (op->stats.Pow); break; |
619 | case KW_pow: f.get (stats.Pow); break; |
683 | |
620 | |
684 | case KW_hp: thawer.get (op->stats.hp); break; |
621 | case KW_hp: f.get (stats.hp); break; |
685 | case KW_maxhp: thawer.get (op->stats.maxhp); break; |
622 | case KW_maxhp: f.get (stats.maxhp); break; |
686 | case KW_sp: thawer.get (op->stats.sp); break; |
623 | case KW_sp: f.get (stats.sp); break; |
687 | case KW_maxsp: thawer.get (op->stats.maxsp); break; |
624 | case KW_maxsp: f.get (stats.maxsp); break; |
688 | case KW_grace: thawer.get (op->stats.grace); break; |
625 | case KW_grace: f.get (stats.grace); break; |
689 | case KW_maxgrace: thawer.get (op->stats.maxgrace); break; |
626 | case KW_maxgrace: f.get (stats.maxgrace); break; |
690 | |
627 | |
691 | case KW_exp: thawer.get (op->stats.exp); break; |
628 | case KW_exp: f.get (stats.exp); break; |
692 | case KW_perm_exp: thawer.get (op->perm_exp); break; |
629 | case KW_perm_exp: f.get (perm_exp); break; |
693 | case KW_food: thawer.get (op->stats.food); break; |
630 | case KW_food: f.get (stats.food); break; |
694 | case KW_dam: thawer.get (op->stats.dam); break; |
631 | case KW_dam: f.get (stats.dam); break; |
695 | case KW_wc: thawer.get (op->stats.wc); break; |
632 | case KW_wc: f.get (stats.wc); break; |
696 | case KW_ac: thawer.get (op->stats.ac); break; |
633 | case KW_ac: f.get (stats.ac); break; |
697 | case KW_nrof: thawer.get (op->nrof); break; |
634 | case KW_nrof: f.get (nrof); break; |
698 | case KW_level: thawer.get (op->level); break; |
635 | case KW_level: f.get (level); break; |
699 | case KW_direction: thawer.get (op->direction); break; |
636 | case KW_direction: f.get (direction); break; |
700 | case KW_type: thawer.get (op->type); break; |
637 | case KW_type: f.get (type); break; |
701 | case KW_subtype: thawer.get (op->subtype); break; |
638 | case KW_subtype: f.get (subtype); break; |
702 | case KW_value: thawer.get (op->value); break; |
639 | case KW_value: f.get (value); break; |
703 | case KW_weight: thawer.get (op->weight); break; |
640 | case KW_weight: f.get (weight); break; |
704 | case KW_carrying: thawer.get (op->carrying); break; |
641 | case KW_carrying: f.get (carrying); break; |
705 | case KW_attacktype: thawer.get (op->attacktype); break; |
642 | case KW_attacktype: f.get (attacktype); break; |
706 | case KW_path_attuned: thawer.get (op->path_attuned); break; |
643 | case KW_path_attuned: f.get (path_attuned); break; |
707 | case KW_path_repelled: thawer.get (op->path_repelled); break; |
644 | case KW_path_repelled: f.get (path_repelled); break; |
708 | case KW_path_denied: thawer.get (op->path_denied); break; |
645 | case KW_path_denied: f.get (path_denied); break; |
709 | case KW_invisible: thawer.get (op->invisible); break; |
646 | case KW_invisible: f.get (invisible); break; |
710 | case KW_magic: thawer.get (op->magic); break; |
647 | case KW_magic: f.get (magic); break; |
711 | case KW_state: thawer.get (op->state); break; |
648 | case KW_state: f.get (state); break; |
712 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
649 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
713 | case KW_material: thawer.get (op->material); break; |
650 | case KW_material: f.get (materials); break; //TODO: nuke |
714 | case KW_materialname: thawer.get (op->materialname); break; |
651 | case KW_materialname: f.get (materialname); break; |
715 | |
652 | |
716 | /* These are the new values */ |
653 | /* These are the new values */ |
717 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
654 | case KW_move_block: set_move (move_block, f.get_str ()); break; |
718 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
655 | case KW_move_allow: set_move (move_allow, f.get_str ()); break; |
719 | case KW_move_type: set_move (op->move_type, thawer.get_str ()); break; |
656 | case KW_move_type: set_move (move_type, f.get_str ()); break; |
720 | case KW_move_on: set_move (op->move_on, thawer.get_str ()); break; |
657 | case KW_move_on: set_move (move_on, f.get_str ()); break; |
721 | case KW_move_off: set_move (op->move_off, thawer.get_str ()); break; |
658 | case KW_move_off: set_move (move_off, f.get_str ()); break; |
722 | case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break; |
659 | case KW_move_slow: set_move (move_slow, f.get_str ()); break; |
723 | |
660 | |
724 | /* 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 */ |
725 | case KW_no_pass: |
662 | case KW_no_pass: |
726 | { |
663 | { |
727 | if (thawer.get_sint32 ()) |
664 | if (f.get_sint32 ()) |
728 | op->move_block = MOVE_ALL; |
665 | move_block = MOVE_ALL; |
729 | else |
666 | else |
730 | op->move_block = 0; |
667 | move_block = 0; |
731 | } |
668 | } |
732 | |
669 | |
733 | break; |
670 | break; |
734 | |
671 | |
735 | /* 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 */ |
736 | case KW_walk_on: |
673 | case KW_walk_on: |
737 | { |
674 | { |
738 | if (thawer.get_sint32 ()) |
675 | if (f.get_sint32 ()) |
739 | op->move_on |= MOVE_WALK; |
676 | move_on |= MOVE_WALK; |
740 | else |
677 | else |
741 | op->move_on &= ~MOVE_WALK; |
678 | move_on &= ~MOVE_WALK; |
742 | } |
679 | } |
743 | |
680 | |
744 | break; |
681 | break; |
745 | |
682 | |
746 | /* 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 */ |
747 | case KW_walk_off: |
684 | case KW_walk_off: |
748 | { |
685 | { |
749 | if (thawer.get_sint32 ()) |
686 | if (f.get_sint32 ()) |
750 | op->move_off |= MOVE_WALK; |
687 | move_off |= MOVE_WALK; |
751 | else |
688 | else |
752 | op->move_off &= ~MOVE_WALK; |
689 | move_off &= ~MOVE_WALK; |
753 | } |
690 | } |
754 | break; |
691 | break; |
755 | |
692 | |
756 | /* 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 */ |
757 | case KW_fly_on: |
694 | case KW_fly_on: |
758 | { |
695 | { |
759 | if (thawer.get_sint32 ()) |
696 | if (f.get_sint32 ()) |
760 | op->move_on |= MOVE_FLY_LOW; |
697 | move_on |= MOVE_FLY_LOW; |
761 | else |
698 | else |
762 | op->move_on &= ~MOVE_FLY_LOW; |
699 | move_on &= ~MOVE_FLY_LOW; |
763 | } |
700 | } |
764 | break; |
701 | break; |
765 | |
702 | |
766 | /* 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 */ |
767 | case KW_fly_off: |
704 | case KW_fly_off: |
768 | { |
705 | { |
769 | if (thawer.get_sint32 ()) |
706 | if (f.get_sint32 ()) |
770 | op->move_off |= MOVE_FLY_LOW; |
707 | move_off |= MOVE_FLY_LOW; |
771 | else |
708 | else |
772 | op->move_off &= ~MOVE_FLY_LOW; |
709 | move_off &= ~MOVE_FLY_LOW; |
773 | } |
710 | } |
774 | break; |
711 | break; |
775 | |
712 | |
776 | //TODO: remove these after converting archetypes |
713 | //TODO: remove these after converting archetypes |
777 | case KW_can_use_wand: |
714 | case KW_can_use_wand: |
778 | GET_FLAG (op, FLAG_USE_RANGE); |
715 | GET_FLAG (this, FLAG_USE_RANGE); |
779 | break; |
716 | break; |
780 | |
717 | |
781 | /* 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 */ |
782 | case KW_flying: |
719 | case KW_flying: |
783 | { |
720 | { |
784 | if (thawer.get_sint32 ()) |
721 | if (f.get_sint32 ()) |
785 | op->move_type |= MOVE_FLY_LOW; |
722 | move_type |= MOVE_FLY_LOW; |
786 | else |
723 | else |
787 | op->move_type &= ~MOVE_FLY_LOW; |
724 | move_type &= ~MOVE_FLY_LOW; |
788 | } |
725 | } |
789 | break; |
726 | break; |
790 | |
727 | |
791 | |
728 | |
792 | case KW_identified: |
729 | case KW_identified: |
793 | GET_FLAG (op, FLAG_IDENTIFIED); |
730 | GET_FLAG (this, FLAG_IDENTIFIED); |
794 | //TODO: move to check_object or so |
731 | //TODO: move to check_object or so |
795 | if (QUERY_FLAG (op, FLAG_IDENTIFIED)) |
732 | if (QUERY_FLAG (this, FLAG_IDENTIFIED)) |
796 | CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); |
733 | CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); |
797 | |
734 | |
798 | break; |
735 | break; |
799 | |
736 | |
800 | case KW_wiz: |
737 | case KW_wiz: |
801 | GET_FLAG (op, FLAG_WIZ); |
738 | GET_FLAG (this, FLAG_WIZ); |
802 | //TODO: move to check_object |
739 | //TODO: move to check_object |
803 | if (QUERY_FLAG (op, FLAG_WIZ)) |
740 | if (QUERY_FLAG (this, FLAG_WIZ)) |
804 | { |
741 | { |
805 | SET_FLAG (op, FLAG_WAS_WIZ); |
742 | SET_FLAG (this, FLAG_WAS_WIZ); |
806 | SET_FLAG (op, FLAG_WIZPASS); |
743 | SET_FLAG (this, FLAG_WIZPASS); |
807 | SET_FLAG (op, FLAG_WIZCAST); |
744 | SET_FLAG (this, FLAG_WIZCAST); |
808 | } |
745 | } |
809 | else |
746 | else |
810 | { |
747 | { |
811 | CLEAR_FLAG (op, FLAG_WIZPASS); |
748 | CLEAR_FLAG (this, FLAG_WIZPASS); |
812 | CLEAR_FLAG (op, FLAG_WIZCAST); |
749 | CLEAR_FLAG (this, FLAG_WIZCAST); |
813 | } |
750 | } |
814 | break; |
751 | break; |
815 | |
752 | |
816 | case KW_friendly: |
753 | case KW_friendly: |
817 | if (thawer.get_sint32 ()) |
754 | if (f.get_sint32 ()) |
818 | if (op->type != PLAYER) |
755 | if (type != PLAYER) |
819 | add_friendly_object (op); |
756 | add_friendly_object (this); |
820 | |
757 | |
821 | break; |
758 | break; |
822 | |
759 | |
823 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
760 | case KW_monster: GET_FLAG (this, FLAG_MONSTER); break; |
824 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
761 | case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break; |
825 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
762 | case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break; |
826 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
763 | case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break; |
827 | case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break; |
764 | case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break; |
828 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
765 | case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break; |
829 | case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; |
766 | case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break; |
830 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
767 | case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break; |
831 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
768 | case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break; |
832 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
769 | case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break; |
833 | case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; |
770 | case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break; |
834 | case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; |
771 | case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break; |
835 | case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; |
772 | case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; |
836 | case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; |
773 | case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; |
837 | case KW_alive: GET_FLAG (op, FLAG_ALIVE); break; |
774 | case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; |
838 | case KW_applied: GET_FLAG (op, FLAG_APPLIED); break; |
775 | case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; |
839 | case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break; |
776 | case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; |
840 | case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break; |
777 | case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; |
841 | case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break; |
778 | case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; |
842 | case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break; |
779 | case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; |
843 | case KW_changing: GET_FLAG (op, FLAG_CHANGING); break; |
780 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
844 | case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break; |
781 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
845 | case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break; |
782 | case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; |
846 | case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break; |
783 | case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; |
847 | case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break; |
784 | case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; |
848 | case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break; |
785 | case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; |
849 | case KW_scared: GET_FLAG (op, FLAG_SCARED); break; |
786 | case KW_scared: GET_FLAG (this, FLAG_SCARED); break; |
850 | case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break; |
787 | case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; |
851 | case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break; |
788 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
852 | case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break; |
789 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
853 | case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break; |
790 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
854 | case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break; |
791 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
855 | case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break; |
792 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
856 | case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break; |
793 | case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break; |
857 | case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break; |
794 | case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; |
858 | case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break; |
795 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
859 | case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break; |
796 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
860 | case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break; |
797 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
861 | case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break; |
798 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
862 | case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break; |
799 | case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; |
863 | case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break; |
800 | case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break; |
864 | case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; |
801 | case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break; |
865 | case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; |
802 | case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break; |
866 | case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; |
803 | case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break; |
867 | case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; |
804 | case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break; |
868 | case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; |
805 | case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break; |
869 | case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break; |
806 | case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break; |
870 | case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; |
807 | case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break; |
871 | case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; |
808 | case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break; |
872 | case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; |
809 | case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break; |
873 | case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; |
810 | case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break; |
874 | case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; |
811 | case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break; |
875 | case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break; |
812 | case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break; |
876 | case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break; |
813 | case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
877 | case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break; |
814 | case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break; |
878 | case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break; |
815 | case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break; |
879 | case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break; |
816 | case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break; |
880 | case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break; |
817 | case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break; |
881 | case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break; |
818 | case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break; |
882 | case KW_cursed: GET_FLAG (op, FLAG_CURSED); break; |
819 | case KW_cursed: GET_FLAG (this, FLAG_CURSED); break; |
883 | case KW_damned: GET_FLAG (op, FLAG_DAMNED); break; |
820 | case KW_damned: GET_FLAG (this, FLAG_DAMNED); break; |
884 | case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break; |
821 | case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break; |
885 | case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break; |
822 | case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break; |
886 | case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break; |
823 | case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break; |
887 | case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break; |
824 | case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break; |
888 | case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break; |
825 | case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break; |
889 | case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break; |
826 | case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break; |
890 | case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break; |
827 | case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break; |
891 | case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break; |
828 | case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break; |
892 | case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break; |
829 | case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break; |
893 | case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break; |
830 | case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break; |
894 | case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break; |
831 | case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break; |
895 | case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break; |
832 | case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break; |
896 | case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break; |
833 | case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break; |
897 | case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break; |
834 | case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break; |
898 | case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break; |
835 | case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break; |
899 | case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break; |
836 | case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break; |
900 | case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break; |
837 | case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break; |
901 | case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break; |
838 | case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break; |
902 | case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break; |
839 | case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break; |
903 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
840 | case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break; |
904 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
841 | case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break; |
905 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
842 | case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break; |
906 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
843 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
907 | case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; |
844 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
908 | case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break; |
845 | case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; |
909 | |
846 | |
910 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
847 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
911 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
848 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
912 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
849 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
913 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
850 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
914 | case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break; |
851 | case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break; |
915 | case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break; |
852 | case KW_resist_cold: f.get (resist[ATNR_COLD]); break; |
916 | case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break; |
853 | case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break; |
917 | case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break; |
854 | case KW_resist_acid: f.get (resist[ATNR_ACID]); break; |
918 | case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break; |
855 | case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break; |
919 | case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break; |
856 | case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break; |
920 | case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break; |
857 | case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break; |
921 | case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break; |
858 | case KW_resist_poison: f.get (resist[ATNR_POISON]); break; |
922 | case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break; |
859 | case KW_resist_slow: f.get (resist[ATNR_SLOW]); break; |
923 | case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break; |
860 | case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break; |
924 | case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break; |
861 | case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break; |
925 | case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break; |
862 | case KW_resist_fear: f.get (resist[ATNR_FEAR]); break; |
926 | case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break; |
863 | case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break; |
927 | case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break; |
864 | case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break; |
928 | case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break; |
865 | case KW_resist_death: f.get (resist[ATNR_DEATH]); break; |
929 | case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break; |
866 | case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break; |
930 | case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break; |
867 | case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break; |
931 | case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break; |
868 | case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break; |
932 | case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break; |
869 | case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break; |
933 | case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break; |
870 | case KW_resist_blind: f.get (resist[ATNR_BLIND]); break; |
934 | case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break; |
871 | case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break; |
935 | case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break; |
872 | case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break; |
936 | case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break; |
873 | case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break; |
937 | |
874 | |
938 | case KW_luck: thawer.get (op->stats.luck); break; |
875 | case KW_luck: f.get (stats.luck); break; |
939 | case KW_run_away: thawer.get (op->run_away); break; |
876 | case KW_run_away: f.get (run_away); break; |
940 | case KW_pick_up: thawer.get (op->pick_up); break; |
877 | case KW_pick_up: f.get (pick_up); break; |
941 | case KW_item_power: thawer.get (op->item_power); break; |
878 | case KW_item_power: f.get (item_power); break; |
942 | case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break; |
879 | case KW_gen_sp_armour: f.get (gen_sp_armour); break; |
943 | case KW_anim_speed: thawer.get (op->anim_speed); break; |
880 | case KW_anim_speed: f.get (anim_speed); break; |
944 | case KW_container: thawer.get (op->weight_limit); break; |
881 | case KW_container: f.get (weight_limit); break; |
945 | case KW_will_apply: thawer.get (op->will_apply); break; |
882 | case KW_will_apply: f.get (will_apply); break; |
946 | case KW_attack_movement: thawer.get (op->attack_movement); break; |
883 | case KW_attack_movement: f.get (attack_movement); break; |
947 | case KW_move_state: thawer.get (op->move_status); break; |
884 | case KW_move_state: f.get (move_status); break; |
948 | case KW_expmul: thawer.get (op->expmul); break; |
885 | case KW_expmul: f.get (expmul); break; |
949 | case KW_glow_radius: thawer.get (op->glow_radius); break; |
886 | case KW_glow_radius: f.get (glow_radius); break; |
950 | case KW_weapontype: thawer.get (op->weapontype); break; |
887 | case KW_weapontype: f.get (weapontype); break; |
951 | case KW_tooltype: thawer.get (op->tooltype); break; |
888 | case KW_tooltype: f.get (tooltype); break; |
952 | case KW_casting_time: thawer.get (op->casting_time); break; |
889 | case KW_casting_time: f.get (casting_time); break; |
953 | case KW_elevation: thawer.get (op->elevation); break; |
890 | case KW_elevation: f.get (elevation); break; |
954 | case KW_smoothlevel: thawer.get (op->smoothlevel); break; |
891 | case KW_smoothlevel: f.get (smoothlevel); break; |
955 | case KW_client_type: thawer.get (op->client_type); break; |
892 | case KW_client_type: f.get (client_type); break; |
956 | case KW_duration: thawer.get (op->duration); break; |
893 | case KW_duration: f.get (duration); break; |
957 | case KW_range: thawer.get (op->range); break; |
894 | case KW_range: f.get (range); break; |
958 | case KW_range_modifier: thawer.get (op->range_modifier); break; |
895 | case KW_range_modifier: f.get (range_modifier); break; |
959 | case KW_dam_modifier: thawer.get (op->dam_modifier); break; |
896 | case KW_dam_modifier: f.get (dam_modifier); break; |
960 | case KW_duration_modifier: thawer.get (op->duration_modifier); break; |
897 | case KW_duration_modifier: f.get (duration_modifier); break; |
961 | |
898 | |
962 | //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 |
963 | //TODO: parse from other include files |
900 | //TODO: parse from other include files |
964 | case KW_body_range: thawer.get (op->body_info[0]); break; |
901 | case KW_body_range: f.get (body_info[0]); break; |
965 | case KW_body_arm: thawer.get (op->body_info[1]); break; |
902 | case KW_body_arm: f.get (body_info[1]); break; |
966 | case KW_body_torso: thawer.get (op->body_info[2]); break; |
903 | case KW_body_torso: f.get (body_info[2]); break; |
967 | case KW_body_head: thawer.get (op->body_info[3]); break; |
904 | case KW_body_head: f.get (body_info[3]); break; |
968 | case KW_body_neck: thawer.get (op->body_info[4]); break; |
905 | case KW_body_neck: f.get (body_info[4]); break; |
969 | case KW_body_skill: thawer.get (op->body_info[5]); break; |
906 | case KW_body_skill: f.get (body_info[5]); break; |
970 | case KW_body_finger: thawer.get (op->body_info[6]); break; |
907 | case KW_body_finger: f.get (body_info[6]); break; |
971 | case KW_body_shoulder: thawer.get (op->body_info[7]); break; |
908 | case KW_body_shoulder: f.get (body_info[7]); break; |
972 | case KW_body_foot: thawer.get (op->body_info[8]); break; |
909 | case KW_body_foot: f.get (body_info[8]); break; |
973 | case KW_body_hand: thawer.get (op->body_info[9]); break; |
910 | case KW_body_hand: f.get (body_info[9]); break; |
974 | case KW_body_wrist: thawer.get (op->body_info[10]); break; |
911 | case KW_body_wrist: f.get (body_info[10]); break; |
975 | case KW_body_waist: thawer.get (op->body_info[11]); break; |
912 | case KW_body_waist: f.get (body_info[11]); break; |
976 | case KW_can_apply: |
913 | case KW_can_apply: |
977 | break; |
914 | break; |
978 | |
915 | |
979 | case KW_connected: |
916 | case KW_connected: |
980 | add_button_link (op, op->map, thawer.get_sint32 ()); |
917 | add_button_link (this, map, f.get_sint32 ()); |
981 | break; |
918 | break; |
982 | |
919 | |
983 | case KW_randomitems: |
920 | case KW_randomitems: |
984 | 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 ()); |
985 | break; |
924 | break; |
986 | |
925 | |
987 | case KW_msg: |
926 | case KW_msg: |
988 | thawer.get_ml (KW_endmsg, op->msg); |
927 | f.get_ml (KW_endmsg, msg); |
989 | //TODO: allow longer messages |
928 | //TODO: allow longer messages |
990 | if (strlen (op->msg) >= HUGE_BUF) |
929 | if (strlen (msg) >= HUGE_BUF) |
991 | { |
930 | { |
992 | LOG (llevDebug, "\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); |
993 | op->msg = "ERROR, please report: string too long, winged.\n"; |
932 | msg = "ERROR, please report: string too long, winged.\n"; |
994 | } |
933 | } |
995 | break; |
934 | break; |
996 | |
935 | |
997 | case KW_lore: |
936 | case KW_lore: |
998 | thawer.get_ml (KW_endlore, op->lore); |
937 | f.get_ml (KW_endlore, lore); |
999 | //TODO: allow longer messages |
938 | //TODO: allow longer messages |
1000 | /* Just print a warning so we can be reasonably safe |
939 | /* Just print a warning so we can be reasonably safe |
1001 | * about not overflowing the buffer. |
940 | * about not overflowing the buffer. |
1002 | */ |
941 | */ |
1003 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
942 | if (strlen (lore) > (HUGE_BUF / 2)) |
1004 | LOG (llevDebug, "\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", |
1005 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
944 | HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore); |
1006 | break; |
945 | break; |
1007 | |
946 | |
1008 | case KW_editable: |
947 | case KW_editable: |
1009 | case KW_editor_folder: |
948 | case KW_editor_folder: |
1010 | break; |
949 | break; |
1011 | |
950 | |
1012 | case KW_More: // uppercase alias |
|
|
1013 | case KW_more: |
|
|
1014 | /* We need to record that this is a multipart object, |
|
|
1015 | * so the calling function can glue things back together |
|
|
1016 | */ |
|
|
1017 | ismore = 1; |
|
|
1018 | break; |
|
|
1019 | |
|
|
1020 | case KW_end: |
951 | case KW_end: |
1021 | check_loaded_object (op); |
952 | check_loaded_object (this); |
1022 | |
953 | |
1023 | if (!arch_init) |
954 | if (!arch_init) |
1024 | op->instantiate (); |
955 | instantiate (); |
1025 | |
956 | |
1026 | return ismore ? LL_MORE : LL_NORMAL; |
957 | f.next (); |
1027 | |
|
|
1028 | case KW_EOF: |
|
|
1029 | return LL_EOF; |
958 | return true; |
1030 | |
959 | |
1031 | case KW_ERROR: |
960 | case KW_ERROR: |
1032 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
961 | set_ob_key_value (this, f.kw_str, f.value, true); |
1033 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D |
962 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
1034 | break; |
963 | break; |
1035 | |
964 | |
1036 | default: |
965 | default: |
1037 | 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; |
1038 | break; |
968 | break; |
1039 | } |
969 | } |
|
|
970 | |
|
|
971 | f.next (); |
1040 | } |
972 | } |
1041 | } |
973 | } |
1042 | |
974 | |
1043 | /* |
975 | object * |
1044 | * Loads an object from the given file-pointer. |
976 | object::read (object_thawer &f, maptile *map) |
1045 | * Variables will be read and parsed and patched into the object |
|
|
1046 | * until the string "end" is reached, or the end of the file. |
|
|
1047 | * |
|
|
1048 | * bufstat is used to determine various file attributes: |
|
|
1049 | * LO_REPATE (0): We are reading from the same buffer as the last call. |
|
|
1050 | * LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions |
|
|
1051 | * will also be reading from this (treasure file, artifacts.) |
|
|
1052 | * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should |
|
|
1053 | * be reset. |
|
|
1054 | * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) |
|
|
1055 | * |
|
|
1056 | */ |
|
|
1057 | int |
|
|
1058 | load_object (object_thawer &fp, object *op, int map_flags) |
|
|
1059 | { |
977 | { |
1060 | coroapi::cede_every (1000); // cede once in a while |
978 | assert (f.kw == KW_arch); |
1061 | |
979 | |
1062 | return parse_object (op, fp, map_flags); |
980 | archetype *arch = archetype::find (f.get_str ()); |
|
|
981 | |
|
|
982 | if (!arch) |
|
|
983 | { |
|
|
984 | LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); |
|
|
985 | arch = archetype::find ("earthwall"); |
|
|
986 | } |
|
|
987 | |
|
|
988 | assert (arch); //D maybe use exception handling of sorts? |
|
|
989 | |
|
|
990 | object *op = object::create (); |
|
|
991 | |
|
|
992 | op->map = map; |
|
|
993 | op->arch = arch; |
|
|
994 | arch->clone.copy_to (op); |
|
|
995 | // copy_to activates, this should be fixed properly |
|
|
996 | op->deactivate (); |
|
|
997 | |
|
|
998 | if (!op->parse_kv (f)) |
|
|
999 | { |
|
|
1000 | delete op; |
|
|
1001 | return 0; |
|
|
1002 | } |
|
|
1003 | |
|
|
1004 | return op; |
1063 | } |
1005 | } |
1064 | |
1006 | |
1065 | /* This takes a buffer, scans it for variables, and sets those variables |
1007 | /* This takes a buffer, scans it for variables, and sets those variables |
1066 | * as appropriate in op. |
1008 | * as appropriate in op. |
1067 | * |
1009 | * |
… | |
… | |
1069 | * override values and in c_wiz to mutate values. |
1011 | * override values and in c_wiz to mutate values. |
1070 | */ |
1012 | */ |
1071 | int |
1013 | int |
1072 | set_variable (object *op, char *buf) |
1014 | set_variable (object *op, char *buf) |
1073 | { |
1015 | { |
1074 | object_thawer thawer (buf, (AV *)0); |
1016 | object_thawer f (buf, (AV *)0); |
1075 | |
1017 | |
1076 | return parse_object (op, thawer, 0); |
1018 | return op->parse_kv (f); |
1077 | } |
|
|
1078 | |
|
|
1079 | /* |
|
|
1080 | * Initialises the array of variable-names. Needed before any |
|
|
1081 | * objects can be loaded. Called by init_library(). |
|
|
1082 | */ |
|
|
1083 | |
|
|
1084 | void |
|
|
1085 | init_vars () |
|
|
1086 | { |
|
|
1087 | } |
1019 | } |
1088 | |
1020 | |
1089 | /* This returns a string of the integer movement type */ |
1021 | /* This returns a string of the integer movement type */ |
1090 | #if 0 |
1022 | #if 0 |
1091 | // unused function |
1023 | // unused function |
… | |
… | |
1136 | return retbuf + 1; |
1068 | return retbuf + 1; |
1137 | } |
1069 | } |
1138 | #endif |
1070 | #endif |
1139 | |
1071 | |
1140 | // compare *op against *tmp and output differences |
1072 | // compare *op against *tmp and output differences |
1141 | void |
1073 | static void |
1142 | put (object_freezer &f, object *op, object *tmp) |
1074 | write_diff (object_freezer &f, object *op, object *tmp) |
1143 | { |
1075 | { |
1144 | static const keyword resist_save[NROFATTACKS] = { |
1076 | static const keyword resist_save[NROFATTACKS] = { |
1145 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1077 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1146 | # include "attackinc.h" |
1078 | # include "attackinc.h" |
1147 | # undef def |
1079 | # undef def |
… | |
… | |
1376 | f.put (resist_save[i], op->resist[i]); |
1308 | f.put (resist_save[i], op->resist[i]); |
1377 | |
1309 | |
1378 | CMP_OUT (path_attuned); |
1310 | CMP_OUT (path_attuned); |
1379 | CMP_OUT (path_repelled); |
1311 | CMP_OUT (path_repelled); |
1380 | CMP_OUT (path_denied); |
1312 | CMP_OUT (path_denied); |
1381 | CMP_OUT (material); |
1313 | CMP_OUT2 (material, materials);//TODO: nuke |
1382 | CMP_OUT (materialname); |
1314 | CMP_OUT (materialname); |
1383 | CMP_OUT (value); |
1315 | CMP_OUT (value); |
1384 | CMP_OUT (carrying); |
1316 | CMP_OUT (carrying); |
1385 | CMP_OUT (weight); |
1317 | CMP_OUT (weight); |
1386 | CMP_OUT (invisible); |
1318 | CMP_OUT (invisible); |
… | |
… | |
1436 | /* |
1368 | /* |
1437 | * Dumps all variables in an object to a file. |
1369 | * Dumps all variables in an object to a file. |
1438 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1370 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1439 | * the only place this is not set is when saving the player. |
1371 | * the only place this is not set is when saving the player. |
1440 | */ |
1372 | */ |
1441 | void |
1373 | bool |
1442 | save_object (object_freezer &fp, object *op, int flag) |
1374 | object::write (object_freezer &f) |
1443 | { |
1375 | { |
1444 | /* Even if the object does have an owner, it would seem that we should |
1376 | /* Even if the object does have an owner, it would seem that we should |
1445 | * still save it. |
1377 | * still save it. |
1446 | */ |
1378 | */ |
1447 | if (op->owner) |
1379 | if (owner) |
1448 | return; |
1380 | return true; |
1449 | |
1381 | |
1450 | /* If it is unpaid and we don't want to save those, just return. */ |
|
|
1451 | if (!(flag & 1) && op->flag [FLAG_UNPAID]) |
|
|
1452 | return; |
|
|
1453 | |
|
|
1454 | archetype *at = op->arch ? (archetype *)op->arch : empty_archetype; |
1382 | archetype *at = arch ? (archetype *)arch : empty_archetype; |
1455 | |
1383 | |
1456 | fp.put (KW_arch, at->name); |
1384 | f.put (KW_arch, at->name); |
1457 | put (fp, op, &at->clone); |
1385 | write_diff (f, this, &at->clone); |
1458 | |
1386 | |
1459 | /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ |
|
|
1460 | |
|
|
1461 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1387 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1462 | save_object (fp, tmp, flag); |
1388 | tmp->write (f); |
1463 | |
1389 | |
1464 | fp.put (op); |
1390 | f.put (this); |
1465 | fp.put (KW_end); |
1391 | f.put (KW_end); |
|
|
1392 | |
|
|
1393 | return true; |
1466 | } |
1394 | } |
1467 | |
1395 | |
|
|
1396 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1397 | |
|
|
1398 | bool load_resource_file (const char *filename) |
|
|
1399 | { |
|
|
1400 | object_thawer f (filename); |
|
|
1401 | |
|
|
1402 | f.next (); |
|
|
1403 | |
|
|
1404 | for (;;) |
|
|
1405 | { |
|
|
1406 | switch (f.kw) |
|
|
1407 | { |
|
|
1408 | case KW_region: |
|
|
1409 | if (!region::read (f)) |
|
|
1410 | return false; |
|
|
1411 | break; |
|
|
1412 | |
|
|
1413 | case KW_EOF: |
|
|
1414 | return true; |
|
|
1415 | |
|
|
1416 | default: |
|
|
1417 | if (!f.parse_error ("resource file")) |
|
|
1418 | return false; |
|
|
1419 | } |
|
|
1420 | |
|
|
1421 | f.next (); |
|
|
1422 | } |
|
|
1423 | } |
|
|
1424 | |