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