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