1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
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,2009 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 it under |
9 | it under the terms of the GNU General Public License as published by |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | the Free Software Foundation; either version 2 of the License, or |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | (at your option) any later version. |
11 | * option) any later version. |
12 | |
12 | * |
13 | This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
14 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | |
17 | * |
18 | You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the Affero GNU General Public License |
19 | along with this program; if not, write to the Free Software |
19 | * and the GNU General Public License along with this program. If not, see |
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * <http://www.gnu.org/licenses/>. |
21 | |
21 | * |
22 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
23 | */ |
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 | |
|
|
29 | |
24 | |
30 | #include <global.h> |
25 | #include <global.h> |
31 | #include <loader.h> |
26 | #include <loader.h> |
32 | #include <sproto.h> |
27 | #include <sproto.h> |
33 | |
28 | |
34 | /* Maps the MOVE_* values to names */ |
29 | ///////////////////////////////////////////////////////////////////////////// |
35 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
30 | |
|
|
31 | extern archetype *loading_arch; |
|
|
32 | |
|
|
33 | //+GPL |
36 | |
34 | |
37 | /* This table is only necessary to convert objects that existed before the |
35 | /* This table is only necessary to convert objects that existed before the |
38 | * spell object conversion to the new object. It was not practical |
36 | * spell object conversion to the new object. It was not practical |
39 | * to go through every mapping looking for every potion, rod, wand, etc |
37 | * to go through every mapping looking for every potion, rod, wand, etc |
40 | * that had a sp set and update to the new value. So this maps the |
38 | * that had a sp set and update to the new value. So this maps the |
… | |
… | |
170 | "spell_magic_drain", /* 122 */ |
168 | "spell_magic_drain", /* 122 */ |
171 | "spell_counterspell", /* 123 */ |
169 | "spell_counterspell", /* 123 */ |
172 | "spell_disarm", /* 124 */ |
170 | "spell_disarm", /* 124 */ |
173 | "spell_cure_confusion", /* 125 */ |
171 | "spell_cure_confusion", /* 125 */ |
174 | "spell_restoration", /* 126 */ |
172 | "spell_restoration", /* 126 */ |
175 | "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ |
173 | "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */ |
176 | "spell_counterwall", /* 128 */ |
174 | "spell_counterwall", /* 128 */ |
177 | "spell_cause_light_wounds", /* 129 */ |
175 | "spell_cause_light_wounds", /* 129 */ |
178 | "spell_cause_medium_wounds", /* 130 */ |
176 | "spell_cause_medium_wounds", /* 130 */ |
179 | "spell_cause_heavy_wounds", /* 131 */ |
177 | "spell_cause_heavy_wounds", /* 131 */ |
180 | "spell_charm_monsters", /* 132 */ |
178 | "spell_charm_monsters", /* 132 */ |
… | |
… | |
252 | "spell_cause_rabies", /* 204 */ |
250 | "spell_cause_rabies", /* 204 */ |
253 | "spell_glyph", /* 205 */ |
251 | "spell_glyph", /* 205 */ |
254 | NULL |
252 | NULL |
255 | }; |
253 | }; |
256 | |
254 | |
257 | extern int arch_init; |
|
|
258 | |
|
|
259 | /* This function checks the object after it has been loaded (when we |
255 | /* This function checks the object after it has been loaded (when we |
260 | * get the 'end' in the input stream). This function can be used to |
256 | * get the 'end' in the input stream). This function can be used to |
261 | * deal with legacy objects where fields may have changed. It can also be used |
257 | * deal with legacy objects where fields may have changed. It can also be used |
262 | * to check for objects to make sure there are no common errors. |
258 | * to check for objects to make sure there are no common errors. |
263 | */ |
259 | */ |
264 | static void |
260 | void |
265 | check_loaded_object (object *op) |
261 | object::post_load_check () |
266 | { |
262 | { |
267 | int ip; |
263 | if (type >= NUM_TYPES) |
|
|
264 | { |
|
|
265 | LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ()); |
|
|
266 | type = 0; |
|
|
267 | } |
|
|
268 | |
|
|
269 | switch (type) |
|
|
270 | { |
|
|
271 | case BOW: |
|
|
272 | case WAND: |
|
|
273 | case ROD: |
|
|
274 | case HORN: |
|
|
275 | if (slot [body_range].info != -1) |
|
|
276 | { |
|
|
277 | LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info); |
|
|
278 | slot [body_range].info = -1; |
|
|
279 | } |
|
|
280 | break; |
|
|
281 | |
|
|
282 | case WEAPON: |
|
|
283 | if (slot [body_combat].info != -1) |
|
|
284 | { |
|
|
285 | LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); |
|
|
286 | slot [body_combat].info = -1; |
|
|
287 | } |
|
|
288 | break; |
|
|
289 | |
|
|
290 | case SHIELD: |
|
|
291 | if (slot [body_shield].info != -1) |
|
|
292 | { |
|
|
293 | LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); |
|
|
294 | slot [body_shield].info = -1; |
|
|
295 | } |
|
|
296 | break; |
|
|
297 | |
|
|
298 | case PLAYER: |
|
|
299 | if (slot [body_shield].info != 1) |
|
|
300 | { |
|
|
301 | LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); |
|
|
302 | slot [body_shield].info = 1; |
|
|
303 | } |
|
|
304 | |
|
|
305 | if (slot [body_combat].info != 1) |
|
|
306 | { |
|
|
307 | LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); |
|
|
308 | slot [body_combat].info = 1; |
|
|
309 | } |
|
|
310 | |
|
|
311 | if (slot [body_range].info != 1) |
|
|
312 | { |
|
|
313 | LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info); |
|
|
314 | slot [body_range].info = 1; |
|
|
315 | } |
|
|
316 | break; |
|
|
317 | } |
268 | |
318 | |
269 | /* We do some specialised handling to handle legacy cases of name_pl. |
319 | /* 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 - |
320 | * 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 |
321 | * 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 |
322 | * 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 |
323 | * 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. |
324 | * 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 |
325 | * Otherwise, what happens is that the the plural name will lose |
276 | * information (appear as just 'hearts' and not 'goblins heart') |
326 | * information (appear as just 'hearts' and not 'goblins heart') |
277 | */ |
327 | */ |
278 | if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) |
328 | if (arch && name != arch->object::name && name_pl == arch->object::name_pl) |
279 | op->name_pl = NULL; |
329 | name_pl = 0; |
280 | |
330 | |
281 | if (!op->name_pl) |
331 | if (!name_pl) |
282 | op->name_pl = op->name; |
332 | name_pl = name; |
283 | |
333 | |
284 | /* objects now have a materialname. try to patch it in */ |
334 | /* objects now have a materialname. try to patch it in */ |
285 | if (!(op->is_weapon () && op->level > 0)) |
335 | if (material == MATERIAL_NULL && !(is_weapon () && level > 0)) |
286 | { |
336 | select_material (this, map ? map->difficulty : 5); |
287 | if (op->map != NULL) |
337 | |
288 | set_materialname (op, op->map->difficulty, NULL); |
|
|
289 | else |
|
|
290 | set_materialname (op, 5, NULL); |
|
|
291 | } |
|
|
292 | /* only do these when program is first run - a bit |
338 | /* only do these when program is first run - a bit |
293 | * excessive to do this at every run - most of this is |
339 | * excessive to do this at every run - most of this is |
294 | * really just to catch any errors - program will still run, but |
340 | * really just to catch any errors - program will still run, but |
295 | * not in the ideal fashion. |
341 | * not in the ideal fashion. |
296 | */ |
342 | */ |
297 | if ((op->type == WEAPON || op->type == BOW) && arch_init) |
343 | if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) |
298 | { |
344 | { |
299 | if (!op->skill) |
345 | if (!skill) |
300 | { |
|
|
301 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
346 | LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ()); |
302 | } |
347 | else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) || |
303 | else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || |
348 | (skill == shstr_two_handed_weapons && slot[body_arm].info != -2)) |
304 | (!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); |
349 | LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); |
307 | } |
|
|
308 | } |
350 | } |
309 | |
351 | |
310 | /* We changed last_heal to gen_sp_armour, which is what it |
352 | /* We changed last_heal to gen_sp_armour, which is what it |
311 | * really does for many objects. Need to catch any in maps |
353 | * really does for many objects. Need to catch any in maps |
312 | * that may have an old value. |
354 | * that may have an old value. |
313 | */ |
355 | */ |
314 | if ((op->type == WEAPON) || |
356 | if (type == WEAPON |
315 | (op->type == ARMOUR) || (op->type == HELMET) || |
357 | || type == ARMOUR || type == HELMET |
316 | (op->type == SHIELD) || (op->type == RING) || |
358 | || type == SHIELD || type == RING |
317 | (op->type == BOOTS) || (op->type == GLOVES) || |
359 | || type == BOOTS || type == GLOVES |
318 | (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) |
360 | || type == AMULET || type == GIRDLE |
|
|
361 | || type == BRACERS || type == CLOAK) |
319 | { |
362 | { |
320 | if (op->last_heal) |
363 | if (last_heal) |
321 | { |
364 | { |
322 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
365 | LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); |
323 | op->gen_sp_armour = op->last_heal; |
366 | gen_sp_armour = last_heal; |
324 | op->last_heal = 0; |
367 | last_heal = 0; |
325 | } |
368 | } |
326 | |
369 | |
327 | ip = calc_item_power (op, 0); |
370 | int ip = calc_item_power (this, 0); |
|
|
371 | |
328 | /* Legacy objects from before item power was in the game */ |
372 | /* Legacy objects from before item power was in the game */ |
329 | if (!op->item_power && ip) |
373 | if (!item_power && ip) |
330 | { |
374 | { |
331 | if (ip > 3) |
375 | if (ip > 3) |
332 | { |
|
|
333 | LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); |
376 | LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip); |
334 | } |
377 | |
335 | op->item_power = ip; |
378 | item_power = ip; |
336 | } |
379 | } |
|
|
380 | |
337 | /* Check for possibly bogus values. Has to meet both these criteria - |
381 | /* 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 |
382 | * 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. |
383 | * 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, |
384 | * similarly, it item_power is 0, the first check will always pass, |
341 | * but not the second one. |
385 | * but not the second one. |
342 | */ |
386 | */ |
|
|
387 | #if 0 //TODO |
343 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
388 | if (ip > 2 * item_power && ip > (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); |
389 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
346 | } |
390 | #endif |
347 | |
|
|
348 | } |
391 | } |
|
|
392 | |
349 | /* Old spellcasting object - need to load in the appropiate object */ |
393 | /* old style spellcasting object (pretty common) - need to load in the appropiate object */ |
350 | if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || |
394 | /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ |
|
|
395 | if ((type == ROD |
|
|
396 | || type == WAND |
|
|
397 | || type == SCROLL |
|
|
398 | || type == HORN |
|
|
399 | || type == FIREWALL |
351 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
400 | /* 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) |
401 | || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet. |
|
|
402 | && !inv |
|
|
403 | && !loading_arch |
|
|
404 | && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here! |
|
|
405 | // TODO: at least one watchout-comments is redundant - investigate/remove |
353 | { |
406 | { |
354 | object *tmp; |
407 | // TODO: fix firewall object on map |
355 | |
|
|
356 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
408 | /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' |
357 | * in that spell was stored in sp. |
409 | * in that spell was stored in sp. |
358 | */ |
410 | */ |
|
|
411 | //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
359 | tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); |
412 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
360 | insert_ob_in_ob (tmp, op); |
413 | insert_ob_in_ob (tmp, this); |
361 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
414 | randomitems = 0; |
362 | } |
415 | } |
|
|
416 | |
363 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
417 | /* 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) |
418 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
366 | { |
419 | { |
367 | object *tmp; |
420 | LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ()); |
368 | |
|
|
369 | tmp = get_archetype_by_object_name (op->slaying); |
421 | object *tmp = get_archetype_by_object_name (slaying); |
370 | insert_ob_in_ob (tmp, op); |
422 | insert_ob_in_ob (tmp, this); |
371 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
423 | randomitems = 0; /* So another spell isn't created for this object */ |
372 | /* without this, value is all screwed up */ |
424 | /* without this, value is all screwed up */ |
373 | op->value = op->arch->clone.value * op->inv->value; |
425 | value = arch->value * inv->value; |
374 | } |
426 | } |
375 | |
427 | |
376 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
428 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
377 | { |
429 | { |
378 | if (op->stats.hp > op->stats.maxhp) |
430 | if (stats.hp > stats.maxhp) |
|
|
431 | { |
379 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); |
432 | LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
|
|
433 | stats.maxhp = stats.hp; |
|
|
434 | } |
380 | |
435 | |
381 | /* The archs just need to be updated for this */ |
436 | /* The archs just need to be updated for this */ |
382 | if (op->move_type == 0) |
437 | if (move_type == 0) |
383 | op->move_type = MOVE_WALK; |
438 | move_type = MOVE_WALK; |
384 | } |
439 | } |
385 | |
440 | |
386 | if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER) |
441 | if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) |
387 | { |
|
|
388 | /* Object will duplicate it's content as part of the |
442 | /* Object will duplicate it's content as part of the |
389 | * generation process. To do this, we must flag inventory |
443 | * generation process. To do this, we must flag inventory |
390 | * so it remains unevaluated concerning the randomitems and |
444 | * so it remains unevaluated concerning the randomitems and |
391 | * the living (a demonlord shouldn't cast from inside generator!) |
445 | * the living (a demonlord shouldn't cast from inside generator!) |
392 | */ |
446 | */ |
|
|
447 | /* ??? this *should* be done elsewhere, e.g. after map loading etc. */ |
393 | flag_inv (op, FLAG_IS_A_TEMPLATE); |
448 | flag_inv (this, FLAG_IS_A_TEMPLATE); |
394 | } |
|
|
395 | |
449 | |
396 | /* Handle player movers. We use move_type for player movers |
450 | /* Handle player movers. We use move_type for player movers |
397 | * because they operate on their own time (move_on |
451 | * because they operate on their own time (move_on |
398 | * would potentially cause them to be triggered when someone steps |
452 | * would potentially cause them to be triggered when someone steps |
399 | * on them). If move_type is set, presume person knows what they |
453 | * on them). If move_type is set, presume person knows what they |
400 | * are doing, otherwise, set move_type based on maxhp value. |
454 | * are doing, otherwise, set move_type based on maxhp value. |
401 | */ |
455 | */ |
402 | if (op->type == PLAYERMOVER) |
456 | if (type == PLAYERMOVER) |
403 | { |
457 | { |
404 | if (!op->move_type) |
458 | if (!move_type) |
405 | { |
459 | { |
406 | if (op->stats.maxhp) |
460 | if (stats.maxhp) |
407 | { |
461 | { |
408 | op->move_type = MOVE_ALL; |
462 | move_type = MOVE_ALL; |
409 | op->stats.maxhp = 0; |
463 | stats.maxhp = 0; |
410 | } |
464 | } |
411 | else |
465 | else |
|
|
466 | move_type = MOVE_WALK; |
|
|
467 | } |
|
|
468 | } |
|
|
469 | |
|
|
470 | // if the object has an animation, try to provide a default face |
|
|
471 | if (has_anim ()) |
|
|
472 | { |
|
|
473 | const animation &anim_ob = anim (); |
|
|
474 | |
|
|
475 | if (anim_speed) |
|
|
476 | // if this item is time-animated, force the last frame |
|
|
477 | animate_object (this, 0); |
|
|
478 | else if (flag [FLAG_MONSTER]) |
|
|
479 | // if it is a monster, set appropriate facing |
|
|
480 | animate_object (this, direction); |
|
|
481 | } |
|
|
482 | } |
|
|
483 | |
|
|
484 | static void |
|
|
485 | set_move (MoveType &mt, object_thawer &f) |
|
|
486 | { |
|
|
487 | static const struct flagstr { |
|
|
488 | const char *name; |
|
|
489 | MoveType flags; |
|
|
490 | } move_flags[] = { |
|
|
491 | { "walk" , MOVE_WALK }, |
|
|
492 | { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH }, |
|
|
493 | { "fly_low" , MOVE_FLY_LOW }, |
|
|
494 | { "fly_high", MOVE_FLY_HIGH }, |
|
|
495 | { "swim" , MOVE_SWIM }, |
|
|
496 | { "boat" , MOVE_BOAT }, |
|
|
497 | { "ship" , MOVE_SHIP }, |
|
|
498 | { "all" , MOVE_ALL }, |
|
|
499 | }; |
|
|
500 | |
|
|
501 | const char *str = f.get_str (); |
|
|
502 | |
|
|
503 | if (!*str || isdigit (*str)) |
|
|
504 | { |
|
|
505 | mt = atoi (str); |
|
|
506 | return; |
|
|
507 | } |
|
|
508 | |
|
|
509 | mt = 0; |
|
|
510 | |
|
|
511 | for (str = strtok ((char *)str, " "); str; str = strtok (0, " ")) |
|
|
512 | { |
|
|
513 | bool negate = 0; |
|
|
514 | |
|
|
515 | if (*str == '-') |
|
|
516 | { |
|
|
517 | negate = 1; |
|
|
518 | str++; |
|
|
519 | } |
|
|
520 | |
|
|
521 | for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) |
|
|
522 | { |
|
|
523 | if (!strcmp (f->name, str)) |
412 | { |
524 | { |
413 | op->move_type = MOVE_WALK; |
525 | if (negate) |
|
|
526 | mt &= ~f->flags; |
|
|
527 | else |
|
|
528 | mt |= f->flags; |
|
|
529 | |
|
|
530 | goto next; |
414 | } |
531 | } |
415 | } |
532 | } |
416 | } |
|
|
417 | |
533 | |
|
|
534 | LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str); |
|
|
535 | |
|
|
536 | next: ; |
|
|
537 | } |
418 | } |
538 | } |
419 | |
539 | |
420 | static void |
540 | //-GPL |
421 | set_move (MoveType & mt, const char *str) |
541 | |
|
|
542 | #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () |
|
|
543 | |
|
|
544 | bool |
|
|
545 | object::parse_kv (object_thawer &f) |
422 | { |
546 | { |
423 | if (!str) |
547 | object *op_inv = inv; |
424 | { |
548 | key_value *last_kv = key_values; |
425 | mt = 0; |
549 | |
426 | return; |
550 | for (;;) |
427 | } |
551 | { |
428 | |
552 | switch (f.kw) |
429 | if (isdigit (*str)) |
|
|
430 | { |
|
|
431 | mt = atoi (str); |
|
|
432 | return; |
|
|
433 | } |
|
|
434 | |
|
|
435 | mt = 0; |
|
|
436 | |
|
|
437 | for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) |
|
|
438 | { |
|
|
439 | if (!strcasecmp (str, "all")) |
|
|
440 | mt |= MOVE_ALL; |
|
|
441 | else |
|
|
442 | { |
553 | { |
443 | int i, negate = 0; |
|
|
444 | |
|
|
445 | if (*str == '-') |
|
|
446 | { |
|
|
447 | negate = 1; |
|
|
448 | str++; |
|
|
449 | } |
|
|
450 | |
|
|
451 | for (i = 0; move_name[i]; i++) |
|
|
452 | { |
|
|
453 | if (!strcasecmp (move_name[i], str)) |
|
|
454 | { |
|
|
455 | if (negate) |
|
|
456 | mt &= ~(1 << i); |
|
|
457 | else |
|
|
458 | mt |= (1 << i); |
|
|
459 | |
|
|
460 | break; |
|
|
461 | } |
|
|
462 | } |
|
|
463 | |
|
|
464 | if (!move_name[i]) |
|
|
465 | { |
|
|
466 | /* fly is a special case - covers both fly_low and |
|
|
467 | * fly_high - since it doesn't match to a specific |
|
|
468 | * single bit, have to special case it. |
|
|
469 | */ |
|
|
470 | if (!strcasecmp (str, "flying")) |
|
|
471 | { |
|
|
472 | if (negate) |
|
|
473 | mt &= ~MOVE_FLYING; |
|
|
474 | else |
|
|
475 | mt |= MOVE_FLYING; |
|
|
476 | } |
|
|
477 | else |
|
|
478 | LOG (llevDebug, "common/loader.l: set_move - unknown move string '%s'\n", str); |
|
|
479 | } |
|
|
480 | } |
|
|
481 | } |
|
|
482 | } |
|
|
483 | |
|
|
484 | #define GET_FLAG(op,flag) \ |
|
|
485 | if (thawer.get_sint32 ()) \ |
|
|
486 | SET_FLAG (op, flag); \ |
|
|
487 | else \ |
|
|
488 | CLEAR_FLAG (op, flag) \ |
|
|
489 | |
|
|
490 | int |
|
|
491 | parse_object (object *op, object_thawer &thawer, int map_flags) |
|
|
492 | { |
|
|
493 | bool ismore = 0; |
|
|
494 | object *op_inv = op->inv; |
|
|
495 | |
|
|
496 | for (;;) |
|
|
497 | { |
|
|
498 | keyword kw = thawer.get_kv (); |
|
|
499 | |
|
|
500 | switch (kw) |
|
|
501 | { |
|
|
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: |
554 | case KW_uuid: |
512 | if (const char *s = thawer.get_str ()) |
555 | if (!uuid.parse (f.get_str ())) |
513 | { |
556 | { |
514 | unsigned int version; |
557 | f.parse_warn ("unparseable uuid"); |
515 | unsigned long long seq; |
558 | uuid = UUID::gen (); |
|
|
559 | } |
|
|
560 | break; |
516 | |
561 | |
517 | if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) |
562 | case KW_oid: |
|
|
563 | f.get (this, f.get_sint32 ()); |
|
|
564 | break; |
|
|
565 | |
|
|
566 | case KW_name: f.get (name); break; |
|
|
567 | case KW_name_pl: f.get (name_pl); break; |
|
|
568 | case KW_title: f.get (title); break; |
|
|
569 | case KW_custom_name: f.get (custom_name); break; |
|
|
570 | |
|
|
571 | case KW_attach: f.get_ornull (attach); break; |
|
|
572 | case KW_skill: f.get_ornull (skill); break; |
|
|
573 | case KW_race: f.get_ornull (race); break; |
|
|
574 | case KW_slaying: f.get_ornull (slaying); break; |
|
|
575 | case KW_tag: f.get_ornull (tag); break; |
|
|
576 | |
|
|
577 | case KW_arch: |
|
|
578 | if (object *tmp = object::read (f)) |
|
|
579 | { |
|
|
580 | tmp->deactivate (); |
|
|
581 | |
|
|
582 | // was: insert_ob_in_ob (tmp, op); |
|
|
583 | // but manually adding it can improve map loading times a lot |
|
|
584 | // also, appending instead of prepending keeps the |
|
|
585 | // save ordering the same between repeated load/saves. |
|
|
586 | // and finally we do not want any funny effects |
|
|
587 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
|
|
588 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
|
|
589 | |
|
|
590 | if (!op_inv) |
518 | { |
591 | { |
|
|
592 | inv = tmp; |
519 | op->uuid.seq = seq; |
593 | tmp->above = 0; |
520 | break; |
|
|
521 | } |
594 | } |
|
|
595 | else |
|
|
596 | { |
|
|
597 | while (op_inv->below) |
|
|
598 | op_inv = op_inv->below; |
|
|
599 | |
|
|
600 | op_inv->below = tmp; |
|
|
601 | tmp->above = op_inv; |
|
|
602 | } |
|
|
603 | |
|
|
604 | tmp->below = 0; |
|
|
605 | tmp->env = this; |
|
|
606 | op_inv = tmp; |
522 | } |
607 | } |
523 | |
|
|
524 | op->uuid = gen_uuid (); |
|
|
525 | break; |
|
|
526 | |
|
|
527 | case KW_oid: |
|
|
528 | thawer.get (op, thawer.get_sint32 ()); |
|
|
529 | break; |
|
|
530 | |
|
|
531 | case KW_name: thawer.get (op->name); break; |
|
|
532 | case KW_name_pl: thawer.get (op->name_pl); break; |
|
|
533 | case KW_title: thawer.get (op->title); break; |
|
|
534 | case KW_custom_name: thawer.get (op->custom_name); break; |
|
|
535 | |
|
|
536 | case KW_attach: thawer.get_ornull (op->attach); break; |
|
|
537 | case KW_skill: thawer.get_ornull (op->skill); break; |
|
|
538 | case KW_race: thawer.get_ornull (op->race); break; |
|
|
539 | case KW_slaying: thawer.get_ornull (op->slaying); break; |
|
|
540 | |
|
|
541 | case KW_arch: |
|
|
542 | { |
|
|
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 (); |
|
|
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 (); |
|
|
568 | |
|
|
569 | parse_object (tmp, thawer, map_flags); |
|
|
570 | |
|
|
571 | if (tmp->arch) |
|
|
572 | { |
|
|
573 | // was: insert_ob_in_ob (tmp, op); |
|
|
574 | // but manually adding it can improve map loading times a lot |
|
|
575 | // also, appending instead of prepending keeps the |
|
|
576 | // save ordering the same between repeated load/saves. |
|
|
577 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
|
|
578 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
|
|
579 | |
|
|
580 | if (!op_inv) |
|
|
581 | { |
|
|
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; |
|
|
597 | } |
|
|
598 | else |
|
|
599 | { |
|
|
600 | LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); |
|
|
601 | tmp->destroy (); |
|
|
602 | } |
|
|
603 | } |
|
|
604 | else |
608 | else |
605 | { |
609 | LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n"); |
606 | /* This is the actual archetype definition then */ |
|
|
607 | op->arch = archetype::find (str); |
|
|
608 | |
610 | |
609 | if (op->arch) |
611 | continue; |
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 | } |
|
|
620 | break; |
|
|
621 | |
612 | |
622 | case KW_other_arch: |
613 | case KW_other_arch: |
|
|
614 | if (loading_arch == this) |
|
|
615 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
|
|
616 | else |
|
|
617 | { |
623 | op->other_arch = archetype::find (thawer.get_str ()); |
618 | other_arch = archetype::find (f.get_str ()); |
|
|
619 | |
|
|
620 | if (!other_arch) |
|
|
621 | f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ())); |
|
|
622 | } |
|
|
623 | break; |
|
|
624 | |
|
|
625 | case KW_owner: |
|
|
626 | f.delayed_deref (this, owner, f.get_str ()); |
624 | break; |
627 | break; |
625 | |
628 | |
626 | case KW_animation: |
629 | case KW_animation: |
627 | { |
630 | { |
628 | const char *str = thawer.get_str (); |
|
|
629 | |
|
|
630 | if (!str) |
|
|
631 | { |
|
|
632 | op->animation_id = 0; |
|
|
633 | CLEAR_FLAG (op, FLAG_ANIMATE); |
631 | CLEAR_FLAG (this, FLAG_ANIMATE); |
634 | } |
632 | animation_id = 0; |
635 | else |
633 | |
636 | { |
634 | if (f.has_value () && (animation_id = find_animation (f.get_str ()))) |
637 | op->animation_id = find_animation (str); |
635 | SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here |
638 | SET_FLAG (op, FLAG_ANIMATE); |
|
|
639 | } |
|
|
640 | } |
636 | } |
641 | |
|
|
642 | break; |
637 | break; |
643 | |
638 | |
644 | case KW_last_heal: thawer.get (op->last_heal); break; |
639 | case KW_last_heal: f.get (last_heal); break; |
645 | case KW_last_sp: thawer.get (op->last_sp); break; |
640 | case KW_last_sp: f.get (last_sp); break; |
646 | case KW_last_grace: thawer.get (op->last_grace); break; |
641 | case KW_last_grace: f.get (last_grace); break; |
647 | case KW_last_eat: thawer.get (op->last_eat); break; |
642 | case KW_last_eat: f.get (last_eat); break; |
648 | case KW_speed_left: thawer.get (op->speed_left); break; |
643 | case KW_speed_left: f.get (speed_left); break; |
649 | |
644 | |
650 | case KW_speed: |
645 | case KW_speed: |
651 | thawer.get (op->speed); |
646 | f.get (speed); |
652 | |
647 | |
653 | //TODO: maybe do in check_object |
648 | //TODO: maybe do in check_object |
654 | // removed check for style maps |
649 | // removed check for style maps |
655 | if (op->speed < 0) |
650 | if (speed < 0) |
656 | op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; |
651 | speed_left = speed_left - rndm (); |
657 | |
652 | |
658 | break; |
653 | break; |
659 | |
654 | |
660 | case KW_slow_move: |
655 | case KW_slow_move: |
661 | op->move_slow |= MOVE_WALK; |
656 | move_slow |= MOVE_WALK; |
662 | thawer.get (op->move_slow_penalty); |
657 | f.get (move_slow_penalty); |
663 | break; |
658 | break; |
664 | |
659 | |
665 | case KW_face: |
660 | case KW_face: |
666 | op->face = &new_faces[FindFace (thawer.get_str (), 0)]; |
661 | face = f.has_value () ? face_find (f.get_str ()) : blank_face; |
|
|
662 | break; |
|
|
663 | |
|
|
664 | case KW_sound: |
|
|
665 | if (f.has_value ()) |
|
|
666 | { |
|
|
667 | sound = sound_find (f.get_str ()); |
|
|
668 | if (!sound) |
|
|
669 | f.parse_warn (format ("sound '%s' not found", f.get_str ())); |
|
|
670 | } |
667 | break; |
671 | else |
|
|
672 | sound = 0; |
|
|
673 | break; |
668 | |
674 | |
|
|
675 | case KW_sound_destroy: |
|
|
676 | if (f.has_value ()) |
|
|
677 | { |
|
|
678 | sound_destroy = sound_find (f.get_str ()); |
|
|
679 | if (!sound_destroy) |
|
|
680 | f.parse_warn (format ("sound '%s' not found", f.get_str ())); |
|
|
681 | } |
|
|
682 | else |
|
|
683 | sound_destroy = 0; |
|
|
684 | break; |
|
|
685 | |
669 | case KW_x: thawer.get (op->x); break; |
686 | case KW_x: f.get (x); break; |
670 | case KW_y: thawer.get (op->y); break; |
687 | case KW_y: f.get (y); break; |
671 | |
688 | |
672 | case KW_Str: // uppercase alias |
689 | case KW_Str: // uppercase alias |
673 | case KW_str: thawer.get (op->stats.Str); break; |
690 | case KW_str: f.get (stats.Str); break; |
674 | case KW_Dex: // uppercase alias |
691 | case KW_Dex: // uppercase alias |
675 | case KW_dex: thawer.get (op->stats.Dex); break; |
692 | case KW_dex: f.get (stats.Dex); break; |
676 | case KW_Con: // uppercase alias |
693 | case KW_Con: // uppercase alias |
677 | case KW_con: thawer.get (op->stats.Con); break; |
694 | case KW_con: f.get (stats.Con); break; |
678 | case KW_Wis: // uppercase alias |
695 | case KW_Wis: // uppercase alias |
679 | case KW_wis: thawer.get (op->stats.Wis); break; |
696 | case KW_wis: f.get (stats.Wis); break; |
680 | case KW_Cha: // uppercase alias |
697 | case KW_Cha: // uppercase alias |
681 | case KW_cha: thawer.get (op->stats.Cha); break; |
698 | case KW_cha: f.get (stats.Cha); break; |
682 | case KW_Int: // uppercase alias |
699 | case KW_Int: // uppercase alias |
683 | case KW_int: thawer.get (op->stats.Int); break; |
700 | case KW_int: f.get (stats.Int); break; |
684 | case KW_Pow: // uppercase alias |
701 | case KW_Pow: // uppercase alias |
685 | case KW_pow: thawer.get (op->stats.Pow); break; |
702 | case KW_pow: f.get (stats.Pow); break; |
686 | |
703 | |
687 | case KW_hp: thawer.get (op->stats.hp); break; |
704 | case KW_hp: f.get (stats.hp); break; |
688 | case KW_maxhp: thawer.get (op->stats.maxhp); break; |
705 | case KW_maxhp: f.get (stats.maxhp); break; |
689 | case KW_sp: thawer.get (op->stats.sp); break; |
706 | case KW_sp: f.get (stats.sp); break; |
690 | case KW_maxsp: thawer.get (op->stats.maxsp); break; |
707 | case KW_maxsp: f.get (stats.maxsp); break; |
691 | case KW_grace: thawer.get (op->stats.grace); break; |
708 | case KW_grace: f.get (stats.grace); break; |
692 | case KW_maxgrace: thawer.get (op->stats.maxgrace); break; |
709 | case KW_maxgrace: f.get (stats.maxgrace); break; |
693 | |
710 | |
694 | case KW_exp: thawer.get (op->stats.exp); break; |
711 | case KW_exp: f.get (stats.exp); break; |
695 | case KW_perm_exp: thawer.get (op->perm_exp); break; |
712 | case KW_perm_exp: f.get (perm_exp); break; |
696 | case KW_food: thawer.get (op->stats.food); break; |
713 | case KW_food: f.get (stats.food); break; |
697 | case KW_dam: thawer.get (op->stats.dam); break; |
714 | case KW_dam: f.get (stats.dam); break; |
698 | case KW_wc: thawer.get (op->stats.wc); break; |
715 | case KW_wc: f.get (stats.wc); break; |
699 | case KW_ac: thawer.get (op->stats.ac); break; |
716 | case KW_ac: f.get (stats.ac); break; |
700 | case KW_nrof: thawer.get (op->nrof); break; |
717 | case KW_nrof: f.get (nrof); break; |
701 | case KW_level: thawer.get (op->level); break; |
718 | case KW_level: f.get (level); break; |
702 | case KW_direction: thawer.get (op->direction); break; |
719 | case KW_direction: f.get (direction); break; |
703 | case KW_type: thawer.get (op->type); break; |
720 | case KW_type: f.get (type); break; |
704 | case KW_subtype: thawer.get (op->subtype); break; |
721 | case KW_subtype: f.get (subtype); break; |
705 | case KW_value: thawer.get (op->value); break; |
722 | case KW_value: f.get (value); break; |
706 | case KW_weight: thawer.get (op->weight); break; |
723 | case KW_weight: f.get (weight); break; |
707 | case KW_carrying: thawer.get (op->carrying); break; |
724 | case KW_carrying: f.get (carrying); break; |
708 | case KW_attacktype: thawer.get (op->attacktype); break; |
725 | case KW_attacktype: f.get (attacktype); break; |
709 | case KW_path_attuned: thawer.get (op->path_attuned); break; |
726 | case KW_path_attuned: f.get (path_attuned); break; |
710 | case KW_path_repelled: thawer.get (op->path_repelled); break; |
727 | case KW_path_repelled: f.get (path_repelled); break; |
711 | case KW_path_denied: thawer.get (op->path_denied); break; |
728 | case KW_path_denied: f.get (path_denied); break; |
712 | case KW_invisible: thawer.get (op->invisible); break; |
729 | case KW_invisible: f.get (invisible); break; |
713 | case KW_magic: thawer.get (op->magic); break; |
730 | case KW_magic: f.get (magic); break; |
714 | case KW_state: thawer.get (op->state); break; |
731 | case KW_state: f.get (state); break; |
715 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
732 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
716 | case KW_material: thawer.get (op->material); break; |
733 | case KW_material: f.get (materials); break; //TODO: nuke |
717 | case KW_materialname: thawer.get (op->materialname); break; |
734 | |
|
|
735 | case KW_materialname: |
|
|
736 | { |
|
|
737 | shstr sh; |
|
|
738 | f.get (sh); |
|
|
739 | material = name_to_material (sh); |
|
|
740 | } |
|
|
741 | break; |
718 | |
742 | |
719 | /* These are the new values */ |
743 | /* These are the new values */ |
720 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
744 | case KW_move_block: set_move (move_block, f); break; |
721 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
745 | case KW_move_allow: set_move (move_allow, f); break; |
722 | case KW_move_type: set_move (op->move_type, thawer.get_str ()); break; |
746 | case KW_move_type: set_move (move_type , f); break; |
723 | case KW_move_on: set_move (op->move_on, thawer.get_str ()); break; |
747 | case KW_move_on: set_move (move_on , f); break; |
724 | case KW_move_off: set_move (op->move_off, thawer.get_str ()); break; |
748 | case KW_move_off: set_move (move_off , f); break; |
725 | case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break; |
749 | case KW_move_slow: set_move (move_slow , f); break; |
726 | |
750 | |
727 | /* These are all legacy - any new objects should use the move_ .. values */ |
751 | /* These are all legacy - any new objects should use the move_ .. values */ |
728 | case KW_no_pass: |
752 | case KW_no_pass: |
729 | { |
753 | { |
730 | if (thawer.get_sint32 ()) |
754 | if (f.get_sint32 ()) |
731 | op->move_block = MOVE_ALL; |
755 | move_block = MOVE_ALL; |
732 | else |
756 | else |
733 | op->move_block = 0; |
757 | move_block = 0; |
734 | } |
758 | } |
735 | |
759 | |
736 | break; |
760 | break; |
737 | |
761 | |
738 | /* These are all legacy - any new objects should use the move_ .. values */ |
762 | /* These are all legacy - any new objects should use the move_ .. values */ |
739 | case KW_walk_on: |
763 | case KW_walk_on: |
740 | { |
764 | { |
741 | if (thawer.get_sint32 ()) |
765 | if (f.get_sint32 ()) |
742 | op->move_on |= MOVE_WALK; |
766 | move_on |= MOVE_WALK; |
743 | else |
767 | else |
744 | op->move_on &= ~MOVE_WALK; |
768 | move_on &= ~MOVE_WALK; |
745 | } |
769 | } |
746 | |
770 | |
747 | break; |
771 | break; |
748 | |
772 | |
749 | /* These are all legacy - any new objects should use the move_ .. values */ |
773 | /* These are all legacy - any new objects should use the move_ .. values */ |
750 | case KW_walk_off: |
774 | case KW_walk_off: |
751 | { |
775 | { |
752 | if (thawer.get_sint32 ()) |
776 | if (f.get_sint32 ()) |
753 | op->move_off |= MOVE_WALK; |
777 | move_off |= MOVE_WALK; |
754 | else |
778 | else |
755 | op->move_off &= ~MOVE_WALK; |
779 | move_off &= ~MOVE_WALK; |
756 | } |
780 | } |
757 | break; |
781 | break; |
758 | |
782 | |
759 | /* These are all legacy - any new objects should use the move_ .. values */ |
783 | /* These are all legacy - any new objects should use the move_ .. values */ |
760 | case KW_fly_on: |
784 | case KW_fly_on: |
761 | { |
785 | { |
762 | if (thawer.get_sint32 ()) |
786 | if (f.get_sint32 ()) |
763 | op->move_on |= MOVE_FLY_LOW; |
787 | move_on |= MOVE_FLY_LOW; |
764 | else |
788 | else |
765 | op->move_on &= ~MOVE_FLY_LOW; |
789 | move_on &= ~MOVE_FLY_LOW; |
766 | } |
790 | } |
767 | break; |
791 | break; |
768 | |
792 | |
769 | /* These are all legacy - any new objects should use the move_ .. values */ |
793 | /* These are all legacy - any new objects should use the move_ .. values */ |
770 | case KW_fly_off: |
794 | case KW_fly_off: |
771 | { |
795 | { |
772 | if (thawer.get_sint32 ()) |
796 | if (f.get_sint32 ()) |
773 | op->move_off |= MOVE_FLY_LOW; |
797 | move_off |= MOVE_FLY_LOW; |
774 | else |
798 | else |
775 | op->move_off &= ~MOVE_FLY_LOW; |
799 | move_off &= ~MOVE_FLY_LOW; |
776 | } |
800 | } |
777 | break; |
801 | break; |
778 | |
802 | |
779 | //TODO: remove these after converting archetypes |
803 | //TODO: remove these after converting archetypes |
780 | case KW_can_use_wand: |
804 | case KW_can_use_wand: |
781 | GET_FLAG (op, FLAG_USE_RANGE); |
805 | GET_FLAG (this, FLAG_USE_RANGE); |
782 | break; |
806 | break; |
783 | |
807 | |
784 | /* These are all legacy - any new objects should use the move_ .. values */ |
808 | /* These are all legacy - any new objects should use the move_ .. values */ |
785 | case KW_flying: |
809 | case KW_flying: |
786 | { |
810 | { |
787 | if (thawer.get_sint32 ()) |
811 | if (f.get_sint32 ()) |
788 | op->move_type |= MOVE_FLY_LOW; |
812 | move_type |= MOVE_FLY_LOW; |
789 | else |
813 | else |
790 | op->move_type &= ~MOVE_FLY_LOW; |
814 | move_type &= ~MOVE_FLY_LOW; |
791 | } |
815 | } |
792 | break; |
816 | break; |
793 | |
817 | |
794 | |
818 | |
795 | case KW_identified: |
819 | case KW_identified: |
796 | GET_FLAG (op, FLAG_IDENTIFIED); |
820 | GET_FLAG (this, FLAG_IDENTIFIED); |
797 | //TODO: move to check_object or so |
821 | //TODO: move to check_object or so |
798 | if (QUERY_FLAG (op, FLAG_IDENTIFIED)) |
822 | if (QUERY_FLAG (this, FLAG_IDENTIFIED)) |
799 | CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); |
823 | CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); |
800 | |
824 | |
801 | break; |
825 | break; |
802 | |
826 | |
803 | case KW_wiz: |
827 | case KW_friendly: |
804 | GET_FLAG (op, FLAG_WIZ); |
828 | if (f.get_bool ()) |
805 | //TODO: move to check_object |
829 | if (type != PLAYER) |
806 | if (QUERY_FLAG (op, FLAG_WIZ)) |
830 | add_friendly_object (this); |
|
|
831 | |
|
|
832 | break; |
|
|
833 | |
|
|
834 | case KW_monster: GET_FLAG (this, FLAG_MONSTER); break; |
|
|
835 | case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break; |
|
|
836 | case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break; |
|
|
837 | case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break; |
|
|
838 | case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break; |
|
|
839 | case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break; |
|
|
840 | case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break; |
|
|
841 | case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break; |
|
|
842 | case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break; |
|
|
843 | case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break; |
|
|
844 | case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break; |
|
|
845 | case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break; |
|
|
846 | case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; |
|
|
847 | case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; |
|
|
848 | case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; |
|
|
849 | case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; |
|
|
850 | case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; |
|
|
851 | case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break; |
|
|
852 | case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; |
|
|
853 | case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; |
|
|
854 | case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; |
|
|
855 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
|
|
856 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
|
|
857 | case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; |
|
|
858 | case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; |
|
|
859 | case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; |
|
|
860 | case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; |
|
|
861 | case KW_scared: GET_FLAG (this, FLAG_SCARED); break; |
|
|
862 | case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; |
|
|
863 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
|
|
864 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
|
|
865 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
|
|
866 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
|
|
867 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
|
|
868 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
|
|
869 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
|
|
870 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
|
|
871 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
|
|
872 | case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; |
|
|
873 | case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break; |
|
|
874 | case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break; |
|
|
875 | case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break; |
|
|
876 | case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break; |
|
|
877 | case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break; |
|
|
878 | case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break; |
|
|
879 | case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break; |
|
|
880 | case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break; |
|
|
881 | case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break; |
|
|
882 | case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break; |
|
|
883 | case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break; |
|
|
884 | case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break; |
|
|
885 | case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break; |
|
|
886 | case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
|
|
887 | case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break; |
|
|
888 | case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break; |
|
|
889 | case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break; |
|
|
890 | case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break; |
|
|
891 | case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break; |
|
|
892 | case KW_cursed: GET_FLAG (this, FLAG_CURSED); break; |
|
|
893 | case KW_damned: GET_FLAG (this, FLAG_DAMNED); break; |
|
|
894 | case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break; |
|
|
895 | case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break; |
|
|
896 | case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break; |
|
|
897 | case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break; |
|
|
898 | case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break; |
|
|
899 | case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break; |
|
|
900 | case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break; |
|
|
901 | case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break; |
|
|
902 | case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break; |
|
|
903 | case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break; |
|
|
904 | case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break; |
|
|
905 | case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break; |
|
|
906 | case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break; |
|
|
907 | case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break; |
|
|
908 | case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break; |
|
|
909 | case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break; |
|
|
910 | case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break; |
|
|
911 | case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break; |
|
|
912 | case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break; |
|
|
913 | case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break; |
|
|
914 | case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break; |
|
|
915 | case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break; |
|
|
916 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
|
|
917 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
|
|
918 | case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; |
|
|
919 | case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; |
|
|
920 | case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; |
|
|
921 | |
|
|
922 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
|
|
923 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
|
|
924 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
|
|
925 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
|
|
926 | case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break; |
|
|
927 | case KW_resist_cold: f.get (resist[ATNR_COLD]); break; |
|
|
928 | case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break; |
|
|
929 | case KW_resist_acid: f.get (resist[ATNR_ACID]); break; |
|
|
930 | case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break; |
|
|
931 | case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break; |
|
|
932 | case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break; |
|
|
933 | case KW_resist_poison: f.get (resist[ATNR_POISON]); break; |
|
|
934 | case KW_resist_slow: f.get (resist[ATNR_SLOW]); break; |
|
|
935 | case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break; |
|
|
936 | case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break; |
|
|
937 | case KW_resist_fear: f.get (resist[ATNR_FEAR]); break; |
|
|
938 | case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break; |
|
|
939 | case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break; |
|
|
940 | case KW_resist_death: f.get (resist[ATNR_DEATH]); break; |
|
|
941 | case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break; |
|
|
942 | case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break; |
|
|
943 | case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break; |
|
|
944 | case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break; |
|
|
945 | case KW_resist_blind: f.get (resist[ATNR_BLIND]); break; |
|
|
946 | case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break; |
|
|
947 | case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break; |
|
|
948 | case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break; |
|
|
949 | |
|
|
950 | case KW_luck: f.get (stats.luck); break; |
|
|
951 | case KW_run_away: f.get (run_away); break; |
|
|
952 | case KW_pick_up: f.get (pick_up); break; |
|
|
953 | case KW_item_power: f.get (item_power); break; |
|
|
954 | case KW_gen_sp_armour: f.get (gen_sp_armour); break; |
|
|
955 | case KW_anim_speed: f.get (anim_speed); break; |
|
|
956 | case KW_container: f.get (weight_limit); break; |
|
|
957 | case KW_will_apply: f.get (will_apply); break; |
|
|
958 | case KW_attack_movement: f.get (attack_movement); break; |
|
|
959 | case KW_move_state: f.get (move_status); break; |
|
|
960 | //case KW_expmul: f.get (expmul); break;//D declared const for the time being |
|
|
961 | case KW_glow_radius: f.get (glow_radius); break; |
|
|
962 | case KW_weapontype: f.get (weapontype); break; |
|
|
963 | case KW_casting_time: f.get (casting_time); break; |
|
|
964 | |
|
|
965 | // elevation is deprecated |
|
|
966 | case KW_elevation: break; |
|
|
967 | |
|
|
968 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
|
|
969 | case KW_client_type: f.get (client_type); break; |
|
|
970 | case KW_duration: f.get (duration); break; |
|
|
971 | case KW_range: f.get (range); break; |
|
|
972 | case KW_range_modifier: f.get (range_modifier); break; |
|
|
973 | case KW_dam_modifier: f.get (dam_modifier); break; |
|
|
974 | case KW_duration_modifier: f.get (duration_modifier); break; |
|
|
975 | |
|
|
976 | //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess |
|
|
977 | //TODO: parse from other include files |
|
|
978 | case KW_body_range: slot[body_range] .info = f.get_sint32 (); break; |
|
|
979 | case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break; |
|
|
980 | case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break; |
|
|
981 | case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break; |
|
|
982 | case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break; |
|
|
983 | case KW_body_head: slot[body_head] .info = f.get_sint32 (); break; |
|
|
984 | case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break; |
|
|
985 | case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break; |
|
|
986 | case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break; |
|
|
987 | case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break; |
|
|
988 | case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break; |
|
|
989 | case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break; |
|
|
990 | case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break; |
|
|
991 | case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; |
|
|
992 | case KW_can_apply: |
|
|
993 | break; |
|
|
994 | |
|
|
995 | case KW_connected: |
|
|
996 | { |
|
|
997 | shstr connected; |
|
|
998 | |
|
|
999 | f.get (connected); |
|
|
1000 | add_link (map, connected); |
|
|
1001 | } |
|
|
1002 | break; |
|
|
1003 | |
|
|
1004 | case KW_randomitems: |
|
|
1005 | if (f.has_value ()) |
807 | { |
1006 | { |
808 | SET_FLAG (op, FLAG_WAS_WIZ); |
1007 | randomitems = |
809 | SET_FLAG (op, FLAG_WIZPASS); |
1008 | loading_arch |
810 | SET_FLAG (op, FLAG_WIZCAST); |
1009 | ? treasurelist::get (f.get_str ()) |
|
|
1010 | : treasurelist::find (f.get_str ()); |
|
|
1011 | |
|
|
1012 | if (!randomitems) |
|
|
1013 | { |
|
|
1014 | LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); |
|
|
1015 | randomitems = treasurelist::get (shstr_none); // avoid crashes |
|
|
1016 | } |
811 | } |
1017 | } |
812 | else |
1018 | else |
813 | { |
1019 | randomitems = 0; |
814 | CLEAR_FLAG (op, FLAG_WIZPASS); |
|
|
815 | CLEAR_FLAG (op, FLAG_WIZCAST); |
|
|
816 | } |
|
|
817 | break; |
|
|
818 | |
|
|
819 | case KW_friendly: |
|
|
820 | if (thawer.get_sint32 ()) |
|
|
821 | if (op->type != PLAYER) |
|
|
822 | add_friendly_object (op); |
|
|
823 | |
|
|
824 | break; |
|
|
825 | |
|
|
826 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
|
|
827 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
|
|
828 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
|
|
829 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
|
|
830 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
|
|
831 | case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; |
|
|
832 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
|
|
833 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
|
|
834 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
|
|
835 | case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; |
|
|
836 | case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; |
|
|
837 | case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; |
|
|
838 | case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; |
|
|
839 | case KW_alive: GET_FLAG (op, FLAG_ALIVE); break; |
|
|
840 | case KW_applied: GET_FLAG (op, FLAG_APPLIED); break; |
|
|
841 | case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break; |
|
|
842 | case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break; |
|
|
843 | case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break; |
|
|
844 | case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break; |
|
|
845 | case KW_changing: GET_FLAG (op, FLAG_CHANGING); break; |
|
|
846 | case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break; |
|
|
847 | case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break; |
|
|
848 | case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break; |
|
|
849 | case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break; |
|
|
850 | case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break; |
|
|
851 | case KW_scared: GET_FLAG (op, FLAG_SCARED); break; |
|
|
852 | case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break; |
|
|
853 | case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break; |
|
|
854 | case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break; |
|
|
855 | case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break; |
|
|
856 | case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break; |
|
|
857 | case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break; |
|
|
858 | case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break; |
|
|
859 | case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break; |
|
|
860 | case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break; |
|
|
861 | case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break; |
|
|
862 | case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break; |
|
|
863 | case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break; |
|
|
864 | case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break; |
|
|
865 | case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break; |
|
|
866 | case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; |
|
|
867 | case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; |
|
|
868 | case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; |
|
|
869 | case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; |
|
|
870 | case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; |
|
|
871 | case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break; |
|
|
872 | case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; |
|
|
873 | case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; |
|
|
874 | case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; |
|
|
875 | case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; |
|
|
876 | case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; |
|
|
877 | case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break; |
|
|
878 | case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break; |
|
|
879 | case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break; |
|
|
880 | case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break; |
|
|
881 | case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break; |
|
|
882 | case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break; |
|
|
883 | case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break; |
|
|
884 | case KW_cursed: GET_FLAG (op, FLAG_CURSED); break; |
|
|
885 | case KW_damned: GET_FLAG (op, FLAG_DAMNED); break; |
|
|
886 | case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break; |
|
|
887 | case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break; |
|
|
888 | case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break; |
|
|
889 | case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break; |
|
|
890 | case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break; |
|
|
891 | case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break; |
|
|
892 | case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break; |
|
|
893 | case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break; |
|
|
894 | case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break; |
|
|
895 | case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break; |
|
|
896 | case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break; |
|
|
897 | case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break; |
|
|
898 | case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break; |
|
|
899 | case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break; |
|
|
900 | case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break; |
|
|
901 | case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break; |
|
|
902 | case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break; |
|
|
903 | case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break; |
|
|
904 | case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break; |
|
|
905 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
|
|
906 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
|
|
907 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
|
|
908 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
|
|
909 | case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; |
|
|
910 | case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break; |
|
|
911 | |
|
|
912 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
|
|
913 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
|
|
914 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
|
|
915 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
|
|
916 | case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break; |
|
|
917 | case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break; |
|
|
918 | case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break; |
|
|
919 | case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break; |
|
|
920 | case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break; |
|
|
921 | case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break; |
|
|
922 | case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break; |
|
|
923 | case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break; |
|
|
924 | case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break; |
|
|
925 | case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break; |
|
|
926 | case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break; |
|
|
927 | case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break; |
|
|
928 | case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break; |
|
|
929 | case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break; |
|
|
930 | case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break; |
|
|
931 | case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break; |
|
|
932 | case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break; |
|
|
933 | case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break; |
|
|
934 | case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break; |
|
|
935 | case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break; |
|
|
936 | case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break; |
|
|
937 | case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break; |
|
|
938 | case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break; |
|
|
939 | |
|
|
940 | case KW_luck: thawer.get (op->stats.luck); break; |
|
|
941 | case KW_run_away: thawer.get (op->run_away); break; |
|
|
942 | case KW_pick_up: thawer.get (op->pick_up); break; |
|
|
943 | case KW_item_power: thawer.get (op->item_power); break; |
|
|
944 | case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break; |
|
|
945 | case KW_anim_speed: thawer.get (op->anim_speed); break; |
|
|
946 | case KW_container: thawer.get (op->weight_limit); break; |
|
|
947 | case KW_will_apply: thawer.get (op->will_apply); break; |
|
|
948 | case KW_attack_movement: thawer.get (op->attack_movement); break; |
|
|
949 | case KW_move_state: thawer.get (op->move_status); break; |
|
|
950 | case KW_expmul: thawer.get (op->expmul); break; |
|
|
951 | case KW_glow_radius: thawer.get (op->glow_radius); break; |
|
|
952 | case KW_weapontype: thawer.get (op->weapontype); break; |
|
|
953 | case KW_tooltype: thawer.get (op->tooltype); break; |
|
|
954 | case KW_casting_time: thawer.get (op->casting_time); break; |
|
|
955 | case KW_elevation: thawer.get (op->elevation); break; |
|
|
956 | case KW_smoothlevel: thawer.get (op->smoothlevel); break; |
|
|
957 | case KW_client_type: thawer.get (op->client_type); break; |
|
|
958 | case KW_duration: thawer.get (op->duration); break; |
|
|
959 | case KW_range: thawer.get (op->range); break; |
|
|
960 | case KW_range_modifier: thawer.get (op->range_modifier); break; |
|
|
961 | case KW_dam_modifier: thawer.get (op->dam_modifier); break; |
|
|
962 | case KW_duration_modifier: thawer.get (op->duration_modifier); break; |
|
|
963 | |
|
|
964 | //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess |
|
|
965 | //TODO: parse from other include files |
|
|
966 | case KW_body_range: thawer.get (op->body_info[0]); break; |
|
|
967 | case KW_body_arm: thawer.get (op->body_info[1]); break; |
|
|
968 | case KW_body_torso: thawer.get (op->body_info[2]); break; |
|
|
969 | case KW_body_head: thawer.get (op->body_info[3]); break; |
|
|
970 | case KW_body_neck: thawer.get (op->body_info[4]); break; |
|
|
971 | case KW_body_skill: thawer.get (op->body_info[5]); break; |
|
|
972 | case KW_body_finger: thawer.get (op->body_info[6]); break; |
|
|
973 | case KW_body_shoulder: thawer.get (op->body_info[7]); break; |
|
|
974 | case KW_body_foot: thawer.get (op->body_info[8]); break; |
|
|
975 | case KW_body_hand: thawer.get (op->body_info[9]); break; |
|
|
976 | case KW_body_wrist: thawer.get (op->body_info[10]); break; |
|
|
977 | case KW_body_waist: thawer.get (op->body_info[11]); break; |
|
|
978 | case KW_can_apply: |
|
|
979 | break; |
|
|
980 | |
|
|
981 | case KW_connected: |
|
|
982 | add_button_link (op, op->map, thawer.get_sint32 ()); |
|
|
983 | break; |
|
|
984 | |
|
|
985 | case KW_randomitems: |
|
|
986 | op->randomitems = find_treasurelist (thawer.get_str ()); |
|
|
987 | break; |
1020 | break; |
988 | |
1021 | |
989 | case KW_msg: |
1022 | case KW_msg: |
990 | thawer.get_ml (KW_endmsg, op->msg); |
1023 | f.get_ml (KW_endmsg, msg); |
991 | //TODO: allow longer messages |
|
|
992 | if (strlen (op->msg) >= HUGE_BUF) |
|
|
993 | { |
|
|
994 | LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
|
|
995 | op->msg = "ERROR, please report: string too long, winged.\n"; |
|
|
996 | } |
|
|
997 | break; |
1024 | break; |
998 | |
1025 | |
999 | case KW_lore: |
1026 | case KW_lore: |
1000 | thawer.get_ml (KW_endlore, op->lore); |
1027 | f.get_ml (KW_endlore, lore); |
1001 | //TODO: allow longer messages |
|
|
1002 | /* Just print a warning so we can be reasonably safe |
|
|
1003 | * about not overflowing the buffer. |
|
|
1004 | */ |
|
|
1005 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
|
|
1006 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
|
|
1007 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
|
|
1008 | break; |
1028 | break; |
1009 | |
1029 | |
1010 | case KW_editable: |
1030 | case KW_editable: |
1011 | case KW_editor_folder: |
1031 | case KW_editor_folder: |
1012 | break; |
1032 | break; |
1013 | |
1033 | |
1014 | case KW_More: // uppercase alias |
|
|
1015 | case KW_more: |
|
|
1016 | /* We need to record that this is a multipart object, |
|
|
1017 | * so the calling function can glue things back together |
|
|
1018 | */ |
|
|
1019 | ismore = 1; |
|
|
1020 | break; |
|
|
1021 | |
|
|
1022 | case KW_end: |
1034 | case KW_end: |
1023 | check_loaded_object (op); |
|
|
1024 | |
|
|
1025 | if (!arch_init) |
1035 | if (!loading_arch) |
1026 | op->instantiate (); |
1036 | instantiate (); |
1027 | |
1037 | |
1028 | return ismore ? LL_MORE : LL_NORMAL; |
1038 | f.next (); |
1029 | |
|
|
1030 | case KW_EOF: |
|
|
1031 | return LL_EOF; |
1039 | return true; |
1032 | |
1040 | |
1033 | case KW_ERROR: |
1041 | case KW_ERROR: |
1034 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
1042 | // append as key value pair (do not use kv_set as it prepends) |
|
|
1043 | // we also do not even try to find old values, duplicate keys stay duplicate |
|
|
1044 | { |
|
|
1045 | key_value *kv = new key_value; |
|
|
1046 | |
|
|
1047 | kv->next = 0; |
|
|
1048 | kv->key = shstr (f.kw_str); |
|
|
1049 | kv->value = shstr (f.value); |
|
|
1050 | |
|
|
1051 | if (!last_kv) |
|
|
1052 | key_values = last_kv = kv; |
|
|
1053 | else |
|
|
1054 | { |
|
|
1055 | while (last_kv->next) |
|
|
1056 | last_kv = last_kv->next; |
|
|
1057 | |
|
|
1058 | last_kv->next = kv; |
|
|
1059 | last_kv = kv; |
|
|
1060 | } |
|
|
1061 | } |
1035 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D |
1062 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
1036 | break; |
1063 | break; |
1037 | |
1064 | |
1038 | default: |
1065 | default: |
1039 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
1066 | if (!f.parse_error ("object", name)) |
|
|
1067 | return false; |
1040 | break; |
1068 | break; |
1041 | } |
1069 | } |
|
|
1070 | |
|
|
1071 | f.next (); |
1042 | } |
1072 | } |
1043 | } |
1073 | } |
1044 | |
1074 | |
1045 | /* |
1075 | object * |
1046 | * Loads an object from the given file-pointer. |
1076 | object::read (object_thawer &f, maptile *map) |
1047 | * Variables will be read and parsed and patched into the object |
|
|
1048 | * until the string "end" is reached, or the end of the file. |
|
|
1049 | * |
|
|
1050 | * bufstat is used to determine various file attributes: |
|
|
1051 | * LO_REPATE (0): We are reading from the same buffer as the last call. |
|
|
1052 | * LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions |
|
|
1053 | * will also be reading from this (treasure file, artifacts.) |
|
|
1054 | * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should |
|
|
1055 | * be reset. |
|
|
1056 | * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) |
|
|
1057 | * |
|
|
1058 | */ |
|
|
1059 | int |
|
|
1060 | load_object (object_thawer &fp, object *op, int map_flags) |
|
|
1061 | { |
1077 | { |
1062 | coroapi::cede_every (1000); // cede once in a while |
1078 | assert (f.kw == KW_arch); |
1063 | |
1079 | |
1064 | return parse_object (op, fp, map_flags); |
1080 | archetype *arch = archetype::find (f.get_str ()); |
|
|
1081 | |
|
|
1082 | if (!arch) |
|
|
1083 | { |
|
|
1084 | LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); |
|
|
1085 | arch = archetype::find (shstr_earthwall); |
|
|
1086 | } |
|
|
1087 | |
|
|
1088 | assert (arch); //D maybe use exception handling of sorts? |
|
|
1089 | |
|
|
1090 | f.next (); |
|
|
1091 | |
|
|
1092 | object *op = arch->instance (); |
|
|
1093 | op->map = map; |
|
|
1094 | // instance() activates, this should be fixed properly |
|
|
1095 | op->deactivate (); |
|
|
1096 | |
|
|
1097 | if (!op->parse_kv (f)) |
|
|
1098 | { |
|
|
1099 | op->destroy (); |
|
|
1100 | return 0; |
|
|
1101 | } |
|
|
1102 | |
|
|
1103 | op->post_load_check (); |
|
|
1104 | return op; |
1065 | } |
1105 | } |
1066 | |
1106 | |
1067 | /* This takes a buffer, scans it for variables, and sets those variables |
1107 | /* This takes a buffer, scans it for variables, and sets those variables |
1068 | * as appropriate in op. |
1108 | * as appropriate in op. |
1069 | * |
1109 | * |
… | |
… | |
1071 | * override values and in c_wiz to mutate values. |
1111 | * override values and in c_wiz to mutate values. |
1072 | */ |
1112 | */ |
1073 | int |
1113 | int |
1074 | set_variable (object *op, char *buf) |
1114 | set_variable (object *op, char *buf) |
1075 | { |
1115 | { |
1076 | object_thawer thawer (buf, (AV *)0); |
1116 | object_thawer f (buf, (AV *)0); |
1077 | |
1117 | |
1078 | return parse_object (op, thawer, 0); |
1118 | return op->parse_kv (f); |
1079 | } |
1119 | } |
1080 | |
1120 | |
1081 | /* |
|
|
1082 | * Initialises the array of variable-names. Needed before any |
|
|
1083 | * objects can be loaded. Called by init_library(). |
|
|
1084 | */ |
|
|
1085 | |
|
|
1086 | void |
|
|
1087 | init_vars () |
|
|
1088 | { |
|
|
1089 | } |
|
|
1090 | |
|
|
1091 | /* This returns a string of the integer movement type */ |
|
|
1092 | #if 0 |
|
|
1093 | // unused function |
|
|
1094 | static char * |
|
|
1095 | get_string_move_type (MoveType mt) |
|
|
1096 | { |
|
|
1097 | static char retbuf[MAX_BUF], retbuf_all[MAX_BUF]; |
|
|
1098 | int i, all_count = 0, count; |
|
|
1099 | |
|
|
1100 | strcpy (retbuf, ""); |
|
|
1101 | strcpy (retbuf_all, " all"); |
|
|
1102 | |
|
|
1103 | /* Quick check, and probably fairly common */ |
|
|
1104 | if (mt == MOVE_ALL) |
|
|
1105 | return retbuf_all + 1; |
|
|
1106 | if (mt == 0) |
|
|
1107 | { |
|
|
1108 | strcpy (retbuf, "0"); |
|
|
1109 | return retbuf; |
|
|
1110 | } |
|
|
1111 | |
|
|
1112 | /* We basically slide the bits down. Why look at MOVE_ALL? |
|
|
1113 | * because we may want to return a string like 'all -swim', |
|
|
1114 | * and if we just looked at mt, we couldn't get that. |
|
|
1115 | */ |
|
|
1116 | for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++) |
|
|
1117 | { |
|
|
1118 | if (mt & (1 << count)) |
|
|
1119 | { |
|
|
1120 | strcat (retbuf, " "); |
|
|
1121 | strcat (retbuf, move_name[count]); |
|
|
1122 | } |
|
|
1123 | else |
|
|
1124 | { |
|
|
1125 | strcat (retbuf_all, " -"); |
|
|
1126 | strcat (retbuf_all, move_name[count]); |
|
|
1127 | all_count++; |
|
|
1128 | } |
|
|
1129 | } |
|
|
1130 | /* Basically, if there is a single negation, return it, eg |
|
|
1131 | * 'all -swim'. But more than that, just return the |
|
|
1132 | * enumerated values. It doesn't make sense to return |
|
|
1133 | * 'all -walk -fly_low' - it is shorter to return 'fly_high swim' |
|
|
1134 | */ |
|
|
1135 | if (all_count <= 1) |
|
|
1136 | return retbuf_all + 1; |
|
|
1137 | else |
|
|
1138 | return retbuf + 1; |
|
|
1139 | } |
|
|
1140 | #endif |
|
|
1141 | |
|
|
1142 | // compare *op against *tmp and output differences |
1121 | // compare *op against *arch and output differences |
1143 | void |
1122 | static void |
1144 | put (object_freezer &f, object *op, object *tmp) |
1123 | write_diff (object_freezer &f, object *op, object *arch) |
1145 | { |
1124 | { |
1146 | static const keyword resist_save[NROFATTACKS] = { |
1125 | static const keyword resist_save[NROFATTACKS] = { |
1147 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1126 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1148 | # include "attackinc.h" |
1127 | # include "attackinc.h" |
1149 | # undef def |
1128 | # undef def |
… | |
… | |
1154 | * the 15'th element of this array should match that name. |
1133 | * the 15'th element of this array should match that name. |
1155 | * If an entry is NULL, that is a flag not to loaded/saved. |
1134 | * If an entry is NULL, that is a flag not to loaded/saved. |
1156 | */ |
1135 | */ |
1157 | static const keyword flag_names [NUM_FLAGS] = { |
1136 | static const keyword flag_names [NUM_FLAGS] = { |
1158 | KW_alive, |
1137 | KW_alive, |
1159 | KW_wiz, |
|
|
1160 | KW_NULL, |
1138 | KW_NULL, |
1161 | KW_NULL, |
1139 | KW_NULL, |
1162 | KW_was_wiz, |
1140 | KW_NULL, |
|
|
1141 | KW_NULL, |
1163 | KW_applied, |
1142 | KW_applied, |
1164 | KW_unpaid, |
1143 | KW_unpaid, |
1165 | KW_can_use_shield, |
1144 | KW_can_use_shield, |
1166 | KW_no_pick, |
1145 | KW_no_pick, |
1167 | KW_NULL, // walk_on |
1146 | KW_NULL, // walk_on |
|
|
1147 | /* 10 */ |
1168 | KW_NULL, // no_pass |
1148 | KW_NULL, // no_pass |
1169 | /* 10 */ |
|
|
1170 | KW_is_animated, |
1149 | KW_is_animated, |
1171 | KW_NULL, // slow_move |
1150 | KW_NULL, // slow_move |
1172 | KW_NULL, // flying |
1151 | KW_NULL, // flying |
1173 | KW_monster, |
1152 | KW_monster, |
1174 | KW_friendly, |
1153 | KW_friendly, |
1175 | KW_generator, |
1154 | KW_generator, |
1176 | KW_is_thrown, |
1155 | KW_is_thrown, |
1177 | KW_auto_apply, |
1156 | KW_auto_apply, |
1178 | KW_NULL, // was KW_treasure |
1157 | KW_treasure_env, |
|
|
1158 | /* 20 */ |
1179 | KW_player_sold, |
1159 | KW_player_sold, |
1180 | /* 20 */ |
|
|
1181 | KW_see_invisible, |
1160 | KW_see_invisible, |
1182 | KW_can_roll, |
1161 | KW_can_roll, |
1183 | KW_overlay_floor, |
1162 | KW_overlay_floor, |
1184 | KW_is_turnable, |
1163 | KW_is_turnable, |
1185 | KW_NULL, // walk_off |
1164 | KW_NULL, // walk_off |
1186 | KW_NULL, // fly_on |
1165 | KW_NULL, // fly_on |
1187 | KW_NULL, // fly_off |
1166 | KW_NULL, // fly_off |
1188 | KW_is_used_up, |
1167 | KW_is_used_up, |
1189 | KW_identified, |
1168 | KW_identified, |
|
|
1169 | /* 30 */ |
1190 | KW_reflecting, |
1170 | KW_reflecting, |
1191 | /* 30 */ |
|
|
1192 | KW_changing, |
1171 | KW_changing, |
1193 | KW_splitting, |
1172 | KW_splitting, |
1194 | KW_hitback, |
1173 | KW_hitback, |
1195 | KW_startequip, |
1174 | KW_startequip, |
1196 | KW_blocksview, |
1175 | KW_blocksview, |
1197 | KW_undead, |
1176 | KW_undead, |
1198 | KW_scared, |
1177 | KW_scared, |
1199 | KW_unaggressive, |
1178 | KW_unaggressive, |
1200 | KW_reflect_missile, |
1179 | KW_reflect_missile, |
|
|
1180 | /* 40 */ |
1201 | KW_reflect_spell, |
1181 | KW_reflect_spell, |
1202 | /* 40 */ |
|
|
1203 | KW_no_magic, |
1182 | KW_no_magic, |
1204 | KW_no_fix_player, |
1183 | KW_NULL, |
1205 | KW_is_lightable, |
1184 | KW_is_lightable, |
1206 | KW_tear_down, |
1185 | KW_tear_down, |
1207 | KW_run_away, |
1186 | KW_run_away, |
1208 | KW_NULL, // pass_thru |
1187 | KW_NULL, // pass_thru |
1209 | KW_NULL, // an_pass_thru |
1188 | KW_NULL, // an_pass_thru |
1210 | KW_pick_up, |
1189 | KW_pick_up, |
1211 | KW_unique, |
1190 | KW_unique, |
|
|
1191 | /* 50 */ |
1212 | KW_no_drop, |
1192 | KW_no_drop, |
1213 | /* 50 */ |
|
|
1214 | KW_NULL, // wizcast |
1193 | KW_NULL, // wizcast |
1215 | KW_can_cast_spell, |
1194 | KW_can_cast_spell, |
1216 | KW_can_use_scroll, |
1195 | KW_can_use_scroll, |
1217 | KW_can_use_range, |
1196 | KW_can_use_range, |
1218 | KW_can_use_bow, |
1197 | KW_can_use_bow, |
1219 | KW_can_use_armour, |
1198 | KW_can_use_armour, |
1220 | KW_can_use_weapon, |
1199 | KW_can_use_weapon, |
1221 | KW_can_use_ring, |
1200 | KW_can_use_ring, |
1222 | KW_has_ready_range, |
1201 | KW_has_ready_range, |
|
|
1202 | /* 60 */ |
1223 | KW_has_ready_bow, |
1203 | KW_has_ready_bow, |
1224 | /* 60 */ |
|
|
1225 | KW_xrays, |
1204 | KW_xrays, |
1226 | KW_NULL, |
1205 | KW_NULL, |
1227 | KW_is_floor, |
1206 | KW_is_floor, |
1228 | KW_lifesave, |
1207 | KW_lifesave, |
1229 | KW_no_strength, |
1208 | KW_no_strength, |
1230 | KW_sleep, |
1209 | KW_sleep, |
1231 | KW_stand_still, |
1210 | KW_stand_still, |
1232 | KW_random_move, |
1211 | KW_random_move, |
1233 | KW_only_attack, |
1212 | KW_only_attack, |
|
|
1213 | /* 70 */ |
1234 | KW_confused, |
1214 | KW_confused, |
1235 | /* 70 */ |
|
|
1236 | KW_stealth, |
1215 | KW_stealth, |
1237 | KW_NULL, |
1216 | KW_NULL, |
1238 | KW_NULL, |
1217 | KW_NULL, |
1239 | KW_cursed, |
1218 | KW_cursed, |
1240 | KW_damned, |
1219 | KW_damned, |
1241 | KW_see_anywhere, |
1220 | KW_see_anywhere, |
1242 | KW_known_magical, |
1221 | KW_known_magical, |
1243 | KW_known_cursed, |
1222 | KW_known_cursed, |
1244 | KW_can_use_skill, |
1223 | KW_can_use_skill, |
|
|
1224 | /* 80 */ |
1245 | KW_been_applied, |
1225 | KW_been_applied, |
1246 | /* 80 */ |
|
|
1247 | KW_has_ready_scroll, |
1226 | KW_has_ready_scroll, |
1248 | KW_can_use_rod, |
1227 | KW_can_use_rod, |
1249 | KW_NULL, |
1228 | KW_precious, |
1250 | KW_can_use_horn, |
1229 | KW_can_use_horn, |
1251 | KW_make_invisible, |
1230 | KW_make_invisible, |
1252 | KW_inv_locked, |
1231 | KW_inv_locked, |
1253 | KW_is_wooded, |
1232 | KW_is_wooded, |
1254 | KW_is_hilly, |
1233 | KW_is_hilly, |
1255 | KW_has_ready_skill, |
1234 | KW_has_ready_skill, |
|
|
1235 | /* 90 */ |
1256 | KW_has_ready_weapon, |
1236 | KW_has_ready_weapon, |
1257 | /* 90 */ |
|
|
1258 | KW_no_skill_ident, |
1237 | KW_no_skill_ident, |
1259 | KW_is_blind, |
1238 | KW_is_blind, |
1260 | KW_can_see_in_dark, |
1239 | KW_can_see_in_dark, |
1261 | KW_is_cauldron, |
1240 | KW_is_cauldron, |
1262 | KW_NULL, |
1241 | KW_NULL, |
1263 | KW_no_steal, |
1242 | KW_no_steal, |
1264 | KW_one_hit, |
1243 | KW_one_hit, |
1265 | KW_NULL, |
1244 | KW_NULL, |
1266 | KW_berserk, |
1245 | KW_berserk, |
|
|
1246 | /* 100 */ |
1267 | KW_neutral, |
1247 | KW_neutral, |
1268 | /* 100 */ |
|
|
1269 | KW_no_attack, |
1248 | KW_no_attack, |
1270 | KW_no_damage, |
1249 | KW_no_damage, |
1271 | KW_NULL, |
1250 | KW_obj_original, |
1272 | KW_NULL, |
1251 | KW_NULL, |
1273 | KW_activate_on_push, |
1252 | KW_activate_on_push, |
1274 | KW_activate_on_release, |
1253 | KW_activate_on_release, |
1275 | KW_is_water, |
1254 | KW_is_water, |
1276 | KW_use_content_on_gen, |
1255 | KW_use_content_on_gen, |
1277 | KW_NULL, |
1256 | KW_NULL, |
|
|
1257 | /* 110 */ |
1278 | KW_is_buildable, |
1258 | KW_is_buildable, |
1279 | /* 110 */ |
|
|
1280 | KW_destroy_on_death, |
1259 | KW_destroy_on_death, |
|
|
1260 | KW_NULL, |
1281 | }; |
1261 | }; |
1282 | |
1262 | |
1283 | int i; |
1263 | // obj_original is the only commonly differing flag between archetype |
|
|
1264 | // and object, so special-case it here to be able to skip the loop |
|
|
1265 | static const struct flagmask : object::flags_t |
|
|
1266 | { |
|
|
1267 | flagmask () |
|
|
1268 | { |
|
|
1269 | for (int i = 0; i < NUM_FLAGS; i++) |
|
|
1270 | if (flag_names [i]) |
|
|
1271 | set (i); |
|
|
1272 | } |
|
|
1273 | } flagmask; |
1284 | |
1274 | |
1285 | /* This saves the key/value lists. We do it first so that any |
1275 | /* This saves the key/value lists. We do it first so that any |
1286 | * keys that match field names will be overwritten by the loader. |
1276 | * keys that match field names will be overwritten by the loader. |
1287 | */ |
1277 | */ |
1288 | for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) |
1278 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1289 | { |
1279 | if (!arch->key_values || arch->kv (kv->key) != kv->value) |
1290 | /* Find the field in the opposing member. */ |
1280 | f.put (kv->key, kv->value); |
1291 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
|
|
1292 | |
1281 | |
1293 | /* If there's no partnering field, or it's got a different value, save our field. */ |
1282 | if (op->uuid) |
1294 | if (!arch_field || my_field->value != arch_field->value) |
|
|
1295 | f.put (my_field->key, my_field->value); |
|
|
1296 | } |
1283 | { |
|
|
1284 | // highly optimised - this is often 25% of all data written |
|
|
1285 | char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1); |
|
|
1286 | char *ptr = cur; |
1297 | |
1287 | |
1298 | /* We don't need to worry about the arch's extra fields - they |
1288 | memcpy (ptr, "uuid ", sizeof ("uuid ") - 1); |
1299 | * will get taken care of the copy_to method. |
1289 | ptr += sizeof ("uuid ") - 1; |
1300 | */ |
1290 | ptr = op->uuid.append (ptr); |
|
|
1291 | *ptr++ = '\n'; |
1301 | |
1292 | |
1302 | { |
1293 | f.alloc (ptr - cur); |
1303 | char uids[64]; |
|
|
1304 | snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); |
|
|
1305 | f.put (KW_uuid, (const char *)uids); |
|
|
1306 | } |
1294 | } |
1307 | |
1295 | |
1308 | #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 != arch->v)) f.put (KW (v), op->v) |
1309 | #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 != arch->v)) f.put (KW (k), op->v) |
|
|
1298 | |
|
|
1299 | CMP_OUT (x); |
|
|
1300 | CMP_OUT (y); |
|
|
1301 | |
|
|
1302 | CMP_OUT (type); |
|
|
1303 | CMP_OUT (subtype); |
|
|
1304 | CMP_OUT (direction); |
1310 | |
1305 | |
1311 | CMP_OUT (name); |
1306 | CMP_OUT (name); |
1312 | CMP_OUT (name_pl); |
1307 | CMP_OUT (name_pl); |
1313 | CMP_OUT (custom_name); |
1308 | |
|
|
1309 | CMP_OUT (speed); |
|
|
1310 | |
|
|
1311 | // speed_left is a major time-burner, and has good locality, so |
|
|
1312 | // we use a simple lookup-cache to avoid the very slow printf. |
|
|
1313 | if (op->speed_left != arch->speed_left) |
|
|
1314 | { |
|
|
1315 | static double last_speed_left = 0.; |
|
|
1316 | static char last_speed_left_str [256] = "speed_left 0\n"; |
|
|
1317 | static int last_speed_left_len = sizeof ("speed_left 0\n") - 1; |
|
|
1318 | |
|
|
1319 | if (last_speed_left != op->speed_left) |
|
|
1320 | { |
|
|
1321 | last_speed_left = op->speed_left; |
|
|
1322 | last_speed_left_len = sizeof ("speed_left ") - 1 |
|
|
1323 | + sprintf (last_speed_left_str + sizeof ("speed_left ") - 1, "%.7g\n", last_speed_left); |
|
|
1324 | } |
|
|
1325 | |
|
|
1326 | f.add (last_speed_left_str, last_speed_left_len); |
|
|
1327 | } |
|
|
1328 | |
1314 | CMP_OUT (title); |
1329 | CMP_OUT (title); |
1315 | CMP_OUT (race); |
1330 | CMP_OUT (race); |
1316 | CMP_OUT (slaying); |
1331 | CMP_OUT (slaying); |
|
|
1332 | CMP_OUT (skill); |
1317 | |
1333 | |
1318 | if (op->msg != tmp->msg) |
1334 | CMP_OUT (tag); |
1319 | f.put (KW_msg, KW_endmsg, op->msg); |
1335 | CMP_OUT (custom_name); |
1320 | if (op->lore != tmp->lore) |
1336 | |
1321 | f.put (KW_lore, KW_endlore, op->lore); |
1337 | if (object *owner = op->owner) |
|
|
1338 | f.put (KW(owner), static_cast<const char *>(owner->ref ())); |
|
|
1339 | |
|
|
1340 | // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved |
1322 | |
1341 | |
1323 | CMP_OUT (other_arch); |
1342 | CMP_OUT (other_arch); |
1324 | CMP_OUT (face); |
|
|
1325 | |
1343 | |
|
|
1344 | if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg ); |
|
|
1345 | if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore); |
|
|
1346 | |
|
|
1347 | if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0); |
|
|
1348 | if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0); |
|
|
1349 | if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0); |
|
|
1350 | |
1326 | if (op->animation_id != tmp->animation_id) |
1351 | if (op->animation_id != arch->animation_id) |
1327 | if (op->animation_id) |
1352 | if (op->has_anim ()) |
|
|
1353 | f.put (KW(animation), op->anim ().name); |
|
|
1354 | else |
1328 | { |
1355 | { |
1329 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1356 | f.put (KW(animation)); |
1330 | |
1357 | op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? |
1331 | if (!QUERY_FLAG (op, FLAG_ANIMATE)) |
|
|
1332 | f.put (KW_is_animated, (sint32) 0); |
|
|
1333 | } |
1358 | } |
1334 | else |
|
|
1335 | f.put (KW_animation, (const char *) 0); |
|
|
1336 | |
1359 | |
1337 | CMP_OUT2 (str, stats.Str); |
1360 | CMP_OUT2 (str, stats.Str); |
1338 | CMP_OUT2 (dex, stats.Dex); |
1361 | CMP_OUT2 (dex, stats.Dex); |
1339 | CMP_OUT2 (con, stats.Con); |
1362 | CMP_OUT2 (con, stats.Con); |
1340 | CMP_OUT2 (wis, stats.Wis); |
1363 | CMP_OUT2 (wis, stats.Wis); |
… | |
… | |
1349 | CMP_OUT2 (grace, stats.grace); |
1372 | CMP_OUT2 (grace, stats.grace); |
1350 | CMP_OUT2 (maxgrace, stats.maxgrace); |
1373 | CMP_OUT2 (maxgrace, stats.maxgrace); |
1351 | CMP_OUT2 (exp, stats.exp); |
1374 | CMP_OUT2 (exp, stats.exp); |
1352 | |
1375 | |
1353 | CMP_OUT (perm_exp); |
1376 | CMP_OUT (perm_exp); |
1354 | CMP_OUT (expmul); |
1377 | //CMP_OUT (expmul); |
1355 | |
1378 | |
1356 | CMP_OUT2 (food, stats.food); |
1379 | CMP_OUT2 (food, stats.food); |
1357 | CMP_OUT2 (dam, stats.dam); |
1380 | CMP_OUT2 (dam, stats.dam); |
1358 | CMP_OUT2 (luck, stats.luck); |
1381 | CMP_OUT2 (luck, stats.luck); |
1359 | CMP_OUT2 (wc, stats.wc); |
1382 | CMP_OUT2 (wc, stats.wc); |
1360 | CMP_OUT2 (ac, stats.ac); |
1383 | CMP_OUT2 (ac, stats.ac); |
1361 | |
1384 | |
1362 | CMP_OUT (x); |
|
|
1363 | CMP_OUT (y); |
|
|
1364 | CMP_OUT (speed); |
|
|
1365 | CMP_OUT (speed_left); |
|
|
1366 | CMP_OUT2 (move_state, move_status); |
1385 | CMP_OUT2 (move_state, move_status); |
1367 | CMP_OUT (attack_movement); |
1386 | CMP_OUT (attack_movement); |
1368 | CMP_OUT (nrof); |
1387 | CMP_OUT (nrof); |
1369 | CMP_OUT (level); |
1388 | CMP_OUT (level); |
1370 | CMP_OUT (direction); |
|
|
1371 | CMP_OUT (type); |
|
|
1372 | CMP_OUT (subtype); |
|
|
1373 | CMP_OUT (attacktype); |
1389 | CMP_OUT (attacktype); |
1374 | |
1390 | |
|
|
1391 | // using memcmp here seems to be a loss - is gcc vectorising? |
1375 | for (i = 0; i < NROFATTACKS; i++) |
1392 | for (int i = 0; i < NROFATTACKS; i++) |
1376 | if (op->resist[i] != tmp->resist[i]) |
1393 | if (expect_false (op->resist[i] != arch->resist[i])) |
1377 | f.put (resist_save[i], op->resist[i]); |
1394 | f.put (resist_save[i], op->resist[i]); |
1378 | |
1395 | |
1379 | CMP_OUT (path_attuned); |
1396 | CMP_OUT (path_attuned); |
1380 | CMP_OUT (path_repelled); |
1397 | CMP_OUT (path_repelled); |
1381 | CMP_OUT (path_denied); |
1398 | CMP_OUT (path_denied); |
1382 | CMP_OUT (material); |
1399 | |
1383 | CMP_OUT (materialname); |
1400 | CMP_OUT2 (material, materials);//TODO: nuke |
|
|
1401 | if (op->material != arch->material) |
|
|
1402 | f.put (KW(materialname), op->material->name); |
|
|
1403 | |
1384 | CMP_OUT (value); |
1404 | CMP_OUT (value); |
1385 | CMP_OUT (carrying); |
1405 | CMP_OUT (carrying); |
1386 | CMP_OUT (weight); |
1406 | CMP_OUT (weight); |
1387 | CMP_OUT (invisible); |
1407 | CMP_OUT (invisible); |
1388 | CMP_OUT (state); |
1408 | CMP_OUT (state); |
… | |
… | |
1391 | CMP_OUT (last_sp); |
1411 | CMP_OUT (last_sp); |
1392 | CMP_OUT (last_grace); |
1412 | CMP_OUT (last_grace); |
1393 | CMP_OUT (last_eat); |
1413 | CMP_OUT (last_eat); |
1394 | CMP_OUT (glow_radius); |
1414 | CMP_OUT (glow_radius); |
1395 | |
1415 | |
1396 | if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) |
1416 | if (op->flag [FLAG_IS_LINKED]) |
|
|
1417 | if (auto (ol, op->find_link ())) |
1397 | f.put (KW_connected, i); |
1418 | f.put (KW(connected), ol->id); |
1398 | |
1419 | |
1399 | CMP_OUT (randomitems); |
1420 | CMP_OUT (randomitems); |
1400 | CMP_OUT2 (container, weight_limit); |
1421 | CMP_OUT2 (container, weight_limit); |
1401 | |
1422 | |
1402 | CMP_OUT (run_away); |
1423 | CMP_OUT (run_away); |
1403 | CMP_OUT (pick_up); |
1424 | CMP_OUT (pick_up); |
1404 | CMP_OUT (will_apply); |
1425 | CMP_OUT (will_apply); |
1405 | CMP_OUT (smoothlevel); |
1426 | CMP_OUT (smoothlevel); |
1406 | CMP_OUT (weapontype); |
1427 | CMP_OUT (weapontype); |
1407 | CMP_OUT (tooltype); |
|
|
1408 | CMP_OUT (elevation); |
|
|
1409 | CMP_OUT (client_type); |
1428 | CMP_OUT (client_type); |
1410 | CMP_OUT (item_power); |
1429 | CMP_OUT (item_power); |
1411 | CMP_OUT (duration); |
1430 | CMP_OUT (duration); |
1412 | CMP_OUT (range); |
1431 | CMP_OUT (range); |
1413 | CMP_OUT (range_modifier); |
1432 | CMP_OUT (range_modifier); |
… | |
… | |
1421 | CMP_OUT (move_on); |
1440 | CMP_OUT (move_on); |
1422 | CMP_OUT (move_off); |
1441 | CMP_OUT (move_off); |
1423 | CMP_OUT (move_slow); |
1442 | CMP_OUT (move_slow); |
1424 | CMP_OUT (move_slow_penalty); |
1443 | CMP_OUT (move_slow_penalty); |
1425 | |
1444 | |
1426 | if (op->flag != tmp->flag) |
1445 | object::flags_t diff = (op->flag ^ arch->flag) & flagmask; |
|
|
1446 | |
|
|
1447 | if (diff [FLAG_OBJ_ORIGINAL]) |
|
|
1448 | f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); |
|
|
1449 | |
|
|
1450 | diff.reset (FLAG_OBJ_ORIGINAL); |
|
|
1451 | |
|
|
1452 | // quickly test whether any other flags differ |
|
|
1453 | if (expect_true (diff.any ())) |
1427 | for (i = 0; i <= NUM_FLAGS; i++) |
1454 | for (int i = 0; i < NUM_FLAGS; i++) |
1428 | if (flag_names [i] && op->flag [i] != tmp->flag [i]) |
1455 | if (expect_false (diff [i])) |
1429 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1456 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
1430 | |
1457 | |
1431 | /* Save body locations */ |
1458 | // save body locations. gcc's memcmp does an abysmal job when used |
1432 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1459 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1433 | if (op->body_info[i] != tmp->body_info[i]) |
1460 | if (expect_false (op->slot[i].info != arch->slot[i].info)) |
1434 | f.put (body_locations[i].save_name, op->body_info[i]); |
1461 | f.put (body_locations[i].save_name, op->slot[i].info); |
1435 | } |
1462 | } |
1436 | |
1463 | |
1437 | /* |
1464 | /* |
1438 | * Dumps all variables in an object to a file. |
1465 | * Dumps all variables in an object to a file. |
1439 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1466 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1440 | * the only place this is not set is when saving the player. |
1467 | * the only place this is not set is when saving the player. |
1441 | */ |
1468 | */ |
1442 | void |
1469 | bool |
1443 | save_object (object_freezer &fp, object *op, int flag) |
1470 | object::write (object_freezer &f) |
1444 | { |
1471 | { |
1445 | /* Even if the object does have an owner, it would seem that we should |
1472 | if (expect_false (is_arch ())) |
1446 | * still save it. |
1473 | { |
1447 | */ |
1474 | f.put (KW(object), arch->archname); |
1448 | if (op->owner) |
1475 | write_diff (f, this, archetype::empty); |
1449 | return; |
1476 | } |
1450 | |
1477 | else |
1451 | /* If it is unpaid and we don't want to save those, just return. */ |
1478 | { |
1452 | if (!(flag & 1) && op->flag [FLAG_UNPAID]) |
|
|
1453 | return; |
|
|
1454 | |
|
|
1455 | archetype *at = op->arch ? (archetype *)op->arch : empty_archetype; |
|
|
1456 | |
|
|
1457 | fp.put (KW_arch, at->name); |
1479 | f.put (KW(arch), arch->archname); |
1458 | put (fp, op, &at->clone); |
1480 | write_diff (f, this, arch); |
|
|
1481 | } |
1459 | |
1482 | |
1460 | /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ |
|
|
1461 | |
|
|
1462 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1483 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1463 | save_object (fp, tmp, flag); |
1484 | tmp->write (f); |
1464 | |
1485 | |
1465 | fp.put (op); |
1486 | f.put (this); |
1466 | fp.put (KW_end); |
1487 | f.put (KW(end)); |
|
|
1488 | |
|
|
1489 | return true; |
1467 | } |
1490 | } |
1468 | |
1491 | |
|
|
1492 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1493 | |
|
|
1494 | // generic resource file load, |
|
|
1495 | // currently supports: region, treasures, archetypes |
|
|
1496 | bool |
|
|
1497 | load_resource_file_ (const char *filename) |
|
|
1498 | { |
|
|
1499 | object_thawer f (filename); |
|
|
1500 | |
|
|
1501 | for (;;) |
|
|
1502 | { |
|
|
1503 | switch (f.kw) |
|
|
1504 | { |
|
|
1505 | case KW_region: |
|
|
1506 | if (!region::read (f)) |
|
|
1507 | return false; |
|
|
1508 | break; |
|
|
1509 | |
|
|
1510 | case KW_treasure: |
|
|
1511 | case KW_treasureone: |
|
|
1512 | if (!treasurelist::read (f)) |
|
|
1513 | return false; |
|
|
1514 | break; |
|
|
1515 | |
|
|
1516 | case KW_object: |
|
|
1517 | if (!archetype::read (f)) |
|
|
1518 | return false; |
|
|
1519 | break; |
|
|
1520 | |
|
|
1521 | case KW_EOF: |
|
|
1522 | return true; |
|
|
1523 | |
|
|
1524 | default: |
|
|
1525 | if (!f.parse_error ("resource file")) |
|
|
1526 | return false; |
|
|
1527 | |
|
|
1528 | f.next (); |
|
|
1529 | break; |
|
|
1530 | } |
|
|
1531 | } |
|
|
1532 | } |
|
|
1533 | |