1 | /* |
1 | /* |
2 | * CrossFire, A Multiplayer game |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002 Mark Wedel & Crossfire Development Team |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992 Frank Tore Johansen |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * it under the terms of the GNU General Public License as published by |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * (at your option) any later version. |
11 | * option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | * |
17 | * |
18 | * You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the Affero GNU General Public License |
19 | * along with this program; if not, write to the Free Software |
19 | * and the GNU General Public License along with this program. If not, see |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * <http://www.gnu.org/licenses/>. |
21 | * |
21 | * |
22 | * The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
23 | */ |
23 | */ |
24 | |
24 | |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
|
|
26 | sub/add_weight will transcend the environment updating the carrying |
|
|
27 | variable. */ |
|
|
28 | |
|
|
29 | #include <global.h> |
25 | #include <global.h> |
30 | #include <loader.h> |
|
|
31 | #include <sproto.h> |
26 | #include <sproto.h> |
32 | |
27 | |
33 | ///////////////////////////////////////////////////////////////////////////// |
28 | ///////////////////////////////////////////////////////////////////////////// |
|
|
29 | |
|
|
30 | extern archetype *loading_arch; |
|
|
31 | |
|
|
32 | //+GPL |
34 | |
33 | |
35 | /* 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 |
36 | * spell object conversion to the new object. It was not practical |
35 | * spell object conversion to the new object. It was not practical |
37 | * 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 |
38 | * 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 |
… | |
… | |
168 | "spell_magic_drain", /* 122 */ |
167 | "spell_magic_drain", /* 122 */ |
169 | "spell_counterspell", /* 123 */ |
168 | "spell_counterspell", /* 123 */ |
170 | "spell_disarm", /* 124 */ |
169 | "spell_disarm", /* 124 */ |
171 | "spell_cure_confusion", /* 125 */ |
170 | "spell_cure_confusion", /* 125 */ |
172 | "spell_restoration", /* 126 */ |
171 | "spell_restoration", /* 126 */ |
173 | "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ |
172 | "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */ |
174 | "spell_counterwall", /* 128 */ |
173 | "spell_counterwall", /* 128 */ |
175 | "spell_cause_light_wounds", /* 129 */ |
174 | "spell_cause_light_wounds", /* 129 */ |
176 | "spell_cause_medium_wounds", /* 130 */ |
175 | "spell_cause_medium_wounds", /* 130 */ |
177 | "spell_cause_heavy_wounds", /* 131 */ |
176 | "spell_cause_heavy_wounds", /* 131 */ |
178 | "spell_charm_monsters", /* 132 */ |
177 | "spell_charm_monsters", /* 132 */ |
… | |
… | |
250 | "spell_cause_rabies", /* 204 */ |
249 | "spell_cause_rabies", /* 204 */ |
251 | "spell_glyph", /* 205 */ |
250 | "spell_glyph", /* 205 */ |
252 | NULL |
251 | NULL |
253 | }; |
252 | }; |
254 | |
253 | |
255 | extern bool loading_arch; |
|
|
256 | |
|
|
257 | /* 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 |
258 | * 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 |
259 | * 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 |
260 | * 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. |
261 | */ |
258 | */ |
262 | void |
259 | void |
263 | object::post_load_check () |
260 | object::post_load_check () |
264 | { |
261 | { |
|
|
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 | |
265 | switch (type) |
268 | switch (type) |
266 | { |
269 | { |
267 | case BOW: |
270 | case BOW: |
268 | case WAND: |
271 | case WAND: |
269 | case ROD: |
272 | case ROD: |
270 | case HORN: |
273 | case HORN: |
271 | if (slot [body_range].info != -1) |
274 | if (slot [body_range].info != -1) |
272 | { |
275 | { |
273 | LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); |
276 | LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info); |
274 | slot [body_range].info = -1; |
277 | slot [body_range].info = -1; |
275 | } |
278 | } |
276 | break; |
279 | break; |
277 | |
280 | |
278 | case WEAPON: |
281 | case WEAPON: |
279 | if (slot [body_combat].info != -1) |
282 | if (slot [body_combat].info != -1) |
280 | { |
283 | { |
281 | LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); |
284 | LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); |
282 | slot [body_combat].info = -1; |
285 | slot [body_combat].info = -1; |
283 | } |
286 | } |
284 | break; |
287 | break; |
285 | |
288 | |
286 | case SHIELD: |
289 | case SHIELD: |
287 | if (slot [body_shield].info != -1) |
290 | if (slot [body_shield].info != -1) |
288 | { |
291 | { |
289 | LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); |
292 | LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); |
290 | slot [body_shield].info = -1; |
293 | slot [body_shield].info = -1; |
291 | } |
294 | } |
292 | break; |
295 | break; |
293 | |
296 | |
294 | case PLAYER: |
297 | case PLAYER: |
295 | if (slot [body_shield].info != 1) |
298 | if (slot [body_shield].info != 1) |
296 | { |
299 | { |
297 | LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); |
300 | LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); |
298 | slot [body_shield].info = 1; |
301 | slot [body_shield].info = 1; |
299 | } |
302 | } |
300 | |
303 | |
301 | if (slot [body_combat].info != 1) |
304 | if (slot [body_combat].info != 1) |
302 | { |
305 | { |
303 | LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); |
306 | LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); |
304 | slot [body_combat].info = 1; |
307 | slot [body_combat].info = 1; |
305 | } |
308 | } |
306 | |
309 | |
307 | if (slot [body_range].info != 1) |
310 | if (slot [body_range].info != 1) |
308 | { |
311 | { |
309 | LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); |
312 | LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info); |
310 | slot [body_range].info = 1; |
313 | slot [body_range].info = 1; |
311 | } |
314 | } |
312 | break; |
315 | break; |
313 | } |
316 | } |
314 | |
317 | |
… | |
… | |
319 | * 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 |
320 | * 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. |
321 | * Otherwise, what happens is that the the plural name will lose |
324 | * Otherwise, what happens is that the the plural name will lose |
322 | * information (appear as just 'hearts' and not 'goblins heart') |
325 | * information (appear as just 'hearts' and not 'goblins heart') |
323 | */ |
326 | */ |
324 | if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl) |
327 | if (arch && name != arch->object::name && name_pl == arch->object::name_pl) |
325 | name_pl = 0; |
328 | name_pl = 0; |
326 | |
329 | |
327 | if (!name_pl) |
330 | if (!name_pl) |
328 | name_pl = name; |
331 | name_pl = name; |
329 | |
332 | |
330 | /* objects now have a materialname. try to patch it in */ |
333 | /* objects now have a materialname. try to patch it in */ |
331 | if (!(is_weapon () && level > 0)) |
334 | if (material == MATERIAL_NULL && !(is_weapon () && level > 0)) |
332 | set_materialname (this, map ? map->difficulty : 5, 0); |
335 | select_material (this, map ? map->difficulty : 5); |
|
|
336 | |
|
|
337 | if (speed < 0.) |
|
|
338 | { |
|
|
339 | flag [FLAG_RANDOM_SPEED] = true; |
|
|
340 | speed = -speed; |
|
|
341 | // speed_left will be randomised in instantiate () and copy_to () |
|
|
342 | } |
333 | |
343 | |
334 | /* only do these when program is first run - a bit |
344 | /* only do these when program is first run - a bit |
335 | * excessive to do this at every run - most of this is |
345 | * excessive to do this at every run - most of this is |
336 | * really just to catch any errors - program will still run, but |
346 | * really just to catch any errors - program will still run, but |
337 | * not in the ideal fashion. |
347 | * not in the ideal fashion. |
338 | */ |
348 | */ |
339 | if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) |
349 | if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) |
340 | { |
350 | { |
341 | if (!skill) |
351 | if (!skill) |
342 | LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); |
352 | LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ()); |
343 | else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || |
353 | else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) || |
344 | (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) |
354 | (skill == shstr_two_handed_weapons && slot[body_arm].info != -2)) |
345 | LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); |
355 | LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); |
346 | } |
356 | } |
347 | |
357 | |
348 | /* 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 |
349 | * really does for many objects. Need to catch any in maps |
359 | * really does for many objects. Need to catch any in maps |
350 | * that may have an old value. |
360 | * that may have an old value. |
… | |
… | |
356 | || type == AMULET || type == GIRDLE |
366 | || type == AMULET || type == GIRDLE |
357 | || type == BRACERS || type == CLOAK) |
367 | || type == BRACERS || type == CLOAK) |
358 | { |
368 | { |
359 | if (last_heal) |
369 | if (last_heal) |
360 | { |
370 | { |
361 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); |
371 | LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); |
362 | gen_sp_armour = last_heal; |
372 | gen_sp_armour = last_heal; |
363 | last_heal = 0; |
373 | last_heal = 0; |
364 | } |
374 | } |
365 | |
375 | |
366 | int ip = calc_item_power (this, 0); |
376 | int ip = calc_item_power (this, 0); |
367 | |
377 | |
368 | /* Legacy objects from before item power was in the game */ |
378 | /* Legacy objects from before item power was in the game */ |
369 | if (!item_power && ip) |
379 | if (!item_power && ip) |
370 | { |
380 | { |
371 | if (ip > 3) |
381 | if (ip > 3) |
372 | LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); |
382 | LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip); |
373 | |
383 | |
374 | item_power = ip; |
384 | item_power = ip; |
375 | } |
385 | } |
376 | |
386 | |
377 | /* Check for possibly bogus values. Has to meet both these criteria - |
387 | /* Check for possibly bogus values. Has to meet both these criteria - |
378 | * 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 |
379 | * 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. |
380 | * 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, |
381 | * but not the second one. |
391 | * but not the second one. |
382 | */ |
392 | */ |
|
|
393 | #if 0 //TODO |
383 | if (ip > 2 * item_power && ip > (item_power + 3)) |
394 | if (ip > 2 * item_power && ip > (item_power + 3)) |
384 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
395 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
|
|
396 | #endif |
385 | } |
397 | } |
386 | |
398 | |
387 | /* Old spellcasting object - need to load in the appropiate object */ |
399 | /* old style spellcasting object (pretty common) - need to load in the appropriate object */ |
388 | if ((type == ROD || type == WAND || type == SCROLL || type == HORN || 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 |
389 | /* 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 */ |
390 | ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) |
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 |
391 | { |
412 | { |
|
|
413 | // TODO: fix firewall object on map |
392 | /* 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' |
393 | * in that spell was stored in sp. |
415 | * in that spell was stored in sp. |
394 | */ |
416 | */ |
|
|
417 | //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
395 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
418 | object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); |
396 | insert_ob_in_ob (tmp, this); |
419 | insert_ob_in_ob (tmp, this); |
397 | randomitems = NULL; /* So another spell isn't created for this object */ |
420 | randomitems = 0; |
398 | } |
421 | } |
399 | |
422 | |
400 | /* 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 */ |
401 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
424 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
402 | { |
425 | { |
|
|
426 | LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ()); |
403 | object *tmp = get_archetype_by_object_name (slaying); |
427 | object *tmp = get_archetype_by_object_name (slaying); |
404 | insert_ob_in_ob (tmp, this); |
428 | insert_ob_in_ob (tmp, this); |
405 | randomitems = NULL; /* So another spell isn't created for this object */ |
429 | randomitems = 0; /* So another spell isn't created for this object */ |
406 | /* without this, value is all screwed up */ |
430 | /* without this, value is all screwed up */ |
407 | value = arch->clone.value * inv->value; |
431 | value = arch->value * inv->value; |
408 | } |
432 | } |
409 | |
433 | |
410 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
434 | if (this->flag [FLAG_MONSTER]) |
411 | { |
435 | { |
412 | if (stats.hp > stats.maxhp) |
436 | if (stats.hp > stats.maxhp) |
413 | { |
437 | { |
414 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
438 | LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
415 | stats.maxhp = stats.hp; |
439 | stats.maxhp = stats.hp; |
416 | } |
440 | } |
417 | |
441 | |
418 | /* The archs just need to be updated for this */ |
442 | /* The archs just need to be updated for this */ |
419 | if (move_type == 0) |
443 | if (move_type == 0) |
420 | move_type = MOVE_WALK; |
444 | move_type = MOVE_WALK; |
421 | } |
445 | } |
422 | |
446 | |
423 | if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) |
447 | if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER) |
424 | { |
|
|
425 | /* Object will duplicate it's content as part of the |
448 | /* Object will duplicate it's content as part of the |
426 | * generation process. To do this, we must flag inventory |
449 | * generation process. To do this, we must flag inventory |
427 | * so it remains unevaluated concerning the randomitems and |
450 | * so it remains unevaluated concerning the randomitems and |
428 | * the living (a demonlord shouldn't cast from inside generator!) |
451 | * the living (a demonlord shouldn't cast from inside generator!) |
429 | */ |
452 | */ |
|
|
453 | /* ??? this *should* be done elsewhere, e.g. after map loading etc. */ |
430 | flag_inv (this, FLAG_IS_A_TEMPLATE); |
454 | flag_inv (this, FLAG_IS_A_TEMPLATE); |
431 | } |
|
|
432 | |
455 | |
433 | /* Handle player movers. We use move_type for player movers |
456 | /* Handle player movers. We use move_type for player movers |
434 | * because they operate on their own time (move_on |
457 | * because they operate on their own time (move_on |
435 | * would potentially cause them to be triggered when someone steps |
458 | * would potentially cause them to be triggered when someone steps |
436 | * 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 |
437 | * are doing, otherwise, set move_type based on maxhp value. |
460 | * are doing, otherwise, set move_type based on maxhp value. |
438 | */ |
461 | */ |
439 | if (type == PLAYERMOVER) |
462 | if (type == PLAYERMOVER) |
440 | { |
463 | { |
441 | if (!move_type) |
464 | if (!move_type) |
… | |
… | |
447 | } |
470 | } |
448 | else |
471 | else |
449 | move_type = MOVE_WALK; |
472 | move_type = MOVE_WALK; |
450 | } |
473 | } |
451 | } |
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 | } |
452 | } |
488 | } |
453 | |
489 | |
454 | static void |
490 | static void |
455 | set_move (MoveType &mt, const char *str) |
491 | set_move (MoveType &mt, object_thawer &f) |
456 | { |
492 | { |
457 | static const struct flagstr { |
493 | static const struct flagstr { |
458 | const char *name; |
494 | const char *name; |
459 | MoveType flags; |
495 | MoveType flags; |
460 | } move_flags[] = { |
496 | } move_flags[] = { |
… | |
… | |
466 | { "boat" , MOVE_BOAT }, |
502 | { "boat" , MOVE_BOAT }, |
467 | { "ship" , MOVE_SHIP }, |
503 | { "ship" , MOVE_SHIP }, |
468 | { "all" , MOVE_ALL }, |
504 | { "all" , MOVE_ALL }, |
469 | }; |
505 | }; |
470 | |
506 | |
471 | if (!str) |
507 | const char *str = f.get_str (); |
472 | { |
|
|
473 | mt = 0; |
|
|
474 | return; |
|
|
475 | } |
|
|
476 | |
508 | |
477 | if (isdigit (*str)) |
509 | if (!*str || isdigit (*str)) |
478 | { |
510 | { |
479 | mt = atoi (str); |
511 | mt = atoi (str); |
480 | return; |
512 | return; |
481 | } |
513 | } |
482 | |
514 | |
483 | mt = 0; |
515 | mt = 0; |
484 | |
516 | |
485 | for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) |
517 | for (str = strtok ((char *)str, " "); str; str = strtok (0, " ")) |
486 | { |
518 | { |
487 | bool negate = 0; |
519 | bool negate = 0; |
488 | |
520 | |
489 | if (*str == '-') |
521 | if (*str == '-') |
490 | { |
522 | { |
… | |
… | |
503 | |
535 | |
504 | goto next; |
536 | goto next; |
505 | } |
537 | } |
506 | } |
538 | } |
507 | |
539 | |
508 | LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); |
540 | LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str); |
509 | |
541 | |
510 | next: ; |
542 | next: ; |
511 | } |
543 | } |
512 | } |
544 | } |
513 | |
545 | |
514 | #define GET_FLAG(op,flag) \ |
546 | //-GPL |
515 | if (f.get_sint32 ()) \ |
547 | |
516 | SET_FLAG (op, flag); \ |
548 | #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () |
517 | else \ |
|
|
518 | CLEAR_FLAG (op, flag) \ |
|
|
519 | |
549 | |
520 | bool |
550 | bool |
521 | object::parse_kv (object_thawer &f) |
551 | object::parse_kv (object_thawer &f) |
522 | { |
552 | { |
523 | object *op_inv = inv; |
553 | object *op_inv = inv; |
|
|
554 | key_value *last_kv = key_values; |
524 | |
555 | |
525 | for (;;) |
556 | for (;;) |
526 | { |
557 | { |
527 | switch (f.kw) |
558 | switch (f.kw) |
528 | { |
559 | { |
529 | case KW_uuid: |
560 | case KW_uuid: |
530 | if (const char *s = f.get_str ()) |
561 | if (!uuid.parse (f.get_str ())) |
531 | { |
562 | { |
532 | unsigned int version; |
563 | f.parse_warn ("unparseable uuid"); |
533 | unsigned long long seq; |
564 | uuid = UUID::gen (); |
534 | |
|
|
535 | if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) |
|
|
536 | { |
|
|
537 | uuid.seq = seq; |
|
|
538 | break; |
|
|
539 | } |
|
|
540 | } |
565 | } |
541 | |
|
|
542 | uuid = gen_uuid (); |
|
|
543 | break; |
566 | break; |
544 | |
567 | |
545 | case KW_oid: |
568 | case KW_oid: |
546 | f.get (this, f.get_sint32 ()); |
569 | f.get (this, f.get_sint32 ()); |
547 | break; |
570 | break; |
… | |
… | |
553 | |
576 | |
554 | case KW_attach: f.get_ornull (attach); break; |
577 | case KW_attach: f.get_ornull (attach); break; |
555 | case KW_skill: f.get_ornull (skill); break; |
578 | case KW_skill: f.get_ornull (skill); break; |
556 | case KW_race: f.get_ornull (race); break; |
579 | case KW_race: f.get_ornull (race); break; |
557 | case KW_slaying: f.get_ornull (slaying); break; |
580 | case KW_slaying: f.get_ornull (slaying); break; |
|
|
581 | case KW_tag: f.get_ornull (tag); break; |
558 | |
582 | |
559 | case KW_arch: |
583 | case KW_arch: |
560 | { |
|
|
561 | object *tmp = object::read (f); |
584 | if (object *tmp = object::read (f)) |
562 | tmp->deactivate (); |
|
|
563 | |
|
|
564 | { |
585 | { |
|
|
586 | tmp->deactivate (); |
|
|
587 | |
565 | // was: insert_ob_in_ob (tmp, op); |
588 | // was: insert_ob_in_ob (tmp, op); |
566 | // but manually adding it can improve map loading times a lot |
589 | // but manually adding it can improve map loading times a lot |
567 | // also, appending instead of prepending keeps the |
590 | // also, appending instead of prepending keeps the |
568 | // save ordering the same between repeated load/saves. |
591 | // save ordering the same between repeated load/saves. |
569 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
592 | // and finally we do not want any funny effects |
570 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
593 | tmp->clr_flag (FLAG_OBJ_ORIGINAL); |
|
|
594 | tmp->clr_flag (FLAG_REMOVED); |
571 | |
595 | |
572 | if (!op_inv) |
596 | if (!op_inv) |
573 | { |
597 | { |
574 | inv = tmp; |
598 | inv = tmp; |
575 | tmp->above = 0; |
599 | tmp->above = 0; |
… | |
… | |
585 | |
609 | |
586 | tmp->below = 0; |
610 | tmp->below = 0; |
587 | tmp->env = this; |
611 | tmp->env = this; |
588 | op_inv = tmp; |
612 | op_inv = tmp; |
589 | } |
613 | } |
590 | } |
614 | else |
|
|
615 | LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n"); |
|
|
616 | |
591 | continue; |
617 | continue; |
592 | |
618 | |
593 | case KW_other_arch: |
619 | case KW_other_arch: |
594 | other_arch = |
|
|
595 | loading_arch |
620 | if (loading_arch == this) |
596 | ? archetype::get (f.get_str ()) |
621 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
|
|
622 | else |
|
|
623 | { |
597 | : archetype::find (f.get_str ()); |
624 | other_arch = archetype::find (f.get_str ()); |
598 | |
625 | |
599 | if (!other_arch) |
626 | if (!other_arch) |
600 | LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); |
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 ()); |
601 | break; |
633 | break; |
602 | |
634 | |
603 | case KW_animation: |
635 | case KW_animation: |
604 | { |
636 | { |
605 | CLEAR_FLAG (this, FLAG_ANIMATE); |
637 | this->clr_flag (FLAG_ANIMATE); |
606 | animation_id = 0; |
638 | animation_id = 0; |
607 | |
639 | |
608 | const char *str = f.get_str (); |
|
|
609 | if (str && (animation_id = find_animation (str))) |
640 | if (f.has_value () && (animation_id = find_animation (f.get_str ()))) |
610 | SET_FLAG (this, FLAG_ANIMATE); |
641 | this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here |
611 | } |
642 | } |
612 | break; |
643 | break; |
613 | |
644 | |
614 | case KW_last_heal: f.get (last_heal); break; |
645 | case KW_last_heal: f.get (last_heal); break; |
615 | case KW_last_sp: f.get (last_sp); break; |
646 | case KW_last_sp: f.get (last_sp); break; |
616 | case KW_last_grace: f.get (last_grace); break; |
647 | case KW_last_grace: f.get (last_grace); break; |
617 | case KW_last_eat: f.get (last_eat); break; |
648 | case KW_last_eat: f.get (last_eat); break; |
|
|
649 | case KW_sl: |
618 | case KW_speed_left: f.get (speed_left); break; |
650 | case KW_speed_left: f.get (speed_left); break; |
619 | |
651 | |
620 | case KW_speed: |
652 | case KW_speed: |
621 | f.get (speed); |
653 | f.get (speed); |
622 | |
654 | |
… | |
… | |
631 | move_slow |= MOVE_WALK; |
663 | move_slow |= MOVE_WALK; |
632 | f.get (move_slow_penalty); |
664 | f.get (move_slow_penalty); |
633 | break; |
665 | break; |
634 | |
666 | |
635 | case KW_face: |
667 | case KW_face: |
|
|
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 | { |
636 | face = face_find (f.get_str ()); |
674 | sound = sound_find (f.get_str ()); |
|
|
675 | if (!sound) |
|
|
676 | f.parse_warn (format ("sound '%s' not found", f.get_str ())); |
|
|
677 | } |
|
|
678 | else |
|
|
679 | sound = 0; |
|
|
680 | break; |
|
|
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; |
637 | break; |
691 | break; |
638 | |
692 | |
639 | case KW_x: f.get (x); break; |
693 | case KW_x: f.get (x); break; |
640 | case KW_y: f.get (y); break; |
694 | case KW_y: f.get (y); break; |
641 | |
695 | |
… | |
… | |
682 | case KW_invisible: f.get (invisible); break; |
736 | case KW_invisible: f.get (invisible); break; |
683 | case KW_magic: f.get (magic); break; |
737 | case KW_magic: f.get (magic); break; |
684 | case KW_state: f.get (state); break; |
738 | case KW_state: f.get (state); break; |
685 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
739 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
686 | case KW_material: f.get (materials); break; //TODO: nuke |
740 | case KW_material: f.get (materials); break; //TODO: nuke |
687 | case KW_materialname: f.get (materialname); break; |
741 | |
|
|
742 | case KW_materialname: |
|
|
743 | { |
|
|
744 | shstr sh; |
|
|
745 | f.get (sh); |
|
|
746 | material = name_to_material (sh); |
|
|
747 | } |
|
|
748 | break; |
688 | |
749 | |
689 | /* These are the new values */ |
750 | /* These are the new values */ |
690 | case KW_move_block: set_move (move_block, f.get_str ()); break; |
751 | case KW_move_block: set_move (move_block, f); break; |
691 | case KW_move_allow: set_move (move_allow, f.get_str ()); break; |
752 | case KW_move_allow: set_move (move_allow, f); break; |
692 | case KW_move_type: set_move (move_type, f.get_str ()); break; |
753 | case KW_move_type: set_move (move_type , f); break; |
693 | case KW_move_on: set_move (move_on, f.get_str ()); break; |
754 | case KW_move_on: set_move (move_on , f); break; |
694 | case KW_move_off: set_move (move_off, f.get_str ()); break; |
755 | case KW_move_off: set_move (move_off , f); break; |
695 | case KW_move_slow: set_move (move_slow, f.get_str ()); break; |
756 | case KW_move_slow: set_move (move_slow , f); break; |
696 | |
757 | |
697 | /* 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 */ |
698 | case KW_no_pass: |
759 | case KW_no_pass: |
699 | { |
760 | { |
700 | if (f.get_sint32 ()) |
761 | if (f.get_sint32 ()) |
… | |
… | |
763 | |
824 | |
764 | |
825 | |
765 | case KW_identified: |
826 | case KW_identified: |
766 | GET_FLAG (this, FLAG_IDENTIFIED); |
827 | GET_FLAG (this, FLAG_IDENTIFIED); |
767 | //TODO: move to check_object or so |
828 | //TODO: move to check_object or so |
768 | if (QUERY_FLAG (this, FLAG_IDENTIFIED)) |
829 | if (this->flag [FLAG_IDENTIFIED]) |
769 | CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); |
830 | this->clr_flag (FLAG_KNOWN_MAGICAL); |
770 | |
831 | |
771 | break; |
|
|
772 | |
|
|
773 | case KW_wiz: |
|
|
774 | GET_FLAG (this, FLAG_WIZ); |
|
|
775 | //TODO: move to check_object |
|
|
776 | if (QUERY_FLAG (this, FLAG_WIZ)) |
|
|
777 | { |
|
|
778 | SET_FLAG (this, FLAG_WAS_WIZ); |
|
|
779 | SET_FLAG (this, FLAG_WIZPASS); |
|
|
780 | SET_FLAG (this, FLAG_WIZCAST); |
|
|
781 | } |
|
|
782 | else |
|
|
783 | { |
|
|
784 | CLEAR_FLAG (this, FLAG_WIZPASS); |
|
|
785 | CLEAR_FLAG (this, FLAG_WIZCAST); |
|
|
786 | } |
|
|
787 | break; |
832 | break; |
788 | |
833 | |
789 | case KW_friendly: |
834 | case KW_friendly: |
790 | if (f.get_sint32 ()) |
835 | if (f.get_bool ()) |
791 | if (type != PLAYER) |
836 | if (type != PLAYER) |
792 | add_friendly_object (this); |
837 | add_friendly_object (this); |
793 | |
838 | |
794 | break; |
839 | break; |
795 | |
840 | |
… | |
… | |
808 | case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; |
853 | case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; |
809 | case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; |
854 | case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; |
810 | case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; |
855 | case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; |
811 | case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; |
856 | case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; |
812 | case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; |
857 | case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; |
|
|
858 | case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break; |
813 | case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; |
859 | case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; |
814 | case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; |
860 | case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; |
815 | case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; |
861 | case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; |
816 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
862 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
817 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
863 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
… | |
… | |
824 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
870 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
825 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
871 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
826 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
872 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
827 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
873 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
828 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
874 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
829 | case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break; |
|
|
830 | case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; |
|
|
831 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
875 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
832 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
876 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
833 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
877 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
834 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
878 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
835 | case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; |
879 | case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; |
… | |
… | |
879 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
923 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
880 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
924 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
881 | case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; |
925 | case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; |
882 | case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; |
926 | case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; |
883 | case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; |
927 | case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; |
|
|
928 | case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break; |
884 | |
929 | |
885 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
930 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
886 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
931 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
887 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
932 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
888 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
933 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
… | |
… | |
918 | case KW_anim_speed: f.get (anim_speed); break; |
963 | case KW_anim_speed: f.get (anim_speed); break; |
919 | case KW_container: f.get (weight_limit); break; |
964 | case KW_container: f.get (weight_limit); break; |
920 | case KW_will_apply: f.get (will_apply); break; |
965 | case KW_will_apply: f.get (will_apply); break; |
921 | case KW_attack_movement: f.get (attack_movement); break; |
966 | case KW_attack_movement: f.get (attack_movement); break; |
922 | case KW_move_state: f.get (move_status); break; |
967 | case KW_move_state: f.get (move_status); break; |
923 | case KW_expmul: f.get (expmul); break; |
968 | //case KW_expmul: f.get (expmul); break;//D declared const for the time being |
924 | case KW_glow_radius: f.get (glow_radius); break; |
969 | case KW_glow_radius: f.get (glow_radius); break; |
925 | case KW_weapontype: f.get (weapontype); break; |
970 | case KW_weapontype: f.get (weapontype); break; |
926 | case KW_tooltype: f.get (tooltype); break; |
|
|
927 | case KW_casting_time: f.get (casting_time); break; |
971 | case KW_casting_time: f.get (casting_time); break; |
|
|
972 | |
|
|
973 | // elevation is deprecated |
928 | case KW_elevation: f.get (elevation); break; |
974 | case KW_elevation: break; |
|
|
975 | |
929 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
976 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
930 | case KW_client_type: f.get (client_type); break; |
977 | case KW_client_type: f.get (client_type); break; |
931 | case KW_duration: f.get (duration); break; |
978 | case KW_duration: f.get (duration); break; |
932 | case KW_range: f.get (range); break; |
979 | case KW_range: f.get (range); break; |
933 | case KW_range_modifier: f.get (range_modifier); break; |
980 | case KW_range_modifier: f.get (range_modifier); break; |
… | |
… | |
952 | case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; |
999 | case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; |
953 | case KW_can_apply: |
1000 | case KW_can_apply: |
954 | break; |
1001 | break; |
955 | |
1002 | |
956 | case KW_connected: |
1003 | case KW_connected: |
957 | add_button_link (this, map, f.get_sint32 ()); |
1004 | { |
|
|
1005 | shstr connected; |
|
|
1006 | |
|
|
1007 | f.get (connected); |
|
|
1008 | add_link (map, connected); |
|
|
1009 | } |
958 | break; |
1010 | break; |
959 | |
1011 | |
960 | case KW_randomitems: |
1012 | case KW_randomitems: |
961 | if (f.get_str ()) |
1013 | if (f.has_value ()) |
962 | { |
1014 | { |
963 | randomitems = |
1015 | randomitems = |
964 | loading_arch |
1016 | loading_arch |
965 | ? treasurelist::get (f.get_str ()) |
1017 | ? treasurelist::get (f.get_str ()) |
966 | : treasurelist::find (f.get_str ()); |
1018 | : treasurelist::find (f.get_str ()); |
967 | |
1019 | |
968 | if (!randomitems) |
1020 | if (!randomitems) |
|
|
1021 | { |
969 | LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); |
1022 | LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); |
|
|
1023 | randomitems = treasurelist::get (shstr_none); // avoid crashes |
|
|
1024 | } |
970 | } |
1025 | } |
971 | else |
1026 | else |
972 | randomitems = 0; |
1027 | randomitems = 0; |
973 | break; |
1028 | break; |
974 | |
1029 | |
975 | case KW_msg: |
1030 | case KW_msg: |
976 | f.get_ml (KW_endmsg, msg); |
1031 | f.get_ml (KW_endmsg, msg); |
977 | //TODO: allow longer messages |
|
|
978 | if (strlen (msg) >= HUGE_BUF) |
|
|
979 | { |
|
|
980 | LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg); |
|
|
981 | msg = "ERROR, please report: string too long, winged.\n"; |
|
|
982 | } |
|
|
983 | break; |
1032 | break; |
984 | |
1033 | |
985 | case KW_lore: |
1034 | case KW_lore: |
986 | f.get_ml (KW_endlore, lore); |
1035 | f.get_ml (KW_endlore, lore); |
987 | //TODO: allow longer messages |
|
|
988 | /* Just print a warning so we can be reasonably safe |
|
|
989 | * about not overflowing the buffer. |
|
|
990 | */ |
|
|
991 | if (strlen (lore) > (HUGE_BUF / 2)) |
|
|
992 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
|
|
993 | HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore); |
|
|
994 | break; |
1036 | break; |
995 | |
1037 | |
996 | case KW_editable: |
1038 | case KW_editable: |
997 | case KW_editor_folder: |
1039 | case KW_editor_folder: |
998 | break; |
1040 | break; |
… | |
… | |
1003 | |
1045 | |
1004 | f.next (); |
1046 | f.next (); |
1005 | return true; |
1047 | return true; |
1006 | |
1048 | |
1007 | case KW_ERROR: |
1049 | case KW_ERROR: |
1008 | set_ob_key_value (this, f.kw_str, f.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 | } |
1009 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
1070 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
1010 | break; |
1071 | break; |
1011 | |
1072 | |
1012 | default: |
1073 | default: |
1013 | if (!f.parse_error ("object", name)) |
1074 | if (!f.parse_error ("object", name)) |
… | |
… | |
1027 | archetype *arch = archetype::find (f.get_str ()); |
1088 | archetype *arch = archetype::find (f.get_str ()); |
1028 | |
1089 | |
1029 | if (!arch) |
1090 | if (!arch) |
1030 | { |
1091 | { |
1031 | LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); |
1092 | LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); |
1032 | arch = archetype::find ("earthwall"); |
1093 | arch = archetype::find (shstr_earthwall); |
1033 | } |
1094 | } |
1034 | |
1095 | |
1035 | assert (arch); //D maybe use exception handling of sorts? |
1096 | assert (arch); //D maybe use exception handling of sorts? |
1036 | |
1097 | |
1037 | f.next (); |
1098 | f.next (); |
1038 | |
1099 | |
1039 | object *op = object::create (); |
1100 | object *op = arch->instance (); |
1040 | |
|
|
1041 | op->map = map; |
1101 | op->map = map; |
1042 | arch->clone.copy_to (op); |
|
|
1043 | // copy_to activates, this should be fixed properly |
1102 | // instance() activates, this should be fixed properly |
1044 | op->deactivate (); |
1103 | op->deactivate (); |
1045 | |
1104 | |
1046 | if (!op->parse_kv (f)) |
1105 | if (!op->parse_kv (f)) |
1047 | { |
1106 | { |
1048 | op->destroy (true); |
1107 | op->destroy (); |
1049 | return 0; |
1108 | return 0; |
1050 | } |
1109 | } |
1051 | |
1110 | |
1052 | op->post_load_check (); |
1111 | op->post_load_check (); |
1053 | return op; |
1112 | return op; |
… | |
… | |
1062 | int |
1121 | int |
1063 | set_variable (object *op, char *buf) |
1122 | set_variable (object *op, char *buf) |
1064 | { |
1123 | { |
1065 | object_thawer f (buf, (AV *)0); |
1124 | object_thawer f (buf, (AV *)0); |
1066 | |
1125 | |
1067 | f.next (); |
|
|
1068 | return op->parse_kv (f); |
1126 | return op->parse_kv (f); |
1069 | } |
1127 | } |
1070 | |
1128 | |
1071 | /* This returns a string of the integer movement type */ |
|
|
1072 | #if 0 |
|
|
1073 | // unused function |
|
|
1074 | static char * |
|
|
1075 | get_string_move_type (MoveType mt) |
|
|
1076 | { |
|
|
1077 | static char retbuf[MAX_BUF], retbuf_all[MAX_BUF]; |
|
|
1078 | int i, all_count = 0, count; |
|
|
1079 | |
|
|
1080 | strcpy (retbuf, ""); |
|
|
1081 | strcpy (retbuf_all, " all"); |
|
|
1082 | |
|
|
1083 | /* Quick check, and probably fairly common */ |
|
|
1084 | if (mt == MOVE_ALL) |
|
|
1085 | return retbuf_all + 1; |
|
|
1086 | if (mt == 0) |
|
|
1087 | { |
|
|
1088 | strcpy (retbuf, "0"); |
|
|
1089 | return retbuf; |
|
|
1090 | } |
|
|
1091 | |
|
|
1092 | /* We basically slide the bits down. Why look at MOVE_ALL? |
|
|
1093 | * because we may want to return a string like 'all -swim', |
|
|
1094 | * and if we just looked at mt, we couldn't get that. |
|
|
1095 | */ |
|
|
1096 | for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++) |
|
|
1097 | { |
|
|
1098 | if (mt & (1 << count)) |
|
|
1099 | { |
|
|
1100 | strcat (retbuf, " "); |
|
|
1101 | strcat (retbuf, move_name[count]); |
|
|
1102 | } |
|
|
1103 | else |
|
|
1104 | { |
|
|
1105 | strcat (retbuf_all, " -"); |
|
|
1106 | strcat (retbuf_all, move_name[count]); |
|
|
1107 | all_count++; |
|
|
1108 | } |
|
|
1109 | } |
|
|
1110 | /* Basically, if there is a single negation, return it, eg |
|
|
1111 | * 'all -swim'. But more than that, just return the |
|
|
1112 | * enumerated values. It doesn't make sense to return |
|
|
1113 | * 'all -walk -fly_low' - it is shorter to return 'fly_high swim' |
|
|
1114 | */ |
|
|
1115 | if (all_count <= 1) |
|
|
1116 | return retbuf_all + 1; |
|
|
1117 | else |
|
|
1118 | return retbuf + 1; |
|
|
1119 | } |
|
|
1120 | #endif |
|
|
1121 | |
|
|
1122 | // compare *op against *tmp and output differences |
1129 | // compare *op against *arch and output differences |
1123 | static void |
1130 | static void |
1124 | write_diff (object_freezer &f, object *op, object *tmp) |
1131 | write_diff (object_freezer &f, object *op, object *arch) |
1125 | { |
1132 | { |
1126 | static const keyword resist_save[NROFATTACKS] = { |
1133 | static const keyword resist_save[NROFATTACKS] = { |
1127 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1134 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1128 | # include "attackinc.h" |
1135 | # include "attackinc.h" |
1129 | # undef def |
1136 | # undef def |
… | |
… | |
1134 | * the 15'th element of this array should match that name. |
1141 | * the 15'th element of this array should match that name. |
1135 | * 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. |
1136 | */ |
1143 | */ |
1137 | static const keyword flag_names [NUM_FLAGS] = { |
1144 | static const keyword flag_names [NUM_FLAGS] = { |
1138 | KW_alive, |
1145 | KW_alive, |
1139 | KW_wiz, |
|
|
1140 | KW_NULL, |
1146 | KW_NULL, |
1141 | KW_NULL, |
1147 | KW_NULL, |
1142 | KW_was_wiz, |
1148 | KW_NULL, |
|
|
1149 | KW_NULL, |
1143 | KW_applied, |
1150 | KW_applied, |
1144 | KW_unpaid, |
1151 | KW_unpaid, |
1145 | KW_can_use_shield, |
1152 | KW_can_use_shield, |
1146 | KW_no_pick, |
1153 | KW_no_pick, |
1147 | KW_NULL, // walk_on |
1154 | KW_NULL, // walk_on |
|
|
1155 | /* 10 */ |
1148 | KW_NULL, // no_pass |
1156 | KW_NULL, // no_pass |
1149 | /* 10 */ |
|
|
1150 | KW_is_animated, |
1157 | KW_is_animated, |
1151 | KW_NULL, // slow_move |
1158 | KW_NULL, // slow_move |
1152 | KW_NULL, // flying |
1159 | KW_NULL, // flying |
1153 | KW_monster, |
1160 | KW_monster, |
1154 | KW_friendly, |
1161 | KW_friendly, |
1155 | KW_generator, |
1162 | KW_generator, |
1156 | KW_is_thrown, |
1163 | KW_is_thrown, |
1157 | KW_auto_apply, |
1164 | KW_auto_apply, |
1158 | KW_treasure_env, |
1165 | KW_treasure_env, |
|
|
1166 | /* 20 */ |
1159 | KW_player_sold, |
1167 | KW_player_sold, |
1160 | /* 20 */ |
|
|
1161 | KW_see_invisible, |
1168 | KW_see_invisible, |
1162 | KW_can_roll, |
1169 | KW_can_roll, |
1163 | KW_overlay_floor, |
1170 | KW_overlay_floor, |
1164 | KW_is_turnable, |
1171 | KW_is_turnable, |
1165 | KW_NULL, // walk_off |
1172 | KW_NULL, // walk_off |
1166 | KW_NULL, // fly_on |
1173 | KW_NULL, // fly_on |
1167 | KW_NULL, // fly_off |
1174 | KW_NULL, // fly_off |
1168 | KW_is_used_up, |
1175 | KW_is_used_up, |
1169 | KW_identified, |
1176 | KW_identified, |
|
|
1177 | /* 30 */ |
1170 | KW_reflecting, |
1178 | KW_reflecting, |
1171 | /* 30 */ |
|
|
1172 | KW_changing, |
1179 | KW_changing, |
1173 | KW_splitting, |
1180 | KW_splitting, |
1174 | KW_hitback, |
1181 | KW_hitback, |
1175 | KW_startequip, |
1182 | KW_startequip, |
1176 | KW_blocksview, |
1183 | KW_blocksview, |
1177 | KW_undead, |
1184 | KW_undead, |
1178 | KW_scared, |
1185 | KW_scared, |
1179 | KW_unaggressive, |
1186 | KW_unaggressive, |
1180 | KW_reflect_missile, |
1187 | KW_reflect_missile, |
|
|
1188 | /* 40 */ |
1181 | KW_reflect_spell, |
1189 | KW_reflect_spell, |
1182 | /* 40 */ |
|
|
1183 | KW_no_magic, |
1190 | KW_no_magic, |
1184 | KW_no_fix_player, |
1191 | KW_NULL, |
1185 | KW_is_lightable, |
1192 | KW_is_lightable, |
1186 | KW_tear_down, |
1193 | KW_tear_down, |
1187 | KW_run_away, |
1194 | KW_run_away, |
1188 | KW_NULL, // pass_thru |
1195 | KW_NULL, // pass_thru |
1189 | KW_NULL, // an_pass_thru |
1196 | KW_NULL, // an_pass_thru |
1190 | KW_pick_up, |
1197 | KW_pick_up, |
1191 | KW_unique, |
1198 | KW_unique, |
|
|
1199 | /* 50 */ |
1192 | KW_no_drop, |
1200 | KW_no_drop, |
1193 | /* 50 */ |
|
|
1194 | KW_NULL, // wizcast |
1201 | KW_NULL, // wizcast |
1195 | KW_can_cast_spell, |
1202 | KW_can_cast_spell, |
1196 | KW_can_use_scroll, |
1203 | KW_can_use_scroll, |
1197 | KW_can_use_range, |
1204 | KW_can_use_range, |
1198 | KW_can_use_bow, |
1205 | KW_can_use_bow, |
1199 | KW_can_use_armour, |
1206 | KW_can_use_armour, |
1200 | KW_can_use_weapon, |
1207 | KW_can_use_weapon, |
1201 | KW_can_use_ring, |
1208 | KW_can_use_ring, |
1202 | KW_has_ready_range, |
1209 | KW_has_ready_range, |
|
|
1210 | /* 60 */ |
1203 | KW_has_ready_bow, |
1211 | KW_has_ready_bow, |
1204 | /* 60 */ |
|
|
1205 | KW_xrays, |
1212 | KW_xrays, |
1206 | KW_NULL, |
1213 | KW_NULL, |
1207 | KW_is_floor, |
1214 | KW_is_floor, |
1208 | KW_lifesave, |
1215 | KW_lifesave, |
1209 | KW_no_strength, |
1216 | KW_no_strength, |
1210 | KW_sleep, |
1217 | KW_sleep, |
1211 | KW_stand_still, |
1218 | KW_stand_still, |
1212 | KW_random_move, |
1219 | KW_random_move, |
1213 | KW_only_attack, |
1220 | KW_only_attack, |
|
|
1221 | /* 70 */ |
1214 | KW_confused, |
1222 | KW_confused, |
1215 | /* 70 */ |
|
|
1216 | KW_stealth, |
1223 | KW_stealth, |
1217 | KW_NULL, |
1224 | KW_NULL, |
1218 | KW_NULL, |
1225 | KW_NULL, |
1219 | KW_cursed, |
1226 | KW_cursed, |
1220 | KW_damned, |
1227 | KW_damned, |
1221 | KW_see_anywhere, |
1228 | KW_see_anywhere, |
1222 | KW_known_magical, |
1229 | KW_known_magical, |
1223 | KW_known_cursed, |
1230 | KW_known_cursed, |
1224 | KW_can_use_skill, |
1231 | KW_can_use_skill, |
|
|
1232 | /* 80 */ |
1225 | KW_been_applied, |
1233 | KW_been_applied, |
1226 | /* 80 */ |
|
|
1227 | KW_has_ready_scroll, |
1234 | KW_has_ready_scroll, |
1228 | KW_can_use_rod, |
1235 | KW_can_use_rod, |
1229 | KW_precious, |
1236 | KW_precious, |
1230 | KW_can_use_horn, |
1237 | KW_can_use_horn, |
1231 | KW_make_invisible, |
1238 | KW_make_invisible, |
1232 | KW_inv_locked, |
1239 | KW_inv_locked, |
1233 | KW_is_wooded, |
1240 | KW_is_wooded, |
1234 | KW_is_hilly, |
1241 | KW_is_hilly, |
1235 | KW_has_ready_skill, |
1242 | KW_has_ready_skill, |
|
|
1243 | /* 90 */ |
1236 | KW_has_ready_weapon, |
1244 | KW_has_ready_weapon, |
1237 | /* 90 */ |
|
|
1238 | KW_no_skill_ident, |
1245 | KW_no_skill_ident, |
1239 | KW_is_blind, |
1246 | KW_is_blind, |
1240 | KW_can_see_in_dark, |
1247 | KW_can_see_in_dark, |
1241 | KW_is_cauldron, |
1248 | KW_is_cauldron, |
1242 | KW_NULL, |
1249 | KW_NULL, |
1243 | KW_no_steal, |
1250 | KW_no_steal, |
1244 | KW_one_hit, |
1251 | KW_one_hit, |
1245 | KW_NULL, |
1252 | KW_NULL, |
1246 | KW_berserk, |
1253 | KW_berserk, |
|
|
1254 | /* 100 */ |
1247 | KW_neutral, |
1255 | KW_neutral, |
1248 | /* 100 */ |
|
|
1249 | KW_no_attack, |
1256 | KW_no_attack, |
1250 | KW_no_damage, |
1257 | KW_no_damage, |
1251 | KW_obj_original, |
1258 | KW_obj_original, |
1252 | KW_NULL, |
1259 | KW_random_speed, |
1253 | KW_activate_on_push, |
1260 | KW_activate_on_push, |
1254 | KW_activate_on_release, |
1261 | KW_activate_on_release, |
1255 | KW_is_water, |
1262 | KW_is_water, |
1256 | KW_use_content_on_gen, |
1263 | KW_use_content_on_gen, |
1257 | KW_NULL, |
1264 | KW_NULL, |
|
|
1265 | /* 110 */ |
1258 | KW_is_buildable, |
1266 | KW_is_buildable, |
1259 | /* 110 */ |
|
|
1260 | KW_destroy_on_death, |
1267 | KW_destroy_on_death, |
1261 | KW_NULL, |
1268 | KW_NULL, |
1262 | }; |
1269 | }; |
1263 | |
1270 | |
1264 | 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; |
1265 | |
1282 | |
1266 | /* 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 |
1267 | * keys that match field names will be overwritten by the loader. |
1284 | * keys that match field names will be overwritten by the loader. |
1268 | */ |
1285 | */ |
1269 | for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) |
1286 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1270 | { |
1287 | if (!arch->key_values || arch->kv (kv->key) != kv->value) |
1271 | /* Find the field in the opposing member. */ |
1288 | f.put (kv->key, kv->value); |
1272 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
|
|
1273 | |
1289 | |
1274 | /* If there's no partnering field, or it's got a different value, save our field. */ |
1290 | if (op->uuid) |
1275 | if (!arch_field || my_field->value != arch_field->value) |
|
|
1276 | f.put (my_field->key, my_field->value); |
|
|
1277 | } |
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; |
1278 | |
1295 | |
1279 | /* We don't need to worry about the arch's extra fields - they |
1296 | memcpy (ptr, "uuid ", sizeof ("uuid ") - 1); |
1280 | * will get taken care of the copy_to method. |
1297 | ptr += sizeof ("uuid ") - 1; |
1281 | */ |
1298 | ptr = op->uuid.append (ptr); |
|
|
1299 | *ptr++ = '\n'; |
1282 | |
1300 | |
1283 | { |
1301 | f.alloc (ptr - cur); |
1284 | char uids[64]; |
|
|
1285 | snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); |
|
|
1286 | f.put (KW_uuid, (const char *)uids); |
|
|
1287 | } |
1302 | } |
1288 | |
1303 | |
1289 | #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) |
1290 | #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); |
1291 | |
1313 | |
1292 | CMP_OUT (name); |
1314 | CMP_OUT (name); |
1293 | CMP_OUT (name_pl); |
1315 | CMP_OUT (name_pl); |
1294 | 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 | |
1295 | CMP_OUT (title); |
1336 | CMP_OUT (title); |
1296 | CMP_OUT (race); |
1337 | CMP_OUT (race); |
1297 | CMP_OUT (slaying); |
1338 | CMP_OUT (slaying); |
|
|
1339 | CMP_OUT (skill); |
1298 | |
1340 | |
1299 | if (op->msg != tmp->msg) |
1341 | CMP_OUT (tag); |
1300 | f.put (KW_msg, KW_endmsg, op->msg); |
1342 | CMP_OUT (custom_name); |
1301 | if (op->lore != tmp->lore) |
1343 | |
1302 | f.put (KW_lore, KW_endlore, op->lore); |
1344 | if (object *owner = op->owner) |
|
|
1345 | if (const char *ref = owner->ref ()) |
|
|
1346 | f.put (KW(owner), ref); |
|
|
1347 | |
|
|
1348 | // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved |
1303 | |
1349 | |
1304 | CMP_OUT (other_arch); |
1350 | CMP_OUT (other_arch); |
1305 | |
1351 | |
1306 | if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); |
1352 | if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg ); |
|
|
1353 | if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore); |
1307 | |
1354 | |
|
|
1355 | if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0); |
|
|
1356 | if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0); |
|
|
1357 | if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0); |
|
|
1358 | |
1308 | if (op->animation_id != tmp->animation_id) |
1359 | if (op->animation_id != arch->animation_id) |
1309 | if (op->animation_id) |
1360 | if (op->has_anim ()) |
|
|
1361 | f.put (KW(animation), op->anim ().name); |
|
|
1362 | else |
1310 | { |
1363 | { |
1311 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1364 | f.put (KW(animation)); |
1312 | |
1365 | op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? |
1313 | if (!QUERY_FLAG (op, FLAG_ANIMATE)) |
|
|
1314 | f.put (KW_is_animated, (sint32) 0); |
|
|
1315 | } |
1366 | } |
1316 | else |
|
|
1317 | f.put (KW_animation, (const char *) 0); |
|
|
1318 | |
1367 | |
1319 | CMP_OUT2 (str, stats.Str); |
1368 | CMP_OUT2 (str, stats.Str); |
1320 | CMP_OUT2 (dex, stats.Dex); |
1369 | CMP_OUT2 (dex, stats.Dex); |
1321 | CMP_OUT2 (con, stats.Con); |
1370 | CMP_OUT2 (con, stats.Con); |
1322 | CMP_OUT2 (wis, stats.Wis); |
1371 | CMP_OUT2 (wis, stats.Wis); |
… | |
… | |
1331 | CMP_OUT2 (grace, stats.grace); |
1380 | CMP_OUT2 (grace, stats.grace); |
1332 | CMP_OUT2 (maxgrace, stats.maxgrace); |
1381 | CMP_OUT2 (maxgrace, stats.maxgrace); |
1333 | CMP_OUT2 (exp, stats.exp); |
1382 | CMP_OUT2 (exp, stats.exp); |
1334 | |
1383 | |
1335 | CMP_OUT (perm_exp); |
1384 | CMP_OUT (perm_exp); |
1336 | CMP_OUT (expmul); |
1385 | //CMP_OUT (expmul); |
1337 | |
1386 | |
1338 | CMP_OUT2 (food, stats.food); |
1387 | CMP_OUT2 (food, stats.food); |
1339 | CMP_OUT2 (dam, stats.dam); |
1388 | CMP_OUT2 (dam, stats.dam); |
1340 | CMP_OUT2 (luck, stats.luck); |
1389 | CMP_OUT2 (luck, stats.luck); |
1341 | CMP_OUT2 (wc, stats.wc); |
1390 | CMP_OUT2 (wc, stats.wc); |
1342 | CMP_OUT2 (ac, stats.ac); |
1391 | CMP_OUT2 (ac, stats.ac); |
1343 | |
1392 | |
1344 | CMP_OUT (x); |
|
|
1345 | CMP_OUT (y); |
|
|
1346 | CMP_OUT (speed); |
|
|
1347 | CMP_OUT (speed_left); |
|
|
1348 | CMP_OUT2 (move_state, move_status); |
1393 | CMP_OUT2 (move_state, move_status); |
1349 | CMP_OUT (attack_movement); |
1394 | CMP_OUT (attack_movement); |
1350 | CMP_OUT (nrof); |
1395 | CMP_OUT (nrof); |
1351 | CMP_OUT (level); |
1396 | CMP_OUT (level); |
1352 | CMP_OUT (direction); |
|
|
1353 | CMP_OUT (type); |
|
|
1354 | CMP_OUT (subtype); |
|
|
1355 | CMP_OUT (attacktype); |
1397 | CMP_OUT (attacktype); |
1356 | |
1398 | |
|
|
1399 | // using memcmp here seems to be a loss - is gcc vectorising? |
1357 | for (i = 0; i < NROFATTACKS; i++) |
1400 | for (int i = 0; i < NROFATTACKS; i++) |
1358 | if (op->resist[i] != tmp->resist[i]) |
1401 | if (expect_false (op->resist[i] != arch->resist[i])) |
1359 | f.put (resist_save[i], op->resist[i]); |
1402 | f.put (resist_save[i], op->resist[i]); |
1360 | |
1403 | |
1361 | CMP_OUT (path_attuned); |
1404 | CMP_OUT (path_attuned); |
1362 | CMP_OUT (path_repelled); |
1405 | CMP_OUT (path_repelled); |
1363 | CMP_OUT (path_denied); |
1406 | CMP_OUT (path_denied); |
|
|
1407 | |
1364 | CMP_OUT2 (material, materials);//TODO: nuke |
1408 | CMP_OUT2 (material, materials);//TODO: nuke |
1365 | CMP_OUT (materialname); |
1409 | if (op->material != arch->material) |
|
|
1410 | f.put (KW(materialname), op->material->name); |
|
|
1411 | |
1366 | CMP_OUT (value); |
1412 | CMP_OUT (value); |
1367 | CMP_OUT (carrying); |
1413 | CMP_OUT (carrying); |
1368 | CMP_OUT (weight); |
1414 | CMP_OUT (weight); |
1369 | CMP_OUT (invisible); |
1415 | CMP_OUT (invisible); |
1370 | CMP_OUT (state); |
1416 | CMP_OUT (state); |
… | |
… | |
1373 | CMP_OUT (last_sp); |
1419 | CMP_OUT (last_sp); |
1374 | CMP_OUT (last_grace); |
1420 | CMP_OUT (last_grace); |
1375 | CMP_OUT (last_eat); |
1421 | CMP_OUT (last_eat); |
1376 | CMP_OUT (glow_radius); |
1422 | CMP_OUT (glow_radius); |
1377 | |
1423 | |
1378 | if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) |
1424 | if (op->flag [FLAG_IS_LINKED]) |
|
|
1425 | if (auto (ol, op->find_link ())) |
1379 | f.put (KW_connected, i); |
1426 | f.put (KW(connected), ol->id); |
1380 | |
1427 | |
1381 | CMP_OUT (randomitems); |
1428 | CMP_OUT (randomitems); |
|
|
1429 | |
1382 | CMP_OUT2 (container, weight_limit); |
1430 | CMP_OUT2 (container, weight_limit); |
1383 | |
1431 | |
1384 | CMP_OUT (run_away); |
1432 | CMP_OUT (run_away); |
1385 | CMP_OUT (pick_up); |
1433 | CMP_OUT (pick_up); |
1386 | CMP_OUT (will_apply); |
1434 | CMP_OUT (will_apply); |
1387 | CMP_OUT (smoothlevel); |
1435 | CMP_OUT (smoothlevel); |
1388 | CMP_OUT (weapontype); |
1436 | CMP_OUT (weapontype); |
1389 | CMP_OUT (tooltype); |
|
|
1390 | CMP_OUT (elevation); |
|
|
1391 | CMP_OUT (client_type); |
1437 | CMP_OUT (client_type); |
1392 | CMP_OUT (item_power); |
1438 | CMP_OUT (item_power); |
1393 | CMP_OUT (duration); |
1439 | CMP_OUT (duration); |
1394 | CMP_OUT (range); |
1440 | CMP_OUT (range); |
1395 | CMP_OUT (range_modifier); |
1441 | CMP_OUT (range_modifier); |
… | |
… | |
1403 | CMP_OUT (move_on); |
1449 | CMP_OUT (move_on); |
1404 | CMP_OUT (move_off); |
1450 | CMP_OUT (move_off); |
1405 | CMP_OUT (move_slow); |
1451 | CMP_OUT (move_slow); |
1406 | CMP_OUT (move_slow_penalty); |
1452 | CMP_OUT (move_slow_penalty); |
1407 | |
1453 | |
1408 | if (op->flag != tmp->flag) |
1454 | object::flags_t diff = (op->flag ^ arch->flag) & flagmask; |
|
|
1455 | |
|
|
1456 | if (diff [FLAG_OBJ_ORIGINAL]) |
|
|
1457 | f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); |
|
|
1458 | |
|
|
1459 | diff.reset (FLAG_OBJ_ORIGINAL); |
|
|
1460 | |
|
|
1461 | // quickly test whether any other flags differ |
|
|
1462 | if (expect_true (diff.any ())) |
1409 | for (i = 0; i <= NUM_FLAGS; i++) |
1463 | for (int i = 0; i < NUM_FLAGS; i++) |
1410 | if (flag_names [i] && op->flag [i] != tmp->flag [i]) |
1464 | if (expect_false (diff [i])) |
1411 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1465 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
1412 | |
1466 | |
1413 | // save body locations |
1467 | // save body locations. gcc's memcmp does an abysmal job when used |
1414 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1468 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1415 | if (op->slot[i].info != tmp->slot[i].info) |
1469 | if (expect_false (op->slot[i].info != arch->slot[i].info)) |
1416 | f.put (body_locations[i].save_name, op->slot[i].info); |
1470 | f.put (body_locations[i].save_name, op->slot[i].info); |
1417 | } |
1471 | } |
1418 | |
1472 | |
1419 | /* |
1473 | /* |
1420 | * Dumps all variables in an object to a file. |
1474 | * Dumps all variables in an object to a file. |
… | |
… | |
1422 | * the only place this is not set is when saving the player. |
1476 | * the only place this is not set is when saving the player. |
1423 | */ |
1477 | */ |
1424 | bool |
1478 | bool |
1425 | object::write (object_freezer &f) |
1479 | object::write (object_freezer &f) |
1426 | { |
1480 | { |
1427 | /* Even if the object does have an owner, it would seem that we should |
1481 | if (expect_false (is_arch ())) |
1428 | * still save it. |
1482 | { |
1429 | */ |
1483 | f.put (KW(object), arch->archname); |
1430 | if (owner) |
1484 | write_diff (f, this, archetype::empty); |
1431 | return true; |
1485 | } |
1432 | |
1486 | else |
1433 | archetype *at = arch ? (archetype *)arch : empty_archetype; |
1487 | { |
1434 | |
|
|
1435 | f.put (KW_arch, at->name); |
1488 | f.put (KW(arch), arch->archname); |
1436 | write_diff (f, this, &at->clone); |
1489 | write_diff (f, this, arch); |
|
|
1490 | } |
1437 | |
1491 | |
1438 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1492 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1439 | tmp->write (f); |
1493 | tmp->write (f); |
1440 | |
1494 | |
1441 | f.put (this); |
1495 | f.put (this); |
1442 | f.put (KW_end); |
1496 | f.put (KW(end)); |
1443 | |
1497 | |
1444 | return true; |
1498 | return true; |
1445 | } |
1499 | } |
1446 | |
1500 | |
1447 | ///////////////////////////////////////////////////////////////////////////// |
1501 | ///////////////////////////////////////////////////////////////////////////// |
1448 | |
1502 | |
1449 | // generic resource file load, |
1503 | // generic resource file load, |
1450 | // currently supports: region, treasures, archetypes |
1504 | // currently supports: region, treasures, archetypes |
|
|
1505 | bool |
1451 | bool load_resource_file (const char *filename) |
1506 | load_resource_file_ (const char *filename) |
1452 | { |
1507 | { |
1453 | object_thawer f (filename); |
1508 | object_thawer f (filename); |
1454 | |
|
|
1455 | bool success = false; |
|
|
1456 | bool seen_arch = false; |
|
|
1457 | |
|
|
1458 | f.next (); |
|
|
1459 | |
1509 | |
1460 | for (;;) |
1510 | for (;;) |
1461 | { |
1511 | { |
1462 | switch (f.kw) |
1512 | switch (f.kw) |
1463 | { |
1513 | { |
1464 | case KW_region: |
1514 | case KW_region: |
1465 | if (!region::read (f)) |
1515 | if (!region::read (f)) |
1466 | goto finish; |
1516 | return false; |
1467 | break; |
1517 | break; |
1468 | |
1518 | |
1469 | case KW_treasure: |
1519 | case KW_treasure: |
1470 | case KW_treasureone: |
1520 | case KW_treasureone: |
1471 | if (!treasurelist::read (f)) |
1521 | if (!treasurelist::read (f)) |
1472 | goto finish; |
1522 | return false; |
1473 | break; |
1523 | break; |
1474 | |
1524 | |
1475 | case KW_object: |
1525 | case KW_object: |
1476 | seen_arch = true; |
|
|
1477 | if (!archetype::read (f)) |
1526 | if (!archetype::read (f)) |
1478 | goto finish; |
1527 | return false; |
1479 | break; |
1528 | break; |
1480 | |
1529 | |
1481 | case KW_EOF: |
1530 | case KW_EOF: |
1482 | success = true; |
1531 | return true; |
1483 | goto finish; |
|
|
1484 | |
1532 | |
1485 | default: |
1533 | default: |
1486 | if (!f.parse_error ("resource file")) |
1534 | if (!f.parse_error ("resource file")) |
1487 | goto finish; |
1535 | return false; |
1488 | |
1536 | |
1489 | f.next (); |
1537 | f.next (); |
1490 | break; |
1538 | break; |
1491 | } |
1539 | } |
1492 | } |
1540 | } |
1493 | |
|
|
1494 | finish: |
|
|
1495 | if (seen_arch) |
|
|
1496 | init_archetype_pointers (); |
|
|
1497 | |
|
|
1498 | return success; |
|
|
1499 | } |
1541 | } |
1500 | |
1542 | |