1 | /* |
1 | /* |
2 | * CrossFire, A Multiplayer game |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * Deliantra 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 3 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, see <http://www.gnu.org/licenses/>. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
|
|
21 | * |
20 | * |
22 | * The authors can be reached via e-mail at <crossfire@schmorp.de> |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
22 | */ |
24 | |
|
|
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
|
|
26 | sub/add_weight will transcend the environment updating the carrying |
|
|
27 | variable. */ |
|
|
28 | |
23 | |
29 | #include <global.h> |
24 | #include <global.h> |
30 | #include <loader.h> |
25 | #include <loader.h> |
31 | #include <sproto.h> |
26 | #include <sproto.h> |
32 | |
27 | |
33 | ///////////////////////////////////////////////////////////////////////////// |
28 | ///////////////////////////////////////////////////////////////////////////// |
|
|
29 | |
|
|
30 | extern archetype *loading_arch; |
34 | |
31 | |
35 | /* This table is only necessary to convert objects that existed before the |
32 | /* This table is only necessary to convert objects that existed before the |
36 | * spell object conversion to the new object. It was not practical |
33 | * spell object conversion to the new object. It was not practical |
37 | * to go through every mapping looking for every potion, rod, wand, etc |
34 | * to go through every mapping looking for every potion, rod, wand, etc |
38 | * that had a sp set and update to the new value. So this maps the |
35 | * that had a sp set and update to the new value. So this maps the |
… | |
… | |
168 | "spell_magic_drain", /* 122 */ |
165 | "spell_magic_drain", /* 122 */ |
169 | "spell_counterspell", /* 123 */ |
166 | "spell_counterspell", /* 123 */ |
170 | "spell_disarm", /* 124 */ |
167 | "spell_disarm", /* 124 */ |
171 | "spell_cure_confusion", /* 125 */ |
168 | "spell_cure_confusion", /* 125 */ |
172 | "spell_restoration", /* 126 */ |
169 | "spell_restoration", /* 126 */ |
173 | "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ |
170 | "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */ |
174 | "spell_counterwall", /* 128 */ |
171 | "spell_counterwall", /* 128 */ |
175 | "spell_cause_light_wounds", /* 129 */ |
172 | "spell_cause_light_wounds", /* 129 */ |
176 | "spell_cause_medium_wounds", /* 130 */ |
173 | "spell_cause_medium_wounds", /* 130 */ |
177 | "spell_cause_heavy_wounds", /* 131 */ |
174 | "spell_cause_heavy_wounds", /* 131 */ |
178 | "spell_charm_monsters", /* 132 */ |
175 | "spell_charm_monsters", /* 132 */ |
… | |
… | |
250 | "spell_cause_rabies", /* 204 */ |
247 | "spell_cause_rabies", /* 204 */ |
251 | "spell_glyph", /* 205 */ |
248 | "spell_glyph", /* 205 */ |
252 | NULL |
249 | NULL |
253 | }; |
250 | }; |
254 | |
251 | |
255 | extern bool loading_arch; |
|
|
256 | |
|
|
257 | /* This function checks the object after it has been loaded (when we |
252 | /* This function checks the object after it has been loaded (when we |
258 | * get the 'end' in the input stream). This function can be used to |
253 | * get the 'end' in the input stream). This function can be used to |
259 | * deal with legacy objects where fields may have changed. It can also be used |
254 | * deal with legacy objects where fields may have changed. It can also be used |
260 | * to check for objects to make sure there are no common errors. |
255 | * to check for objects to make sure there are no common errors. |
261 | */ |
256 | */ |
262 | void |
257 | void |
263 | object::post_load_check () |
258 | object::post_load_check () |
264 | { |
259 | { |
265 | // as a kind of a hack, we now adjust the range, shield and combat slots |
260 | if (type >= NUM_TYPES) |
|
|
261 | { |
|
|
262 | LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); |
|
|
263 | type = 0; |
|
|
264 | } |
|
|
265 | |
266 | switch (type) |
266 | switch (type) |
267 | { |
267 | { |
268 | case BOW: |
268 | case BOW: |
269 | case WAND: |
269 | case WAND: |
270 | case ROD: |
270 | case ROD: |
271 | case HORN: |
271 | case HORN: |
272 | case SKILL: // maybe have to think about this one, as skills get applied togethr with their governing weapons |
|
|
273 | case SKILL_TOOL: |
|
|
274 | if (slot [body_range].info != -1) |
272 | if (slot [body_range].info != -1) |
275 | { |
273 | { |
276 | LOG (llevInfo, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); |
274 | LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); |
277 | slot [body_range].info = -1; |
275 | slot [body_range].info = -1; |
278 | } |
276 | } |
279 | break; |
277 | break; |
280 | |
278 | |
281 | case WEAPON: |
279 | case WEAPON: |
282 | if (slot [body_combat].info != -1) |
280 | if (slot [body_combat].info != -1) |
283 | { |
281 | { |
284 | LOG (llevInfo, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); |
282 | LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); |
285 | slot [body_combat].info = -1; |
283 | slot [body_combat].info = -1; |
286 | } |
284 | } |
287 | break; |
285 | break; |
288 | |
286 | |
289 | case SHIELD: |
287 | case SHIELD: |
290 | if (slot [body_shield].info != -1) |
288 | if (slot [body_shield].info != -1) |
291 | { |
289 | { |
292 | LOG (llevInfo, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); |
290 | LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); |
293 | slot [body_shield].info = -1; |
291 | slot [body_shield].info = -1; |
294 | } |
292 | } |
295 | break; |
293 | break; |
296 | |
294 | |
297 | case PLAYER: |
295 | case PLAYER: |
298 | if (slot [body_shield].info != 1) |
296 | if (slot [body_shield].info != 1) |
299 | { |
297 | { |
300 | LOG (llevInfo, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); |
298 | LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); |
301 | slot [body_shield].info = 1; |
299 | slot [body_shield].info = 1; |
302 | } |
300 | } |
303 | |
301 | |
304 | if (slot [body_combat].info != 1) |
302 | if (slot [body_combat].info != 1) |
305 | { |
303 | { |
306 | LOG (llevInfo, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); |
304 | LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); |
307 | slot [body_combat].info = 1; |
305 | slot [body_combat].info = 1; |
308 | } |
306 | } |
309 | |
307 | |
310 | if (slot [body_range].info != 1) |
308 | if (slot [body_range].info != 1) |
311 | { |
309 | { |
312 | LOG (llevInfo, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); |
310 | LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); |
313 | slot [body_range].info = 1; |
311 | slot [body_range].info = 1; |
314 | } |
312 | } |
315 | break; |
313 | break; |
316 | } |
314 | } |
317 | |
315 | |
… | |
… | |
322 | * also have to catch is if this object is not using the normal name for |
320 | * also have to catch is if this object is not using the normal name for |
323 | * the object. In that case, we also want to use the loaded name. |
321 | * the object. In that case, we also want to use the loaded name. |
324 | * Otherwise, what happens is that the the plural name will lose |
322 | * Otherwise, what happens is that the the plural name will lose |
325 | * information (appear as just 'hearts' and not 'goblins heart') |
323 | * information (appear as just 'hearts' and not 'goblins heart') |
326 | */ |
324 | */ |
327 | if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl) |
325 | if (arch && name != arch->object::name && name_pl == arch->object::name_pl) |
328 | name_pl = 0; |
326 | name_pl = 0; |
329 | |
327 | |
330 | if (!name_pl) |
328 | if (!name_pl) |
331 | name_pl = name; |
329 | name_pl = name; |
332 | |
330 | |
… | |
… | |
359 | || type == AMULET || type == GIRDLE |
357 | || type == AMULET || type == GIRDLE |
360 | || type == BRACERS || type == CLOAK) |
358 | || type == BRACERS || type == CLOAK) |
361 | { |
359 | { |
362 | if (last_heal) |
360 | if (last_heal) |
363 | { |
361 | { |
364 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); |
362 | LOG (llevError, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); |
365 | gen_sp_armour = last_heal; |
363 | gen_sp_armour = last_heal; |
366 | last_heal = 0; |
364 | last_heal = 0; |
367 | } |
365 | } |
368 | |
366 | |
369 | int ip = calc_item_power (this, 0); |
367 | int ip = calc_item_power (this, 0); |
… | |
… | |
381 | * something that has item_power 1 is probably just fine if our calculated |
379 | * something that has item_power 1 is probably just fine if our calculated |
382 | * value is 1 or 2 - these values are small enough that hard to be precise. |
380 | * value is 1 or 2 - these values are small enough that hard to be precise. |
383 | * similarly, it item_power is 0, the first check will always pass, |
381 | * similarly, it item_power is 0, the first check will always pass, |
384 | * but not the second one. |
382 | * but not the second one. |
385 | */ |
383 | */ |
|
|
384 | #if 0 //TODO |
386 | if (ip > 2 * item_power && ip > (item_power + 3)) |
385 | if (ip > 2 * item_power && ip > (item_power + 3)) |
387 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
386 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
|
|
387 | #endif |
388 | } |
388 | } |
389 | |
389 | |
390 | /* Old spellcasting object - need to load in the appropiate object */ |
390 | /* Old spellcasting object - need to load in the appropiate object */ |
391 | if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || |
391 | if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || |
392 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
392 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
393 | ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) |
393 | ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) |
394 | { |
394 | { |
395 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
395 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
396 | * in that spell was stored in sp. |
396 | * in that spell was stored in sp. |
397 | */ |
397 | */ |
|
|
398 | LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
398 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
399 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
399 | insert_ob_in_ob (tmp, this); |
400 | insert_ob_in_ob (tmp, this); |
400 | randomitems = NULL; /* So another spell isn't created for this object */ |
401 | randomitems = NULL; /* So another spell isn't created for this object */ |
401 | } |
402 | } |
402 | |
403 | |
403 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
404 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
404 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
405 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
405 | { |
406 | { |
|
|
407 | LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ()); |
406 | object *tmp = get_archetype_by_object_name (slaying); |
408 | object *tmp = get_archetype_by_object_name (slaying); |
407 | insert_ob_in_ob (tmp, this); |
409 | insert_ob_in_ob (tmp, this); |
408 | randomitems = NULL; /* So another spell isn't created for this object */ |
410 | randomitems = 0; /* So another spell isn't created for this object */ |
409 | /* without this, value is all screwed up */ |
411 | /* without this, value is all screwed up */ |
410 | value = arch->clone.value * inv->value; |
412 | value = arch->value * inv->value; |
411 | } |
413 | } |
412 | |
414 | |
413 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
415 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
414 | { |
416 | { |
415 | if (stats.hp > stats.maxhp) |
417 | if (stats.hp > stats.maxhp) |
416 | { |
418 | { |
417 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
419 | LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
418 | stats.maxhp = stats.hp; |
420 | stats.maxhp = stats.hp; |
419 | } |
421 | } |
420 | |
422 | |
421 | /* The archs just need to be updated for this */ |
423 | /* The archs just need to be updated for this */ |
422 | if (move_type == 0) |
424 | if (move_type == 0) |
423 | move_type = MOVE_WALK; |
425 | move_type = MOVE_WALK; |
424 | } |
426 | } |
425 | |
427 | |
426 | if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) |
428 | if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) |
427 | { |
|
|
428 | /* Object will duplicate it's content as part of the |
429 | /* Object will duplicate it's content as part of the |
429 | * generation process. To do this, we must flag inventory |
430 | * generation process. To do this, we must flag inventory |
430 | * so it remains unevaluated concerning the randomitems and |
431 | * so it remains unevaluated concerning the randomitems and |
431 | * the living (a demonlord shouldn't cast from inside generator!) |
432 | * the living (a demonlord shouldn't cast from inside generator!) |
432 | */ |
433 | */ |
|
|
434 | /* ??? this *should* be done elsewhere, e.g. after map loading etc. */ |
433 | flag_inv (this, FLAG_IS_A_TEMPLATE); |
435 | flag_inv (this, FLAG_IS_A_TEMPLATE); |
434 | } |
|
|
435 | |
436 | |
436 | /* Handle player movers. We use move_type for player movers |
437 | /* Handle player movers. We use move_type for player movers |
437 | * because they operate on their own time (move_on |
438 | * because they operate on their own time (move_on |
438 | * would potentially cause them to be triggered when someone steps |
439 | * would potentially cause them to be triggered when someone steps |
439 | * on them). If move_type is set, presume person knows what they |
440 | * on them). If move_type is set, presume person knows what they |
440 | * are doing, otherwise, set move_type based on maxhp value. |
441 | * are doing, otherwise, set move_type based on maxhp value. |
441 | */ |
442 | */ |
442 | if (type == PLAYERMOVER) |
443 | if (type == PLAYERMOVER) |
443 | { |
444 | { |
444 | if (!move_type) |
445 | if (!move_type) |
… | |
… | |
506 | |
507 | |
507 | goto next; |
508 | goto next; |
508 | } |
509 | } |
509 | } |
510 | } |
510 | |
511 | |
511 | LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); |
512 | LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str); |
512 | |
513 | |
513 | next: ; |
514 | next: ; |
514 | } |
515 | } |
515 | } |
516 | } |
516 | |
517 | |
517 | #define GET_FLAG(op,flag) \ |
518 | #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () |
518 | if (f.get_sint32 ()) \ |
|
|
519 | SET_FLAG (op, flag); \ |
|
|
520 | else \ |
|
|
521 | CLEAR_FLAG (op, flag) \ |
|
|
522 | |
519 | |
523 | bool |
520 | bool |
524 | object::parse_kv (object_thawer &f) |
521 | object::parse_kv (object_thawer &f) |
525 | { |
522 | { |
526 | object *op_inv = inv; |
523 | object *op_inv = inv; |
|
|
524 | key_value *last_kv = key_values; |
527 | |
525 | |
528 | for (;;) |
526 | for (;;) |
529 | { |
527 | { |
530 | switch (f.kw) |
528 | switch (f.kw) |
531 | { |
529 | { |
532 | case KW_uuid: |
530 | case KW_uuid: |
533 | if (const char *s = f.get_str ()) |
531 | if (const char *s = f.get_str ()) |
534 | { |
532 | if (!uuid.parse (s)) |
535 | unsigned int version; |
|
|
536 | unsigned long long seq; |
|
|
537 | |
|
|
538 | if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) |
|
|
539 | { |
533 | { |
540 | uuid.seq = seq; |
534 | f.parse_warn ("unparseable uuid"); |
541 | break; |
535 | uuid = UUID::gen (); |
542 | } |
536 | } |
543 | } |
|
|
544 | |
|
|
545 | uuid = gen_uuid (); |
|
|
546 | break; |
537 | break; |
547 | |
538 | |
548 | case KW_oid: |
539 | case KW_oid: |
549 | f.get (this, f.get_sint32 ()); |
540 | f.get (this, f.get_sint32 ()); |
550 | break; |
541 | break; |
… | |
… | |
556 | |
547 | |
557 | case KW_attach: f.get_ornull (attach); break; |
548 | case KW_attach: f.get_ornull (attach); break; |
558 | case KW_skill: f.get_ornull (skill); break; |
549 | case KW_skill: f.get_ornull (skill); break; |
559 | case KW_race: f.get_ornull (race); break; |
550 | case KW_race: f.get_ornull (race); break; |
560 | case KW_slaying: f.get_ornull (slaying); break; |
551 | case KW_slaying: f.get_ornull (slaying); break; |
|
|
552 | case KW_tag: f.get_ornull (tag); break; |
561 | |
553 | |
562 | case KW_arch: |
554 | case KW_arch: |
563 | { |
555 | { |
564 | object *tmp = object::read (f); |
556 | object *tmp = object::read (f); |
565 | tmp->deactivate (); |
557 | tmp->deactivate (); |
… | |
… | |
567 | { |
559 | { |
568 | // was: insert_ob_in_ob (tmp, op); |
560 | // was: insert_ob_in_ob (tmp, op); |
569 | // but manually adding it can improve map loading times a lot |
561 | // but manually adding it can improve map loading times a lot |
570 | // also, appending instead of prepending keeps the |
562 | // also, appending instead of prepending keeps the |
571 | // save ordering the same between repeated load/saves. |
563 | // save ordering the same between repeated load/saves. |
|
|
564 | // and finally we do not want any funny effects |
572 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
565 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
573 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
566 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
574 | |
567 | |
575 | if (!op_inv) |
568 | if (!op_inv) |
576 | { |
569 | { |
… | |
… | |
592 | } |
585 | } |
593 | } |
586 | } |
594 | continue; |
587 | continue; |
595 | |
588 | |
596 | case KW_other_arch: |
589 | case KW_other_arch: |
597 | other_arch = |
|
|
598 | loading_arch |
590 | if (loading_arch == this) |
599 | ? archetype::get (f.get_str ()) |
591 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
|
|
592 | else |
|
|
593 | { |
600 | : archetype::find (f.get_str ()); |
594 | other_arch = archetype::find (f.get_str ()); |
601 | |
595 | |
602 | if (!other_arch) |
596 | if (!other_arch) |
603 | LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); |
597 | f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ())); |
|
|
598 | } |
|
|
599 | break; |
|
|
600 | |
|
|
601 | case KW_owner: |
|
|
602 | f.delayed_deref (this, owner, f.get_str ()); |
604 | break; |
603 | break; |
605 | |
604 | |
606 | case KW_animation: |
605 | case KW_animation: |
607 | { |
606 | { |
608 | CLEAR_FLAG (this, FLAG_ANIMATE); |
607 | CLEAR_FLAG (this, FLAG_ANIMATE); |
… | |
… | |
635 | f.get (move_slow_penalty); |
634 | f.get (move_slow_penalty); |
636 | break; |
635 | break; |
637 | |
636 | |
638 | case KW_face: |
637 | case KW_face: |
639 | face = face_find (f.get_str ()); |
638 | face = face_find (f.get_str ()); |
|
|
639 | break; |
|
|
640 | |
|
|
641 | case KW_sound: |
|
|
642 | sound = sound_find (f.get_str ()); |
|
|
643 | if (!sound) |
|
|
644 | f.parse_warn ("sound not found"); |
|
|
645 | break; |
|
|
646 | |
|
|
647 | case KW_sound_destroy: |
|
|
648 | sound_destroy = sound_find (f.get_str ()); |
|
|
649 | if (!sound_destroy) |
|
|
650 | f.parse_warn ("sound not found"); |
640 | break; |
651 | break; |
641 | |
652 | |
642 | case KW_x: f.get (x); break; |
653 | case KW_x: f.get (x); break; |
643 | case KW_y: f.get (y); break; |
654 | case KW_y: f.get (y); break; |
644 | |
655 | |
… | |
… | |
771 | if (QUERY_FLAG (this, FLAG_IDENTIFIED)) |
782 | if (QUERY_FLAG (this, FLAG_IDENTIFIED)) |
772 | CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); |
783 | CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); |
773 | |
784 | |
774 | break; |
785 | break; |
775 | |
786 | |
776 | case KW_wiz: |
|
|
777 | GET_FLAG (this, FLAG_WIZ); |
|
|
778 | //TODO: move to check_object |
|
|
779 | if (QUERY_FLAG (this, FLAG_WIZ)) |
|
|
780 | { |
|
|
781 | SET_FLAG (this, FLAG_WAS_WIZ); |
|
|
782 | SET_FLAG (this, FLAG_WIZPASS); |
|
|
783 | SET_FLAG (this, FLAG_WIZCAST); |
|
|
784 | } |
|
|
785 | else |
|
|
786 | { |
|
|
787 | CLEAR_FLAG (this, FLAG_WIZPASS); |
|
|
788 | CLEAR_FLAG (this, FLAG_WIZCAST); |
|
|
789 | } |
|
|
790 | break; |
|
|
791 | |
|
|
792 | case KW_friendly: |
787 | case KW_friendly: |
793 | if (f.get_sint32 ()) |
788 | if (f.get_bool ()) |
794 | if (type != PLAYER) |
789 | if (type != PLAYER) |
795 | add_friendly_object (this); |
790 | add_friendly_object (this); |
796 | |
791 | |
797 | break; |
792 | break; |
798 | |
793 | |
… | |
… | |
811 | case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; |
806 | case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; |
812 | case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; |
807 | case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; |
813 | case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; |
808 | case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; |
814 | case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; |
809 | case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; |
815 | case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; |
810 | case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; |
|
|
811 | case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break; |
816 | case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; |
812 | case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; |
817 | case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; |
813 | case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; |
818 | case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; |
814 | case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; |
819 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
815 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
820 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
816 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
… | |
… | |
827 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
823 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
828 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
824 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
829 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
825 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
830 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
826 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
831 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
827 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
832 | case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break; |
|
|
833 | case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; |
828 | case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; |
834 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
829 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
835 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
830 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
836 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
831 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
837 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
832 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
… | |
… | |
975 | randomitems = 0; |
970 | randomitems = 0; |
976 | break; |
971 | break; |
977 | |
972 | |
978 | case KW_msg: |
973 | case KW_msg: |
979 | f.get_ml (KW_endmsg, msg); |
974 | f.get_ml (KW_endmsg, msg); |
980 | //TODO: allow longer messages |
|
|
981 | if (strlen (msg) >= HUGE_BUF) |
|
|
982 | { |
|
|
983 | LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg); |
|
|
984 | msg = "ERROR, please report: string too long, winged.\n"; |
|
|
985 | } |
|
|
986 | break; |
975 | break; |
987 | |
976 | |
988 | case KW_lore: |
977 | case KW_lore: |
989 | f.get_ml (KW_endlore, lore); |
978 | f.get_ml (KW_endlore, lore); |
990 | //TODO: allow longer messages |
|
|
991 | /* Just print a warning so we can be reasonably safe |
|
|
992 | * about not overflowing the buffer. |
|
|
993 | */ |
|
|
994 | if (strlen (lore) > (HUGE_BUF / 2)) |
|
|
995 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
|
|
996 | HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore); |
|
|
997 | break; |
979 | break; |
998 | |
980 | |
999 | case KW_editable: |
981 | case KW_editable: |
1000 | case KW_editor_folder: |
982 | case KW_editor_folder: |
1001 | break; |
983 | break; |
… | |
… | |
1006 | |
988 | |
1007 | f.next (); |
989 | f.next (); |
1008 | return true; |
990 | return true; |
1009 | |
991 | |
1010 | case KW_ERROR: |
992 | case KW_ERROR: |
1011 | set_ob_key_value (this, f.kw_str, f.value, true); |
993 | // append as key value pair (do not use kv_set as it prepends) |
|
|
994 | // we also do not even try to find old values, duplicate keys stay duplicate |
|
|
995 | { |
|
|
996 | key_value *kv = new key_value; |
|
|
997 | |
|
|
998 | kv->next = 0; |
|
|
999 | kv->key = shstr (f.kw_str); |
|
|
1000 | kv->value = shstr (f.value); |
|
|
1001 | |
|
|
1002 | if (!last_kv) |
|
|
1003 | key_values = last_kv = kv; |
|
|
1004 | else |
|
|
1005 | { |
|
|
1006 | while (last_kv->next) |
|
|
1007 | last_kv = last_kv->next; |
|
|
1008 | |
|
|
1009 | last_kv->next = kv; |
|
|
1010 | last_kv = kv; |
|
|
1011 | } |
|
|
1012 | } |
1012 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
1013 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
1013 | break; |
1014 | break; |
1014 | |
1015 | |
1015 | default: |
1016 | default: |
1016 | if (!f.parse_error ("object", name)) |
1017 | if (!f.parse_error ("object", name)) |
… | |
… | |
1037 | |
1038 | |
1038 | assert (arch); //D maybe use exception handling of sorts? |
1039 | assert (arch); //D maybe use exception handling of sorts? |
1039 | |
1040 | |
1040 | f.next (); |
1041 | f.next (); |
1041 | |
1042 | |
1042 | object *op = object::create (); |
1043 | object *op = arch->instance (); |
1043 | |
|
|
1044 | op->map = map; |
1044 | op->map = map; |
1045 | arch->clone.copy_to (op); |
|
|
1046 | // copy_to activates, this should be fixed properly |
1045 | // instance() activates, this should be fixed properly |
1047 | op->deactivate (); |
1046 | op->deactivate (); |
1048 | |
1047 | |
1049 | if (!op->parse_kv (f)) |
1048 | if (!op->parse_kv (f)) |
1050 | { |
1049 | { |
1051 | op->destroy (true); |
1050 | op->destroy (true); |
… | |
… | |
1065 | int |
1064 | int |
1066 | set_variable (object *op, char *buf) |
1065 | set_variable (object *op, char *buf) |
1067 | { |
1066 | { |
1068 | object_thawer f (buf, (AV *)0); |
1067 | object_thawer f (buf, (AV *)0); |
1069 | |
1068 | |
1070 | f.next (); |
|
|
1071 | return op->parse_kv (f); |
1069 | return op->parse_kv (f); |
1072 | } |
1070 | } |
1073 | |
1071 | |
1074 | /* This returns a string of the integer movement type */ |
1072 | /* This returns a string of the integer movement type */ |
1075 | #if 0 |
1073 | #if 0 |
… | |
… | |
1137 | * the 15'th element of this array should match that name. |
1135 | * the 15'th element of this array should match that name. |
1138 | * If an entry is NULL, that is a flag not to loaded/saved. |
1136 | * If an entry is NULL, that is a flag not to loaded/saved. |
1139 | */ |
1137 | */ |
1140 | static const keyword flag_names [NUM_FLAGS] = { |
1138 | static const keyword flag_names [NUM_FLAGS] = { |
1141 | KW_alive, |
1139 | KW_alive, |
1142 | KW_wiz, |
|
|
1143 | KW_NULL, |
1140 | KW_NULL, |
1144 | KW_NULL, |
1141 | KW_NULL, |
1145 | KW_was_wiz, |
1142 | KW_NULL, |
|
|
1143 | KW_NULL, |
1146 | KW_applied, |
1144 | KW_applied, |
1147 | KW_unpaid, |
1145 | KW_unpaid, |
1148 | KW_can_use_shield, |
1146 | KW_can_use_shield, |
1149 | KW_no_pick, |
1147 | KW_no_pick, |
1150 | KW_NULL, // walk_on |
1148 | KW_NULL, // walk_on |
… | |
… | |
1262 | /* 110 */ |
1260 | /* 110 */ |
1263 | KW_destroy_on_death, |
1261 | KW_destroy_on_death, |
1264 | KW_NULL, |
1262 | KW_NULL, |
1265 | }; |
1263 | }; |
1266 | |
1264 | |
1267 | int i; |
|
|
1268 | |
|
|
1269 | /* This saves the key/value lists. We do it first so that any |
1265 | /* This saves the key/value lists. We do it first so that any |
1270 | * keys that match field names will be overwritten by the loader. |
1266 | * keys that match field names will be overwritten by the loader. |
1271 | */ |
1267 | */ |
1272 | for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) |
1268 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1273 | { |
1269 | if (!tmp->key_values || tmp->kv (kv->key) != kv->value) |
1274 | /* Find the field in the opposing member. */ |
1270 | f.put (kv->key, kv->value); |
1275 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
|
|
1276 | |
|
|
1277 | /* If there's no partnering field, or it's got a different value, save our field. */ |
|
|
1278 | if (!arch_field || my_field->value != arch_field->value) |
|
|
1279 | f.put (my_field->key, my_field->value); |
|
|
1280 | } |
|
|
1281 | |
1271 | |
1282 | /* We don't need to worry about the arch's extra fields - they |
1272 | /* We don't need to worry about the arch's extra fields - they |
1283 | * will get taken care of the copy_to method. |
1273 | * will get taken care of the copy_to method. |
1284 | */ |
1274 | */ |
1285 | |
1275 | |
1286 | { |
1276 | f.put (KW_uuid, op->uuid.c_str ()); |
1287 | char uids[64]; |
|
|
1288 | snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); |
|
|
1289 | f.put (KW_uuid, (const char *)uids); |
|
|
1290 | } |
|
|
1291 | |
1277 | |
1292 | #define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) |
1278 | #define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) |
1293 | #define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) |
1279 | #define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) |
|
|
1280 | |
|
|
1281 | if (object *owner = op->owner) |
|
|
1282 | f.put (KW_owner, static_cast<const char *>(owner->ref ())); |
1294 | |
1283 | |
1295 | CMP_OUT (name); |
1284 | CMP_OUT (name); |
1296 | CMP_OUT (name_pl); |
1285 | CMP_OUT (name_pl); |
1297 | CMP_OUT (custom_name); |
1286 | CMP_OUT (custom_name); |
1298 | CMP_OUT (title); |
1287 | CMP_OUT (title); |
1299 | CMP_OUT (race); |
1288 | CMP_OUT (race); |
|
|
1289 | CMP_OUT (skill); |
1300 | CMP_OUT (slaying); |
1290 | CMP_OUT (slaying); |
1301 | |
1291 | CMP_OUT (tag); |
1302 | if (op->msg != tmp->msg) |
|
|
1303 | f.put (KW_msg, KW_endmsg, op->msg); |
|
|
1304 | if (op->lore != tmp->lore) |
|
|
1305 | f.put (KW_lore, KW_endlore, op->lore); |
|
|
1306 | |
|
|
1307 | CMP_OUT (other_arch); |
1292 | CMP_OUT (other_arch); |
1308 | |
1293 | |
|
|
1294 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
|
|
1295 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
|
|
1296 | |
1309 | if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); |
1297 | if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); |
|
|
1298 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
|
|
1299 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1310 | |
1300 | |
1311 | if (op->animation_id != tmp->animation_id) |
1301 | if (op->animation_id != tmp->animation_id) |
1312 | if (op->animation_id) |
1302 | if (op->animation_id) |
1313 | { |
1303 | { |
1314 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1304 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1315 | |
1305 | |
1316 | if (!QUERY_FLAG (op, FLAG_ANIMATE)) |
1306 | if (!QUERY_FLAG (op, FLAG_ANIMATE)) |
1317 | f.put (KW_is_animated, (sint32) 0); |
1307 | f.put (KW_is_animated, (sint32)0); |
1318 | } |
1308 | } |
1319 | else |
1309 | else |
1320 | f.put (KW_animation, (const char *) 0); |
1310 | f.put (KW_animation, (const char *)0); |
1321 | |
1311 | |
1322 | CMP_OUT2 (str, stats.Str); |
1312 | CMP_OUT2 (str, stats.Str); |
1323 | CMP_OUT2 (dex, stats.Dex); |
1313 | CMP_OUT2 (dex, stats.Dex); |
1324 | CMP_OUT2 (con, stats.Con); |
1314 | CMP_OUT2 (con, stats.Con); |
1325 | CMP_OUT2 (wis, stats.Wis); |
1315 | CMP_OUT2 (wis, stats.Wis); |
… | |
… | |
1355 | CMP_OUT (direction); |
1345 | CMP_OUT (direction); |
1356 | CMP_OUT (type); |
1346 | CMP_OUT (type); |
1357 | CMP_OUT (subtype); |
1347 | CMP_OUT (subtype); |
1358 | CMP_OUT (attacktype); |
1348 | CMP_OUT (attacktype); |
1359 | |
1349 | |
1360 | for (i = 0; i < NROFATTACKS; i++) |
1350 | for (int i = 0; i < NROFATTACKS; i++) |
1361 | if (op->resist[i] != tmp->resist[i]) |
1351 | if (expect_false (op->resist[i] != tmp->resist[i])) |
1362 | f.put (resist_save[i], op->resist[i]); |
1352 | f.put (resist_save[i], op->resist[i]); |
1363 | |
1353 | |
1364 | CMP_OUT (path_attuned); |
1354 | CMP_OUT (path_attuned); |
1365 | CMP_OUT (path_repelled); |
1355 | CMP_OUT (path_repelled); |
1366 | CMP_OUT (path_denied); |
1356 | CMP_OUT (path_denied); |
… | |
… | |
1376 | CMP_OUT (last_sp); |
1366 | CMP_OUT (last_sp); |
1377 | CMP_OUT (last_grace); |
1367 | CMP_OUT (last_grace); |
1378 | CMP_OUT (last_eat); |
1368 | CMP_OUT (last_eat); |
1379 | CMP_OUT (glow_radius); |
1369 | CMP_OUT (glow_radius); |
1380 | |
1370 | |
1381 | if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) |
1371 | if (op->flag [FLAG_IS_LINKED]) |
|
|
1372 | if (int i = get_button_value (op)) |
1382 | f.put (KW_connected, i); |
1373 | f.put (KW_connected, i); |
1383 | |
1374 | |
1384 | CMP_OUT (randomitems); |
1375 | CMP_OUT (randomitems); |
1385 | CMP_OUT2 (container, weight_limit); |
1376 | CMP_OUT2 (container, weight_limit); |
1386 | |
1377 | |
1387 | CMP_OUT (run_away); |
1378 | CMP_OUT (run_away); |
… | |
… | |
1407 | CMP_OUT (move_off); |
1398 | CMP_OUT (move_off); |
1408 | CMP_OUT (move_slow); |
1399 | CMP_OUT (move_slow); |
1409 | CMP_OUT (move_slow_penalty); |
1400 | CMP_OUT (move_slow_penalty); |
1410 | |
1401 | |
1411 | if (op->flag != tmp->flag) |
1402 | if (op->flag != tmp->flag) |
1412 | for (i = 0; i <= NUM_FLAGS; i++) |
1403 | for (int i = 0; i <= NUM_FLAGS; i++) |
1413 | if (flag_names [i] && op->flag [i] != tmp->flag [i]) |
1404 | if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) |
1414 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1405 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1415 | |
1406 | |
1416 | // save body locations |
1407 | // save body locations |
1417 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1408 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1418 | if (op->slot[i].info != tmp->slot[i].info) |
1409 | if (expect_false (op->slot[i].info != tmp->slot[i].info)) |
1419 | f.put (body_locations[i].save_name, op->slot[i].info); |
1410 | f.put (body_locations[i].save_name, op->slot[i].info); |
1420 | } |
1411 | } |
1421 | |
1412 | |
1422 | /* |
1413 | /* |
1423 | * Dumps all variables in an object to a file. |
1414 | * Dumps all variables in an object to a file. |
… | |
… | |
1425 | * the only place this is not set is when saving the player. |
1416 | * the only place this is not set is when saving the player. |
1426 | */ |
1417 | */ |
1427 | bool |
1418 | bool |
1428 | object::write (object_freezer &f) |
1419 | object::write (object_freezer &f) |
1429 | { |
1420 | { |
1430 | /* Even if the object does have an owner, it would seem that we should |
1421 | archetype *at = arch ? arch : archetype::empty; |
1431 | * still save it. |
|
|
1432 | */ |
|
|
1433 | if (owner) |
|
|
1434 | return true; |
|
|
1435 | |
1422 | |
1436 | archetype *at = arch ? (archetype *)arch : empty_archetype; |
|
|
1437 | |
|
|
1438 | f.put (KW_arch, at->name); |
1423 | f.put (KW_arch, at->archname); |
1439 | write_diff (f, this, &at->clone); |
1424 | write_diff (f, this, at); |
1440 | |
1425 | |
1441 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1426 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1442 | tmp->write (f); |
1427 | tmp->write (f); |
1443 | |
1428 | |
1444 | f.put (this); |
1429 | f.put (this); |
… | |
… | |
1449 | |
1434 | |
1450 | ///////////////////////////////////////////////////////////////////////////// |
1435 | ///////////////////////////////////////////////////////////////////////////// |
1451 | |
1436 | |
1452 | // generic resource file load, |
1437 | // generic resource file load, |
1453 | // currently supports: region, treasures, archetypes |
1438 | // currently supports: region, treasures, archetypes |
|
|
1439 | bool |
1454 | bool load_resource_file (const char *filename) |
1440 | load_resource_file_ (const char *filename) |
1455 | { |
1441 | { |
1456 | object_thawer f (filename); |
1442 | object_thawer f (filename); |
1457 | |
|
|
1458 | bool success = false; |
|
|
1459 | bool seen_arch = false; |
|
|
1460 | |
|
|
1461 | f.next (); |
|
|
1462 | |
1443 | |
1463 | for (;;) |
1444 | for (;;) |
1464 | { |
1445 | { |
1465 | switch (f.kw) |
1446 | switch (f.kw) |
1466 | { |
1447 | { |
1467 | case KW_region: |
1448 | case KW_region: |
1468 | if (!region::read (f)) |
1449 | if (!region::read (f)) |
1469 | goto finish; |
1450 | return false; |
1470 | break; |
1451 | break; |
1471 | |
1452 | |
1472 | case KW_treasure: |
1453 | case KW_treasure: |
1473 | case KW_treasureone: |
1454 | case KW_treasureone: |
1474 | if (!treasurelist::read (f)) |
1455 | if (!treasurelist::read (f)) |
1475 | goto finish; |
1456 | return false; |
1476 | break; |
1457 | break; |
1477 | |
1458 | |
1478 | case KW_object: |
1459 | case KW_object: |
1479 | seen_arch = true; |
|
|
1480 | if (!archetype::read (f)) |
1460 | if (!archetype::read (f)) |
1481 | goto finish; |
1461 | return false; |
1482 | break; |
1462 | break; |
1483 | |
1463 | |
1484 | case KW_EOF: |
1464 | case KW_EOF: |
1485 | success = true; |
1465 | return true; |
1486 | goto finish; |
|
|
1487 | |
1466 | |
1488 | default: |
1467 | default: |
1489 | if (!f.parse_error ("resource file")) |
1468 | if (!f.parse_error ("resource file")) |
1490 | goto finish; |
1469 | return false; |
1491 | |
1470 | |
1492 | f.next (); |
1471 | f.next (); |
1493 | break; |
1472 | break; |
1494 | } |
1473 | } |
1495 | } |
1474 | } |
1496 | |
|
|
1497 | finish: |
|
|
1498 | if (seen_arch) |
|
|
1499 | init_archetype_pointers (); |
|
|
1500 | |
|
|
1501 | return success; |
|
|
1502 | } |
1475 | } |
1503 | |
1476 | |