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