1 | /* |
1 | /* |
2 | * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team |
4 | * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Crossfire TRT 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 3 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, |
… | |
… | |
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, see <http://www.gnu.org/licenses/>. |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
20 | * |
20 | * |
21 | * The authors can be reached via e-mail to <crossfire@schmorp.de> |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | */ |
22 | */ |
23 | |
|
|
24 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
|
|
25 | sub/add_weight will transcend the environment updating the carrying |
|
|
26 | variable. */ |
|
|
27 | |
23 | |
28 | #include <global.h> |
24 | #include <global.h> |
29 | #include <loader.h> |
25 | #include <loader.h> |
30 | #include <sproto.h> |
26 | #include <sproto.h> |
31 | |
27 | |
32 | ///////////////////////////////////////////////////////////////////////////// |
28 | ///////////////////////////////////////////////////////////////////////////// |
|
|
29 | |
|
|
30 | extern archetype *loading_arch; |
33 | |
31 | |
34 | /* 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 |
35 | * spell object conversion to the new object. It was not practical |
33 | * spell object conversion to the new object. It was not practical |
36 | * 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 |
37 | * 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 |
… | |
… | |
167 | "spell_magic_drain", /* 122 */ |
165 | "spell_magic_drain", /* 122 */ |
168 | "spell_counterspell", /* 123 */ |
166 | "spell_counterspell", /* 123 */ |
169 | "spell_disarm", /* 124 */ |
167 | "spell_disarm", /* 124 */ |
170 | "spell_cure_confusion", /* 125 */ |
168 | "spell_cure_confusion", /* 125 */ |
171 | "spell_restoration", /* 126 */ |
169 | "spell_restoration", /* 126 */ |
172 | "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ |
170 | "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */ |
173 | "spell_counterwall", /* 128 */ |
171 | "spell_counterwall", /* 128 */ |
174 | "spell_cause_light_wounds", /* 129 */ |
172 | "spell_cause_light_wounds", /* 129 */ |
175 | "spell_cause_medium_wounds", /* 130 */ |
173 | "spell_cause_medium_wounds", /* 130 */ |
176 | "spell_cause_heavy_wounds", /* 131 */ |
174 | "spell_cause_heavy_wounds", /* 131 */ |
177 | "spell_charm_monsters", /* 132 */ |
175 | "spell_charm_monsters", /* 132 */ |
… | |
… | |
249 | "spell_cause_rabies", /* 204 */ |
247 | "spell_cause_rabies", /* 204 */ |
250 | "spell_glyph", /* 205 */ |
248 | "spell_glyph", /* 205 */ |
251 | NULL |
249 | NULL |
252 | }; |
250 | }; |
253 | |
251 | |
254 | extern bool loading_arch; |
|
|
255 | |
|
|
256 | /* 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 |
257 | * 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 |
258 | * 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 |
259 | * 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. |
260 | */ |
256 | */ |
261 | void |
257 | void |
262 | object::post_load_check () |
258 | object::post_load_check () |
263 | { |
259 | { |
264 | if (type >= NUM_TYPES) |
260 | if (type >= NUM_TYPES) |
265 | { |
261 | { |
266 | LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); |
262 | LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ()); |
267 | type = 0; |
263 | type = 0; |
268 | } |
264 | } |
269 | |
265 | |
270 | switch (type) |
266 | switch (type) |
271 | { |
267 | { |
… | |
… | |
273 | case WAND: |
269 | case WAND: |
274 | case ROD: |
270 | case ROD: |
275 | case HORN: |
271 | case HORN: |
276 | if (slot [body_range].info != -1) |
272 | if (slot [body_range].info != -1) |
277 | { |
273 | { |
278 | LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); |
274 | LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info); |
279 | slot [body_range].info = -1; |
275 | slot [body_range].info = -1; |
280 | } |
276 | } |
281 | break; |
277 | break; |
282 | |
278 | |
283 | case WEAPON: |
279 | case WEAPON: |
284 | if (slot [body_combat].info != -1) |
280 | if (slot [body_combat].info != -1) |
285 | { |
281 | { |
286 | LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); |
282 | LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); |
287 | slot [body_combat].info = -1; |
283 | slot [body_combat].info = -1; |
288 | } |
284 | } |
289 | break; |
285 | break; |
290 | |
286 | |
291 | case SHIELD: |
287 | case SHIELD: |
292 | if (slot [body_shield].info != -1) |
288 | if (slot [body_shield].info != -1) |
293 | { |
289 | { |
294 | LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); |
290 | LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); |
295 | slot [body_shield].info = -1; |
291 | slot [body_shield].info = -1; |
296 | } |
292 | } |
297 | break; |
293 | break; |
298 | |
294 | |
299 | case PLAYER: |
295 | case PLAYER: |
300 | if (slot [body_shield].info != 1) |
296 | if (slot [body_shield].info != 1) |
301 | { |
297 | { |
302 | LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); |
298 | LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); |
303 | slot [body_shield].info = 1; |
299 | slot [body_shield].info = 1; |
304 | } |
300 | } |
305 | |
301 | |
306 | if (slot [body_combat].info != 1) |
302 | if (slot [body_combat].info != 1) |
307 | { |
303 | { |
308 | LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); |
304 | LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); |
309 | slot [body_combat].info = 1; |
305 | slot [body_combat].info = 1; |
310 | } |
306 | } |
311 | |
307 | |
312 | if (slot [body_range].info != 1) |
308 | if (slot [body_range].info != 1) |
313 | { |
309 | { |
314 | LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); |
310 | LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info); |
315 | slot [body_range].info = 1; |
311 | slot [body_range].info = 1; |
316 | } |
312 | } |
317 | break; |
313 | break; |
318 | } |
314 | } |
319 | |
315 | |
… | |
… | |
342 | * not in the ideal fashion. |
338 | * not in the ideal fashion. |
343 | */ |
339 | */ |
344 | if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) |
340 | if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) |
345 | { |
341 | { |
346 | if (!skill) |
342 | if (!skill) |
347 | LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); |
343 | LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ()); |
348 | else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || |
344 | else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) || |
349 | (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) |
345 | (skill == shstr_two_handed_weapons && slot[body_arm].info != -2)) |
350 | LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); |
346 | LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); |
351 | } |
347 | } |
352 | |
348 | |
353 | /* We changed last_heal to gen_sp_armour, which is what it |
349 | /* We changed last_heal to gen_sp_armour, which is what it |
354 | * really does for many objects. Need to catch any in maps |
350 | * really does for many objects. Need to catch any in maps |
355 | * that may have an old value. |
351 | * that may have an old value. |
… | |
… | |
361 | || type == AMULET || type == GIRDLE |
357 | || type == AMULET || type == GIRDLE |
362 | || type == BRACERS || type == CLOAK) |
358 | || type == BRACERS || type == CLOAK) |
363 | { |
359 | { |
364 | if (last_heal) |
360 | if (last_heal) |
365 | { |
361 | { |
366 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); |
362 | LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); |
367 | gen_sp_armour = last_heal; |
363 | gen_sp_armour = last_heal; |
368 | last_heal = 0; |
364 | last_heal = 0; |
369 | } |
365 | } |
370 | |
366 | |
371 | int ip = calc_item_power (this, 0); |
367 | int ip = calc_item_power (this, 0); |
372 | |
368 | |
373 | /* Legacy objects from before item power was in the game */ |
369 | /* Legacy objects from before item power was in the game */ |
374 | if (!item_power && ip) |
370 | if (!item_power && ip) |
375 | { |
371 | { |
376 | if (ip > 3) |
372 | if (ip > 3) |
377 | LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); |
373 | LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip); |
378 | |
374 | |
379 | item_power = ip; |
375 | item_power = ip; |
380 | } |
376 | } |
381 | |
377 | |
382 | /* Check for possibly bogus values. Has to meet both these criteria - |
378 | /* Check for possibly bogus values. Has to meet both these criteria - |
… | |
… | |
389 | if (ip > 2 * item_power && ip > (item_power + 3)) |
385 | if (ip > 2 * item_power && ip > (item_power + 3)) |
390 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
386 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
391 | #endif |
387 | #endif |
392 | } |
388 | } |
393 | |
389 | |
394 | /* Old spellcasting object - need to load in the appropiate object */ |
390 | /* old style spellcasting object (pretty common) - need to load in the appropiate object */ |
395 | if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || |
391 | /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ |
|
|
392 | if ((type == ROD |
|
|
393 | || type == WAND |
|
|
394 | || type == SCROLL |
|
|
395 | || type == HORN |
|
|
396 | || type == FIREWALL |
396 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
397 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
397 | ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) |
398 | || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet. |
|
|
399 | && !inv |
|
|
400 | && !loading_arch |
|
|
401 | && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here! |
|
|
402 | // TODO: at least one watchout-comments is redundant - investigate/remove |
398 | { |
403 | { |
|
|
404 | // TODO: fix firewall object on map |
399 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
405 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
400 | * in that spell was stored in sp. |
406 | * in that spell was stored in sp. |
401 | */ |
407 | */ |
|
|
408 | //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
402 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
409 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
403 | insert_ob_in_ob (tmp, this); |
410 | insert_ob_in_ob (tmp, this); |
404 | randomitems = NULL; /* So another spell isn't created for this object */ |
411 | randomitems = 0; |
405 | } |
412 | } |
406 | |
413 | |
407 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
414 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
408 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
415 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
409 | { |
416 | { |
|
|
417 | LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ()); |
410 | object *tmp = get_archetype_by_object_name (slaying); |
418 | object *tmp = get_archetype_by_object_name (slaying); |
411 | insert_ob_in_ob (tmp, this); |
419 | insert_ob_in_ob (tmp, this); |
412 | randomitems = NULL; /* So another spell isn't created for this object */ |
420 | randomitems = 0; /* So another spell isn't created for this object */ |
413 | /* without this, value is all screwed up */ |
421 | /* without this, value is all screwed up */ |
414 | value = arch->value * inv->value; |
422 | value = arch->value * inv->value; |
415 | } |
423 | } |
416 | |
424 | |
417 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
425 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
418 | { |
426 | { |
419 | if (stats.hp > stats.maxhp) |
427 | if (stats.hp > stats.maxhp) |
420 | { |
428 | { |
421 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
429 | LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
422 | stats.maxhp = stats.hp; |
430 | stats.maxhp = stats.hp; |
423 | } |
431 | } |
424 | |
432 | |
425 | /* The archs just need to be updated for this */ |
433 | /* The archs just need to be updated for this */ |
426 | if (move_type == 0) |
434 | if (move_type == 0) |
427 | move_type = MOVE_WALK; |
435 | move_type = MOVE_WALK; |
428 | } |
436 | } |
429 | |
437 | |
430 | if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) |
438 | if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) |
431 | { |
|
|
432 | /* Object will duplicate it's content as part of the |
439 | /* Object will duplicate it's content as part of the |
433 | * generation process. To do this, we must flag inventory |
440 | * generation process. To do this, we must flag inventory |
434 | * so it remains unevaluated concerning the randomitems and |
441 | * so it remains unevaluated concerning the randomitems and |
435 | * the living (a demonlord shouldn't cast from inside generator!) |
442 | * the living (a demonlord shouldn't cast from inside generator!) |
436 | */ |
443 | */ |
|
|
444 | /* ??? this *should* be done elsewhere, e.g. after map loading etc. */ |
437 | flag_inv (this, FLAG_IS_A_TEMPLATE); |
445 | flag_inv (this, FLAG_IS_A_TEMPLATE); |
438 | } |
|
|
439 | |
446 | |
440 | /* Handle player movers. We use move_type for player movers |
447 | /* Handle player movers. We use move_type for player movers |
441 | * because they operate on their own time (move_on |
448 | * because they operate on their own time (move_on |
442 | * would potentially cause them to be triggered when someone steps |
449 | * would potentially cause them to be triggered when someone steps |
443 | * on them). If move_type is set, presume person knows what they |
450 | * on them). If move_type is set, presume person knows what they |
444 | * are doing, otherwise, set move_type based on maxhp value. |
451 | * are doing, otherwise, set move_type based on maxhp value. |
445 | */ |
452 | */ |
446 | if (type == PLAYERMOVER) |
453 | if (type == PLAYERMOVER) |
447 | { |
454 | { |
448 | if (!move_type) |
455 | if (!move_type) |
… | |
… | |
510 | |
517 | |
511 | goto next; |
518 | goto next; |
512 | } |
519 | } |
513 | } |
520 | } |
514 | |
521 | |
515 | LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); |
522 | LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str); |
516 | |
523 | |
517 | next: ; |
524 | next: ; |
518 | } |
525 | } |
519 | } |
526 | } |
520 | |
527 | |
… | |
… | |
522 | |
529 | |
523 | bool |
530 | bool |
524 | object::parse_kv (object_thawer &f) |
531 | object::parse_kv (object_thawer &f) |
525 | { |
532 | { |
526 | object *op_inv = inv; |
533 | object *op_inv = inv; |
|
|
534 | key_value *last_kv = key_values; |
527 | |
535 | |
528 | for (;;) |
536 | for (;;) |
529 | { |
537 | { |
530 | switch (f.kw) |
538 | switch (f.kw) |
531 | { |
539 | { |
532 | case KW_uuid: |
540 | case KW_uuid: |
533 | if (const char *s = f.get_str ()) |
541 | if (const char *s = f.get_str ()) |
534 | { |
542 | 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 | { |
543 | { |
540 | uuid.seq = seq; |
544 | f.parse_warn ("unparseable uuid"); |
541 | break; |
545 | uuid = UUID::gen (); |
542 | } |
546 | } |
543 | } |
|
|
544 | |
|
|
545 | uuid = gen_uuid (); |
|
|
546 | break; |
547 | break; |
547 | |
548 | |
548 | case KW_oid: |
549 | case KW_oid: |
549 | f.get (this, f.get_sint32 ()); |
550 | f.get (this, f.get_sint32 ()); |
550 | break; |
551 | break; |
… | |
… | |
556 | |
557 | |
557 | case KW_attach: f.get_ornull (attach); break; |
558 | case KW_attach: f.get_ornull (attach); break; |
558 | case KW_skill: f.get_ornull (skill); break; |
559 | case KW_skill: f.get_ornull (skill); break; |
559 | case KW_race: f.get_ornull (race); break; |
560 | case KW_race: f.get_ornull (race); break; |
560 | case KW_slaying: f.get_ornull (slaying); break; |
561 | case KW_slaying: f.get_ornull (slaying); break; |
|
|
562 | case KW_tag: f.get_ornull (tag); break; |
561 | |
563 | |
562 | case KW_arch: |
564 | case KW_arch: |
563 | { |
|
|
564 | object *tmp = object::read (f); |
565 | if (object *tmp = object::read (f)) |
565 | tmp->deactivate (); |
|
|
566 | |
|
|
567 | { |
566 | { |
|
|
567 | tmp->deactivate (); |
|
|
568 | |
568 | // was: insert_ob_in_ob (tmp, op); |
569 | // was: insert_ob_in_ob (tmp, op); |
569 | // but manually adding it can improve map loading times a lot |
570 | // but manually adding it can improve map loading times a lot |
570 | // also, appending instead of prepending keeps the |
571 | // also, appending instead of prepending keeps the |
571 | // save ordering the same between repeated load/saves. |
572 | // save ordering the same between repeated load/saves. |
|
|
573 | // and finally we do not want any funny effects |
572 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
574 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
573 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
575 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
574 | |
576 | |
575 | if (!op_inv) |
577 | if (!op_inv) |
576 | { |
578 | { |
… | |
… | |
588 | |
590 | |
589 | tmp->below = 0; |
591 | tmp->below = 0; |
590 | tmp->env = this; |
592 | tmp->env = this; |
591 | op_inv = tmp; |
593 | op_inv = tmp; |
592 | } |
594 | } |
593 | } |
595 | else |
|
|
596 | LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n"); |
|
|
597 | |
594 | continue; |
598 | continue; |
595 | |
599 | |
596 | case KW_other_arch: |
600 | case KW_other_arch: |
597 | other_arch = |
|
|
598 | loading_arch |
601 | if (loading_arch == this) |
599 | ? archetype::get (f.get_str ()) |
602 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
|
|
603 | else |
|
|
604 | { |
600 | : archetype::find (f.get_str ()); |
605 | other_arch = archetype::find (f.get_str ()); |
601 | |
606 | |
602 | if (!other_arch) |
607 | if (!other_arch) |
603 | LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); |
608 | f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ())); |
|
|
609 | } |
|
|
610 | break; |
|
|
611 | |
|
|
612 | case KW_owner: |
|
|
613 | f.delayed_deref (this, owner, f.get_str ()); |
604 | break; |
614 | break; |
605 | |
615 | |
606 | case KW_animation: |
616 | case KW_animation: |
607 | { |
617 | { |
608 | CLEAR_FLAG (this, FLAG_ANIMATE); |
618 | CLEAR_FLAG (this, FLAG_ANIMATE); |
609 | animation_id = 0; |
619 | animation_id = 0; |
610 | |
620 | |
611 | const char *str = f.get_str (); |
621 | const char *str = f.get_str (); |
612 | if (str && (animation_id = find_animation (str))) |
622 | if (str && (animation_id = find_animation (str))) |
613 | SET_FLAG (this, FLAG_ANIMATE); |
623 | SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here |
614 | } |
624 | } |
615 | break; |
625 | break; |
616 | |
626 | |
617 | case KW_last_heal: f.get (last_heal); break; |
627 | case KW_last_heal: f.get (last_heal); break; |
618 | case KW_last_sp: f.get (last_sp); break; |
628 | case KW_last_sp: f.get (last_sp); break; |
… | |
… | |
639 | face = face_find (f.get_str ()); |
649 | face = face_find (f.get_str ()); |
640 | break; |
650 | break; |
641 | |
651 | |
642 | case KW_sound: |
652 | case KW_sound: |
643 | sound = sound_find (f.get_str ()); |
653 | sound = sound_find (f.get_str ()); |
|
|
654 | if (!sound) |
|
|
655 | f.parse_warn ("sound not found"); |
644 | break; |
656 | break; |
645 | |
657 | |
646 | case KW_sound_destroy: |
658 | case KW_sound_destroy: |
647 | sound_destroy = sound_find (f.get_str ()); |
659 | sound_destroy = sound_find (f.get_str ()); |
|
|
660 | if (!sound_destroy) |
|
|
661 | f.parse_warn ("sound not found"); |
648 | break; |
662 | break; |
649 | |
663 | |
650 | case KW_x: f.get (x); break; |
664 | case KW_x: f.get (x); break; |
651 | case KW_y: f.get (y); break; |
665 | case KW_y: f.get (y); break; |
652 | |
666 | |
… | |
… | |
803 | case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; |
817 | case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; |
804 | case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; |
818 | case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; |
805 | case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; |
819 | case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; |
806 | case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; |
820 | case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; |
807 | case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; |
821 | case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; |
|
|
822 | case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break; |
808 | case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; |
823 | case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; |
809 | case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; |
824 | case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; |
810 | case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; |
825 | case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; |
811 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
826 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
812 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
827 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
… | |
… | |
912 | case KW_anim_speed: f.get (anim_speed); break; |
927 | case KW_anim_speed: f.get (anim_speed); break; |
913 | case KW_container: f.get (weight_limit); break; |
928 | case KW_container: f.get (weight_limit); break; |
914 | case KW_will_apply: f.get (will_apply); break; |
929 | case KW_will_apply: f.get (will_apply); break; |
915 | case KW_attack_movement: f.get (attack_movement); break; |
930 | case KW_attack_movement: f.get (attack_movement); break; |
916 | case KW_move_state: f.get (move_status); break; |
931 | case KW_move_state: f.get (move_status); break; |
917 | case KW_expmul: f.get (expmul); break; |
932 | //case KW_expmul: f.get (expmul); break;//D declared const for the time being |
918 | case KW_glow_radius: f.get (glow_radius); break; |
933 | case KW_glow_radius: f.get (glow_radius); break; |
919 | case KW_weapontype: f.get (weapontype); break; |
934 | case KW_weapontype: f.get (weapontype); break; |
920 | case KW_tooltype: f.get (tooltype); break; |
|
|
921 | case KW_casting_time: f.get (casting_time); break; |
935 | case KW_casting_time: f.get (casting_time); break; |
|
|
936 | |
|
|
937 | // elevation is deprecated |
922 | case KW_elevation: f.get (elevation); break; |
938 | case KW_elevation: break; |
|
|
939 | |
923 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
940 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
924 | case KW_client_type: f.get (client_type); break; |
941 | case KW_client_type: f.get (client_type); break; |
925 | case KW_duration: f.get (duration); break; |
942 | case KW_duration: f.get (duration); break; |
926 | case KW_range: f.get (range); break; |
943 | case KW_range: f.get (range); break; |
927 | case KW_range_modifier: f.get (range_modifier); break; |
944 | case KW_range_modifier: f.get (range_modifier); break; |
… | |
… | |
946 | case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; |
963 | case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; |
947 | case KW_can_apply: |
964 | case KW_can_apply: |
948 | break; |
965 | break; |
949 | |
966 | |
950 | case KW_connected: |
967 | case KW_connected: |
951 | add_button_link (this, map, f.get_sint32 ()); |
968 | { |
|
|
969 | shstr connected; |
|
|
970 | |
|
|
971 | f.get (connected); |
|
|
972 | add_link (map, connected); |
|
|
973 | } |
952 | break; |
974 | break; |
953 | |
975 | |
954 | case KW_randomitems: |
976 | case KW_randomitems: |
955 | if (f.get_str ()) |
977 | if (f.get_str ()) |
956 | { |
978 | { |
… | |
… | |
984 | |
1006 | |
985 | f.next (); |
1007 | f.next (); |
986 | return true; |
1008 | return true; |
987 | |
1009 | |
988 | case KW_ERROR: |
1010 | case KW_ERROR: |
989 | set_ob_key_value (this, f.kw_str, f.value, true); |
1011 | // append as key value pair (do not use kv_set as it prepends) |
|
|
1012 | // we also do not even try to find old values, duplicate keys stay duplicate |
|
|
1013 | { |
|
|
1014 | key_value *kv = new key_value; |
|
|
1015 | |
|
|
1016 | kv->next = 0; |
|
|
1017 | kv->key = shstr (f.kw_str); |
|
|
1018 | kv->value = shstr (f.value); |
|
|
1019 | |
|
|
1020 | if (!last_kv) |
|
|
1021 | key_values = last_kv = kv; |
|
|
1022 | else |
|
|
1023 | { |
|
|
1024 | while (last_kv->next) |
|
|
1025 | last_kv = last_kv->next; |
|
|
1026 | |
|
|
1027 | last_kv->next = kv; |
|
|
1028 | last_kv = kv; |
|
|
1029 | } |
|
|
1030 | } |
990 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
1031 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
991 | break; |
1032 | break; |
992 | |
1033 | |
993 | default: |
1034 | default: |
994 | if (!f.parse_error ("object", name)) |
1035 | if (!f.parse_error ("object", name)) |
… | |
… | |
1015 | |
1056 | |
1016 | assert (arch); //D maybe use exception handling of sorts? |
1057 | assert (arch); //D maybe use exception handling of sorts? |
1017 | |
1058 | |
1018 | f.next (); |
1059 | f.next (); |
1019 | |
1060 | |
1020 | object *op = object::create (); |
1061 | object *op = arch->instance (); |
1021 | |
|
|
1022 | op->map = map; |
1062 | op->map = map; |
1023 | arch->copy_to (op); |
|
|
1024 | // copy_to activates, this should be fixed properly |
1063 | // instance() activates, this should be fixed properly |
1025 | op->deactivate (); |
1064 | op->deactivate (); |
1026 | |
1065 | |
1027 | if (!op->parse_kv (f)) |
1066 | if (!op->parse_kv (f)) |
1028 | { |
1067 | { |
1029 | op->destroy (true); |
1068 | op->destroy (); |
1030 | return 0; |
1069 | return 0; |
1031 | } |
1070 | } |
1032 | |
1071 | |
1033 | op->post_load_check (); |
1072 | op->post_load_check (); |
1034 | return op; |
1073 | return op; |
… | |
… | |
1043 | int |
1082 | int |
1044 | set_variable (object *op, char *buf) |
1083 | set_variable (object *op, char *buf) |
1045 | { |
1084 | { |
1046 | object_thawer f (buf, (AV *)0); |
1085 | object_thawer f (buf, (AV *)0); |
1047 | |
1086 | |
1048 | f.next (); |
|
|
1049 | return op->parse_kv (f); |
1087 | return op->parse_kv (f); |
1050 | } |
1088 | } |
1051 | |
1089 | |
1052 | /* This returns a string of the integer movement type */ |
1090 | /* This returns a string of the integer movement type */ |
1053 | #if 0 |
1091 | #if 0 |
… | |
… | |
1240 | /* 110 */ |
1278 | /* 110 */ |
1241 | KW_destroy_on_death, |
1279 | KW_destroy_on_death, |
1242 | KW_NULL, |
1280 | KW_NULL, |
1243 | }; |
1281 | }; |
1244 | |
1282 | |
1245 | int i; |
|
|
1246 | |
|
|
1247 | /* This saves the key/value lists. We do it first so that any |
1283 | /* This saves the key/value lists. We do it first so that any |
1248 | * keys that match field names will be overwritten by the loader. |
1284 | * keys that match field names will be overwritten by the loader. |
1249 | */ |
1285 | */ |
1250 | for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) |
1286 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1251 | { |
1287 | if (!tmp->key_values || tmp->kv (kv->key) != kv->value) |
1252 | /* Find the field in the opposing member. */ |
1288 | f.put (kv->key, kv->value); |
1253 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
|
|
1254 | |
|
|
1255 | /* If there's no partnering field, or it's got a different value, save our field. */ |
|
|
1256 | if (!arch_field || my_field->value != arch_field->value) |
|
|
1257 | f.put (my_field->key, my_field->value); |
|
|
1258 | } |
|
|
1259 | |
1289 | |
1260 | /* We don't need to worry about the arch's extra fields - they |
1290 | /* We don't need to worry about the arch's extra fields - they |
1261 | * will get taken care of the copy_to method. |
1291 | * will get taken care of the copy_to method. |
1262 | */ |
1292 | */ |
1263 | |
1293 | |
1264 | { |
1294 | f.put (KW_uuid, op->uuid.c_str ()); |
1265 | char uids[64]; |
|
|
1266 | snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); |
|
|
1267 | f.put (KW_uuid, (const char *)uids); |
|
|
1268 | } |
|
|
1269 | |
1295 | |
1270 | #define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) |
1296 | #define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) |
1271 | #define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) |
1297 | #define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) |
|
|
1298 | |
|
|
1299 | if (object *owner = op->owner) |
|
|
1300 | f.put (KW_owner, static_cast<const char *>(owner->ref ())); |
1272 | |
1301 | |
1273 | CMP_OUT (name); |
1302 | CMP_OUT (name); |
1274 | CMP_OUT (name_pl); |
1303 | CMP_OUT (name_pl); |
1275 | CMP_OUT (custom_name); |
1304 | CMP_OUT (custom_name); |
1276 | CMP_OUT (title); |
1305 | CMP_OUT (title); |
1277 | CMP_OUT (race); |
1306 | CMP_OUT (race); |
|
|
1307 | CMP_OUT (skill); |
1278 | CMP_OUT (slaying); |
1308 | CMP_OUT (slaying); |
|
|
1309 | CMP_OUT (tag); |
1279 | CMP_OUT (other_arch); |
1310 | CMP_OUT (other_arch); |
1280 | |
1311 | |
1281 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
1312 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
1282 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
1313 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
1283 | |
1314 | |
1284 | if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); |
1315 | if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); |
1285 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
1316 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
1286 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1317 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1287 | |
1318 | |
1288 | if (op->animation_id != tmp->animation_id) |
1319 | if (op->animation_id != tmp->animation_id) |
1289 | if (op->animation_id) |
1320 | if (op->has_anim ()) |
|
|
1321 | f.put (KW_animation, op->anim ().name); |
|
|
1322 | else |
1290 | { |
1323 | { |
1291 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1324 | f.put (KW_animation, (const char *)0); |
1292 | |
1325 | op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? |
1293 | if (!QUERY_FLAG (op, FLAG_ANIMATE)) |
|
|
1294 | f.put (KW_is_animated, (sint32)0); |
|
|
1295 | } |
1326 | } |
1296 | else |
|
|
1297 | f.put (KW_animation, (const char *)0); |
|
|
1298 | |
1327 | |
1299 | CMP_OUT2 (str, stats.Str); |
1328 | CMP_OUT2 (str, stats.Str); |
1300 | CMP_OUT2 (dex, stats.Dex); |
1329 | CMP_OUT2 (dex, stats.Dex); |
1301 | CMP_OUT2 (con, stats.Con); |
1330 | CMP_OUT2 (con, stats.Con); |
1302 | CMP_OUT2 (wis, stats.Wis); |
1331 | CMP_OUT2 (wis, stats.Wis); |
… | |
… | |
1332 | CMP_OUT (direction); |
1361 | CMP_OUT (direction); |
1333 | CMP_OUT (type); |
1362 | CMP_OUT (type); |
1334 | CMP_OUT (subtype); |
1363 | CMP_OUT (subtype); |
1335 | CMP_OUT (attacktype); |
1364 | CMP_OUT (attacktype); |
1336 | |
1365 | |
1337 | for (i = 0; i < NROFATTACKS; i++) |
1366 | for (int i = 0; i < NROFATTACKS; i++) |
1338 | if (op->resist[i] != tmp->resist[i]) |
1367 | if (expect_false (op->resist[i] != tmp->resist[i])) |
1339 | f.put (resist_save[i], op->resist[i]); |
1368 | f.put (resist_save[i], op->resist[i]); |
1340 | |
1369 | |
1341 | CMP_OUT (path_attuned); |
1370 | CMP_OUT (path_attuned); |
1342 | CMP_OUT (path_repelled); |
1371 | CMP_OUT (path_repelled); |
1343 | CMP_OUT (path_denied); |
1372 | CMP_OUT (path_denied); |
… | |
… | |
1353 | CMP_OUT (last_sp); |
1382 | CMP_OUT (last_sp); |
1354 | CMP_OUT (last_grace); |
1383 | CMP_OUT (last_grace); |
1355 | CMP_OUT (last_eat); |
1384 | CMP_OUT (last_eat); |
1356 | CMP_OUT (glow_radius); |
1385 | CMP_OUT (glow_radius); |
1357 | |
1386 | |
1358 | if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) |
1387 | if (op->flag [FLAG_IS_LINKED]) |
|
|
1388 | if (auto (ol, op->find_link ())) |
1359 | f.put (KW_connected, i); |
1389 | f.put (KW_connected, ol->id); |
1360 | |
1390 | |
1361 | CMP_OUT (randomitems); |
1391 | CMP_OUT (randomitems); |
1362 | CMP_OUT2 (container, weight_limit); |
1392 | CMP_OUT2 (container, weight_limit); |
1363 | |
1393 | |
1364 | CMP_OUT (run_away); |
1394 | CMP_OUT (run_away); |
1365 | CMP_OUT (pick_up); |
1395 | CMP_OUT (pick_up); |
1366 | CMP_OUT (will_apply); |
1396 | CMP_OUT (will_apply); |
1367 | CMP_OUT (smoothlevel); |
1397 | CMP_OUT (smoothlevel); |
1368 | CMP_OUT (weapontype); |
1398 | CMP_OUT (weapontype); |
1369 | CMP_OUT (tooltype); |
|
|
1370 | CMP_OUT (elevation); |
|
|
1371 | CMP_OUT (client_type); |
1399 | CMP_OUT (client_type); |
1372 | CMP_OUT (item_power); |
1400 | CMP_OUT (item_power); |
1373 | CMP_OUT (duration); |
1401 | CMP_OUT (duration); |
1374 | CMP_OUT (range); |
1402 | CMP_OUT (range); |
1375 | CMP_OUT (range_modifier); |
1403 | CMP_OUT (range_modifier); |
… | |
… | |
1384 | CMP_OUT (move_off); |
1412 | CMP_OUT (move_off); |
1385 | CMP_OUT (move_slow); |
1413 | CMP_OUT (move_slow); |
1386 | CMP_OUT (move_slow_penalty); |
1414 | CMP_OUT (move_slow_penalty); |
1387 | |
1415 | |
1388 | if (op->flag != tmp->flag) |
1416 | if (op->flag != tmp->flag) |
1389 | for (i = 0; i <= NUM_FLAGS; i++) |
1417 | for (int i = 0; i <= NUM_FLAGS; i++) |
1390 | if (flag_names [i] && op->flag [i] != tmp->flag [i]) |
1418 | if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) |
1391 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1419 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1392 | |
1420 | |
1393 | // save body locations |
1421 | // save body locations |
1394 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1422 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1395 | if (op->slot[i].info != tmp->slot[i].info) |
1423 | if (expect_false (op->slot[i].info != tmp->slot[i].info)) |
1396 | f.put (body_locations[i].save_name, op->slot[i].info); |
1424 | f.put (body_locations[i].save_name, op->slot[i].info); |
1397 | } |
1425 | } |
1398 | |
1426 | |
1399 | /* |
1427 | /* |
1400 | * Dumps all variables in an object to a file. |
1428 | * Dumps all variables in an object to a file. |
… | |
… | |
1402 | * the only place this is not set is when saving the player. |
1430 | * the only place this is not set is when saving the player. |
1403 | */ |
1431 | */ |
1404 | bool |
1432 | bool |
1405 | object::write (object_freezer &f) |
1433 | object::write (object_freezer &f) |
1406 | { |
1434 | { |
1407 | /* Even if the object does have an owner, it would seem that we should |
1435 | if (is_arch ()) |
1408 | * still save it. |
1436 | { |
1409 | */ |
1437 | f.put (KW_object, arch->archname); |
1410 | if (owner) |
1438 | write_diff (f, this, archetype::empty); |
1411 | return true; |
1439 | } |
1412 | |
1440 | else |
1413 | archetype *at = arch ? (archetype *)arch : empty_archetype; |
1441 | { |
1414 | |
|
|
1415 | f.put (KW_arch, at->archname); |
1442 | f.put (KW_arch, arch->archname); |
1416 | write_diff (f, this, at); |
1443 | write_diff (f, this, arch); |
|
|
1444 | } |
1417 | |
1445 | |
1418 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1446 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1419 | tmp->write (f); |
1447 | tmp->write (f); |
1420 | |
1448 | |
1421 | f.put (this); |
1449 | f.put (this); |
… | |
… | |
1426 | |
1454 | |
1427 | ///////////////////////////////////////////////////////////////////////////// |
1455 | ///////////////////////////////////////////////////////////////////////////// |
1428 | |
1456 | |
1429 | // generic resource file load, |
1457 | // generic resource file load, |
1430 | // currently supports: region, treasures, archetypes |
1458 | // currently supports: region, treasures, archetypes |
|
|
1459 | bool |
1431 | bool load_resource_file (const char *filename) |
1460 | load_resource_file_ (const char *filename) |
1432 | { |
1461 | { |
1433 | object_thawer f (filename); |
1462 | object_thawer f (filename); |
1434 | |
|
|
1435 | bool success = false; |
|
|
1436 | bool seen_arch = false; |
|
|
1437 | |
|
|
1438 | f.next (); |
|
|
1439 | |
1463 | |
1440 | for (;;) |
1464 | for (;;) |
1441 | { |
1465 | { |
1442 | switch (f.kw) |
1466 | switch (f.kw) |
1443 | { |
1467 | { |
1444 | case KW_region: |
1468 | case KW_region: |
1445 | if (!region::read (f)) |
1469 | if (!region::read (f)) |
1446 | goto finish; |
1470 | return false; |
1447 | break; |
1471 | break; |
1448 | |
1472 | |
1449 | case KW_treasure: |
1473 | case KW_treasure: |
1450 | case KW_treasureone: |
1474 | case KW_treasureone: |
1451 | if (!treasurelist::read (f)) |
1475 | if (!treasurelist::read (f)) |
1452 | goto finish; |
1476 | return false; |
1453 | break; |
1477 | break; |
1454 | |
1478 | |
1455 | case KW_object: |
1479 | case KW_object: |
1456 | seen_arch = true; |
|
|
1457 | if (!archetype::read (f)) |
1480 | if (!archetype::read (f)) |
1458 | goto finish; |
1481 | return false; |
1459 | break; |
1482 | break; |
1460 | |
1483 | |
1461 | case KW_EOF: |
1484 | case KW_EOF: |
1462 | success = true; |
1485 | return true; |
1463 | goto finish; |
|
|
1464 | |
1486 | |
1465 | default: |
1487 | default: |
1466 | if (!f.parse_error ("resource file")) |
1488 | if (!f.parse_error ("resource file")) |
1467 | goto finish; |
1489 | return false; |
1468 | |
1490 | |
1469 | f.next (); |
1491 | f.next (); |
1470 | break; |
1492 | break; |
1471 | } |
1493 | } |
1472 | } |
1494 | } |
1473 | |
|
|
1474 | finish: |
|
|
1475 | if (seen_arch) |
|
|
1476 | init_archetype_pointers (); |
|
|
1477 | |
|
|
1478 | return success; |
|
|
1479 | } |
1495 | } |
1480 | |
1496 | |