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