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