… | |
… | |
28 | |
28 | |
29 | #include <global.h> |
29 | #include <global.h> |
30 | #include <loader.h> |
30 | #include <loader.h> |
31 | #include <sproto.h> |
31 | #include <sproto.h> |
32 | |
32 | |
33 | // resource loader pure base class |
33 | ///////////////////////////////////////////////////////////////////////////// |
34 | struct loader_base |
|
|
35 | { |
|
|
36 | const char *filename; |
|
|
37 | virtual const char *type () const = 0; |
|
|
38 | |
|
|
39 | virtual archetype *get_arch (const char *name); |
|
|
40 | virtual void put_arch (archetype *arch); |
|
|
41 | |
|
|
42 | virtual object *get_object (const char *name); |
|
|
43 | virtual void put_object (object *op); |
|
|
44 | |
|
|
45 | virtual player *get_player (); |
|
|
46 | virtual void put_player (player *pl); |
|
|
47 | |
|
|
48 | virtual region *get_region (const char *name); |
|
|
49 | virtual void put_region (region *region); |
|
|
50 | |
|
|
51 | virtual facetile *get_face (const char *name); |
|
|
52 | virtual void put_face (facetile *face); |
|
|
53 | |
|
|
54 | virtual treasurelist *get_treasure (const char *name, bool one = false); |
|
|
55 | virtual void put_treasure (treasurelist *treasure); |
|
|
56 | |
|
|
57 | virtual animation *get_animation (const char *name); |
|
|
58 | virtual void put_animation (animation *anim); |
|
|
59 | }; |
|
|
60 | |
|
|
61 | // pure base class for default archetype loader |
|
|
62 | struct loader_arch : virtual loader_base { |
|
|
63 | archetype *get_arch (const char *name); |
|
|
64 | void put_arch (archetype *arch); |
|
|
65 | }; |
|
|
66 | |
|
|
67 | // pure base class for default object loader |
|
|
68 | struct loader_object : virtual loader_base { |
|
|
69 | object *get_object (const char *name); |
|
|
70 | void put_object (object *op); |
|
|
71 | }; |
|
|
72 | |
|
|
73 | // pure base class for default player loader |
|
|
74 | struct loader_player : virtual loader_base { |
|
|
75 | virtual player *get_player (); |
|
|
76 | virtual void put_player (player *pl); |
|
|
77 | }; |
|
|
78 | |
|
|
79 | // pure base class for default region loader |
|
|
80 | struct loader_region : virtual loader_base { |
|
|
81 | region *get_region (); |
|
|
82 | void put_region (region *region); |
|
|
83 | }; |
|
|
84 | |
|
|
85 | // pure base class for default face loader |
|
|
86 | struct loader_face : virtual loader_base { |
|
|
87 | facetile *get_face (const char *name); |
|
|
88 | void put_face (facetile *face); |
|
|
89 | }; |
|
|
90 | |
|
|
91 | // pure base class for default treasure loader |
|
|
92 | struct loader_treasure : virtual loader_base { |
|
|
93 | treasurelist *get_treasure (const char *name, bool one = false); |
|
|
94 | void put_treasure (treasurelist *treasure); |
|
|
95 | }; |
|
|
96 | |
|
|
97 | // pure base class for default animation loader |
|
|
98 | struct loader_animation : virtual loader_base { |
|
|
99 | animation *get_animation (const char *name); |
|
|
100 | void put_animation (animation *anim); |
|
|
101 | }; |
|
|
102 | |
|
|
103 | // future generic resource loader |
|
|
104 | // handles generic stuff valid in most files, such as |
|
|
105 | // animations, treasures, faces and so on |
|
|
106 | struct loader_generic |
|
|
107 | : virtual loader_base, |
|
|
108 | loader_object, loader_player, |
|
|
109 | loader_region, loader_face, |
|
|
110 | loader_treasure, loader_animation |
|
|
111 | { |
|
|
112 | const char *type () const = 0; |
|
|
113 | }; |
|
|
114 | |
|
|
115 | // the base class warns about and skips everything |
|
|
116 | archetype * |
|
|
117 | loader_base::get_arch (const char *name) |
|
|
118 | { |
|
|
119 | LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of type %s.\n", |
|
|
120 | filename, name, type ()); |
|
|
121 | |
|
|
122 | return new archetype; |
|
|
123 | } |
|
|
124 | |
|
|
125 | object * |
|
|
126 | loader_base::get_object (const char *name) |
|
|
127 | { |
|
|
128 | LOG (llevError, "%s: found object definition '%s', which is not allowed in files of type %s.\n", |
|
|
129 | filename, name, type ()); |
|
|
130 | |
|
|
131 | return object::create (); |
|
|
132 | } |
|
|
133 | |
|
|
134 | player * |
|
|
135 | loader_base::get_player () |
|
|
136 | { |
|
|
137 | LOG (llevError, "%s: found player definition, which is not allowed in files of type %s.\n", |
|
|
138 | filename, type ()); |
|
|
139 | |
|
|
140 | return player::create (); |
|
|
141 | } |
|
|
142 | |
|
|
143 | region * |
|
|
144 | loader_base::get_region (const char *name) |
|
|
145 | { |
|
|
146 | LOG (llevError, "%s: found region definition '%s', which is not allowed in files of type %s.\n", |
|
|
147 | filename, name, type ()); |
|
|
148 | |
|
|
149 | return new region; |
|
|
150 | } |
|
|
151 | |
|
|
152 | facetile * |
|
|
153 | loader_base::get_face (const char *name) |
|
|
154 | { |
|
|
155 | LOG (llevError, "%s: found face definition '%s', which is not allowed in files of type %s.\n", |
|
|
156 | filename, name, type ()); |
|
|
157 | |
|
|
158 | return new facetile; |
|
|
159 | } |
|
|
160 | |
|
|
161 | treasurelist * |
|
|
162 | loader_base::get_treasure (const char *name, bool one) |
|
|
163 | { |
|
|
164 | LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of type %s.\n", |
|
|
165 | filename, name, type ()); |
|
|
166 | |
|
|
167 | return new treasurelist;//D |
|
|
168 | } |
|
|
169 | |
|
|
170 | animation * |
|
|
171 | loader_base::get_animation (const char *name) |
|
|
172 | { |
|
|
173 | LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of type %s.\n", |
|
|
174 | filename, name, type ()); |
|
|
175 | |
|
|
176 | return new animation; |
|
|
177 | } |
|
|
178 | |
|
|
179 | void |
|
|
180 | loader_base::put_arch (archetype *arch) |
|
|
181 | { |
|
|
182 | delete arch; |
|
|
183 | } |
|
|
184 | |
|
|
185 | void |
|
|
186 | loader_base::put_object (object *op) |
|
|
187 | { |
|
|
188 | op->destroy (); |
|
|
189 | } |
|
|
190 | |
|
|
191 | void |
|
|
192 | loader_base::put_player (player *pl) |
|
|
193 | { |
|
|
194 | delete pl; |
|
|
195 | } |
|
|
196 | |
|
|
197 | void |
|
|
198 | loader_base::put_region (region *region) |
|
|
199 | { |
|
|
200 | delete region; |
|
|
201 | } |
|
|
202 | |
|
|
203 | void |
|
|
204 | loader_base::put_face (facetile *face) |
|
|
205 | { |
|
|
206 | delete face; |
|
|
207 | } |
|
|
208 | |
|
|
209 | void |
|
|
210 | loader_base::put_treasure (treasurelist *treasure) |
|
|
211 | { |
|
|
212 | delete treasure; |
|
|
213 | } |
|
|
214 | |
|
|
215 | void |
|
|
216 | loader_base::put_animation (animation *anim) |
|
|
217 | { |
|
|
218 | delete anim; |
|
|
219 | } |
|
|
220 | |
|
|
221 | /* Maps the MOVE_* values to names */ |
|
|
222 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
|
|
223 | |
34 | |
224 | /* 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 |
225 | * spell object conversion to the new object. It was not practical |
36 | * spell object conversion to the new object. It was not practical |
226 | * 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 |
227 | * 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 |
… | |
… | |
439 | "spell_cause_rabies", /* 204 */ |
250 | "spell_cause_rabies", /* 204 */ |
440 | "spell_glyph", /* 205 */ |
251 | "spell_glyph", /* 205 */ |
441 | NULL |
252 | NULL |
442 | }; |
253 | }; |
443 | |
254 | |
444 | extern int arch_init; |
255 | extern bool loading_arch; |
445 | |
256 | |
446 | /* 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 |
447 | * 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 |
448 | * 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 |
449 | * 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. |
450 | */ |
261 | */ |
451 | static void |
262 | static void |
452 | check_loaded_object (object *op) |
263 | check_loaded_object (object *op) |
453 | { |
264 | { |
454 | int ip; |
|
|
455 | |
|
|
456 | /* We do some specialised handling to handle legacy cases of name_pl. |
265 | /* We do some specialised handling to handle legacy cases of name_pl. |
457 | * 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 - |
458 | * this isn't perfect (things won't be properly pluralised), but works to |
267 | * this isn't perfect (things won't be properly pluralised), but works to |
459 | * 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 |
460 | * 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 |
461 | * 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. |
462 | * Otherwise, what happens is that the the plural name will lose |
271 | * Otherwise, what happens is that the the plural name will lose |
463 | * information (appear as just 'hearts' and not 'goblins heart') |
272 | * information (appear as just 'hearts' and not 'goblins heart') |
464 | */ |
273 | */ |
465 | 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) |
466 | op->name_pl = NULL; |
275 | op->name_pl = 0; |
467 | |
276 | |
468 | if (!op->name_pl) |
277 | if (!op->name_pl) |
469 | op->name_pl = op->name; |
278 | op->name_pl = op->name; |
470 | |
279 | |
471 | /* objects now have a materialname. try to patch it in */ |
280 | /* objects now have a materialname. try to patch it in */ |
… | |
… | |
474 | if (op->map != NULL) |
283 | if (op->map != NULL) |
475 | set_materialname (op, op->map->difficulty, NULL); |
284 | set_materialname (op, op->map->difficulty, NULL); |
476 | else |
285 | else |
477 | set_materialname (op, 5, NULL); |
286 | set_materialname (op, 5, NULL); |
478 | } |
287 | } |
|
|
288 | |
479 | /* only do these when program is first run - a bit |
289 | /* only do these when program is first run - a bit |
480 | * excessive to do this at every run - most of this is |
290 | * excessive to do this at every run - most of this is |
481 | * really just to catch any errors - program will still run, but |
291 | * really just to catch any errors - program will still run, but |
482 | * not in the ideal fashion. |
292 | * not in the ideal fashion. |
483 | */ |
293 | */ |
484 | if ((op->type == WEAPON || op->type == BOW) && arch_init) |
294 | if ((op->type == WEAPON || op->type == BOW) && loading_arch) |
485 | { |
295 | { |
486 | if (!op->skill) |
296 | if (!op->skill) |
487 | { |
|
|
488 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
297 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
489 | } |
|
|
490 | else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || |
298 | else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || |
491 | (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) |
299 | (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) |
492 | { |
|
|
493 | 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->body_info[1], &op->skill); |
494 | } |
|
|
495 | } |
301 | } |
496 | |
302 | |
497 | /* 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 |
498 | * really does for many objects. Need to catch any in maps |
304 | * really does for many objects. Need to catch any in maps |
499 | * that may have an old value. |
305 | * that may have an old value. |
500 | */ |
306 | */ |
501 | if ((op->type == WEAPON) || |
307 | if (op->type == WEAPON |
502 | (op->type == ARMOUR) || (op->type == HELMET) || |
308 | || op->type == ARMOUR || op->type == HELMET |
503 | (op->type == SHIELD) || (op->type == RING) || |
309 | || op->type == SHIELD || op->type == RING |
504 | (op->type == BOOTS) || (op->type == GLOVES) || |
310 | || op->type == BOOTS || op->type == GLOVES |
505 | (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) |
506 | { |
313 | { |
507 | if (op->last_heal) |
314 | if (op->last_heal) |
508 | { |
315 | { |
509 | 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 ()); |
510 | op->gen_sp_armour = op->last_heal; |
317 | op->gen_sp_armour = op->last_heal; |
511 | op->last_heal = 0; |
318 | op->last_heal = 0; |
512 | } |
319 | } |
513 | |
320 | |
514 | ip = calc_item_power (op, 0); |
321 | int ip = calc_item_power (op, 0); |
|
|
322 | |
515 | /* Legacy objects from before item power was in the game */ |
323 | /* Legacy objects from before item power was in the game */ |
516 | if (!op->item_power && ip) |
324 | if (!op->item_power && ip) |
517 | { |
325 | { |
518 | if (ip > 3) |
326 | if (ip > 3) |
519 | { |
|
|
520 | 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); |
521 | } |
328 | |
522 | op->item_power = ip; |
329 | op->item_power = ip; |
523 | } |
330 | } |
|
|
331 | |
524 | /* Check for possibly bogus values. Has to meet both these criteria - |
332 | /* Check for possibly bogus values. Has to meet both these criteria - |
525 | * 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 |
526 | * 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. |
527 | * 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, |
528 | * but not the second one. |
336 | * but not the second one. |
529 | */ |
337 | */ |
530 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
338 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
531 | { |
|
|
532 | 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); |
533 | } |
|
|
534 | |
|
|
535 | } |
340 | } |
|
|
341 | |
536 | /* Old spellcasting object - need to load in the appropiate object */ |
342 | /* Old spellcasting object - need to load in the appropiate object */ |
537 | 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 || |
538 | /* 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 */ |
539 | ((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) |
540 | { |
346 | { |
541 | object *tmp; |
|
|
542 | |
|
|
543 | /* 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' |
544 | * in that spell was stored in sp. |
348 | * in that spell was stored in sp. |
545 | */ |
349 | */ |
546 | 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]); |
547 | insert_ob_in_ob (tmp, op); |
351 | insert_ob_in_ob (tmp, op); |
548 | 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 */ |
549 | } |
353 | } |
|
|
354 | |
550 | /* 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 */ |
551 | |
|
|
552 | 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) |
553 | { |
357 | { |
554 | object *tmp; |
|
|
555 | |
|
|
556 | tmp = get_archetype_by_object_name (op->slaying); |
358 | object *tmp = get_archetype_by_object_name (op->slaying); |
557 | insert_ob_in_ob (tmp, op); |
359 | insert_ob_in_ob (tmp, op); |
558 | 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 */ |
559 | /* without this, value is all screwed up */ |
361 | /* without this, value is all screwed up */ |
560 | op->value = op->arch->clone.value * op->inv->value; |
362 | op->value = op->arch->clone.value * op->inv->value; |
561 | } |
363 | } |
… | |
… | |
597 | { |
399 | { |
598 | op->move_type = MOVE_ALL; |
400 | op->move_type = MOVE_ALL; |
599 | op->stats.maxhp = 0; |
401 | op->stats.maxhp = 0; |
600 | } |
402 | } |
601 | 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 | { "all" , MOVE_ALL }, |
|
|
424 | }; |
|
|
425 | |
|
|
426 | if (!str) |
|
|
427 | { |
|
|
428 | mt = 0; |
|
|
429 | return; |
|
|
430 | } |
|
|
431 | |
|
|
432 | if (isdigit (*str)) |
|
|
433 | { |
|
|
434 | mt = atoi (str); |
|
|
435 | return; |
|
|
436 | } |
|
|
437 | |
|
|
438 | mt = 0; |
|
|
439 | |
|
|
440 | for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) |
|
|
441 | { |
|
|
442 | bool negate = 0; |
|
|
443 | |
|
|
444 | if (*str == '-') |
|
|
445 | { |
|
|
446 | negate = 1; |
|
|
447 | str++; |
|
|
448 | } |
|
|
449 | |
|
|
450 | for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) |
|
|
451 | { |
|
|
452 | if (!strcmp (f->name, str)) |
602 | { |
453 | { |
603 | op->move_type = MOVE_WALK; |
454 | if (negate) |
|
|
455 | mt &= ~f->flags; |
|
|
456 | else |
|
|
457 | mt |= f->flags; |
|
|
458 | |
|
|
459 | goto next; |
604 | } |
460 | } |
605 | } |
461 | } |
606 | } |
|
|
607 | |
462 | |
|
|
463 | LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); |
|
|
464 | |
|
|
465 | next: ; |
|
|
466 | } |
608 | } |
467 | } |
609 | |
468 | |
610 | static void |
|
|
611 | set_move (MoveType & mt, const char *str) |
|
|
612 | { |
|
|
613 | if (!str) |
|
|
614 | { |
|
|
615 | mt = 0; |
|
|
616 | return; |
|
|
617 | } |
|
|
618 | |
|
|
619 | if (isdigit (*str)) |
|
|
620 | { |
|
|
621 | mt = atoi (str); |
|
|
622 | return; |
|
|
623 | } |
|
|
624 | |
|
|
625 | mt = 0; |
|
|
626 | |
|
|
627 | for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) |
|
|
628 | { |
|
|
629 | if (!strcasecmp (str, "all")) |
|
|
630 | mt |= MOVE_ALL; |
|
|
631 | else |
|
|
632 | { |
|
|
633 | int i, negate = 0; |
|
|
634 | |
|
|
635 | if (*str == '-') |
|
|
636 | { |
|
|
637 | negate = 1; |
|
|
638 | str++; |
|
|
639 | } |
|
|
640 | |
|
|
641 | for (i = 0; move_name[i]; i++) |
|
|
642 | { |
|
|
643 | if (!strcasecmp (move_name[i], str)) |
|
|
644 | { |
|
|
645 | if (negate) |
|
|
646 | mt &= ~(1 << i); |
|
|
647 | else |
|
|
648 | mt |= (1 << i); |
|
|
649 | |
|
|
650 | break; |
|
|
651 | } |
|
|
652 | } |
|
|
653 | |
|
|
654 | if (!move_name[i]) |
|
|
655 | { |
|
|
656 | /* fly is a special case - covers both fly_low and |
|
|
657 | * fly_high - since it doesn't match to a specific |
|
|
658 | * single bit, have to special case it. |
|
|
659 | */ |
|
|
660 | if (!strcasecmp (str, "flying")) |
|
|
661 | { |
|
|
662 | if (negate) |
|
|
663 | mt &= ~MOVE_FLYING; |
|
|
664 | else |
|
|
665 | mt |= MOVE_FLYING; |
|
|
666 | } |
|
|
667 | else |
|
|
668 | LOG (llevDebug, "common/loader.l: set_move - unknown move string '%s'\n", str); |
|
|
669 | } |
|
|
670 | } |
|
|
671 | } |
|
|
672 | } |
|
|
673 | |
|
|
674 | #define GET_FLAG(op,flag) \ |
469 | #define GET_FLAG(op,flag) \ |
675 | if (thawer.get_sint32 ()) \ |
470 | if (f.get_sint32 ()) \ |
676 | SET_FLAG (op, flag); \ |
471 | SET_FLAG (op, flag); \ |
677 | else \ |
472 | else \ |
678 | CLEAR_FLAG (op, flag) \ |
473 | CLEAR_FLAG (op, flag) \ |
679 | |
474 | |
680 | int |
475 | bool |
681 | parse_object (object *op, object_thawer &thawer, int map_flags) |
476 | object::parse_kv (object_thawer &f) |
682 | { |
477 | { |
683 | bool ismore = 0; |
478 | assert (f.kw == KW_object || f.kw == KW_arch); |
|
|
479 | |
|
|
480 | if (f.kw == KW_object) |
|
|
481 | f.get (name); // preset name from object name |
|
|
482 | |
|
|
483 | f.next (); |
|
|
484 | |
684 | object *op_inv = op->inv; |
485 | object *op_inv = inv; |
685 | |
486 | |
686 | for (;;) |
487 | for (;;) |
687 | { |
488 | { |
688 | keyword kw = thawer.get_kv (); |
|
|
689 | |
|
|
690 | switch (kw) |
489 | switch (f.kw) |
691 | { |
490 | { |
692 | case KW_Object: // uppercase alias |
|
|
693 | case KW_object: |
|
|
694 | thawer.get (op->name); |
|
|
695 | |
|
|
696 | if (op->arch) |
|
|
697 | op->arch->name = op->name; |
|
|
698 | |
|
|
699 | break; |
|
|
700 | |
|
|
701 | case KW_uuid: |
491 | case KW_uuid: |
702 | if (const char *s = thawer.get_str ()) |
492 | if (const char *s = f.get_str ()) |
703 | { |
493 | { |
704 | unsigned int version; |
494 | unsigned int version; |
705 | unsigned long long seq; |
495 | unsigned long long seq; |
706 | |
496 | |
707 | if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) |
497 | if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) |
708 | { |
498 | { |
709 | op->uuid.seq = seq; |
499 | uuid.seq = seq; |
710 | break; |
500 | break; |
711 | } |
501 | } |
712 | } |
502 | } |
713 | |
503 | |
714 | op->uuid = gen_uuid (); |
504 | uuid = gen_uuid (); |
715 | break; |
505 | break; |
716 | |
506 | |
717 | case KW_oid: |
507 | case KW_oid: |
718 | thawer.get (op, thawer.get_sint32 ()); |
508 | f.get (this, f.get_sint32 ()); |
719 | break; |
509 | break; |
720 | |
510 | |
721 | case KW_name: thawer.get (op->name); break; |
511 | case KW_name: f.get (name); break; |
722 | case KW_name_pl: thawer.get (op->name_pl); break; |
512 | case KW_name_pl: f.get (name_pl); break; |
723 | case KW_title: thawer.get (op->title); break; |
513 | case KW_title: f.get (title); break; |
724 | case KW_custom_name: thawer.get (op->custom_name); break; |
514 | case KW_custom_name: f.get (custom_name); break; |
725 | |
515 | |
726 | case KW_attach: thawer.get_ornull (op->attach); break; |
516 | case KW_attach: f.get_ornull (attach); break; |
727 | case KW_skill: thawer.get_ornull (op->skill); break; |
517 | case KW_skill: f.get_ornull (skill); break; |
728 | case KW_race: thawer.get_ornull (op->race); break; |
518 | case KW_race: f.get_ornull (race); break; |
729 | case KW_slaying: thawer.get_ornull (op->slaying); break; |
519 | case KW_slaying: f.get_ornull (slaying); break; |
730 | |
520 | |
731 | case KW_arch: |
521 | case KW_arch: |
732 | { |
522 | { |
733 | const char *str = thawer.get_str (); |
|
|
734 | |
|
|
735 | if (op->arch) |
|
|
736 | { |
|
|
737 | /* If op->arch has been set, then this new object |
|
|
738 | * must be part of the inventory. So process |
|
|
739 | * appropriately. |
|
|
740 | */ |
|
|
741 | archetype *arch = archetype::find (str); |
|
|
742 | |
|
|
743 | object *tmp; |
|
|
744 | |
|
|
745 | if (arch) |
|
|
746 | tmp = arch_to_object (arch); |
|
|
747 | else |
|
|
748 | { |
|
|
749 | tmp = object::create (); |
523 | object *tmp = object::read (f); |
750 | /* record the name of the broken object */ |
|
|
751 | tmp->name = str; |
|
|
752 | } |
|
|
753 | |
|
|
754 | // decativate the object we, as we are still going |
|
|
755 | // to read the speed value. Objects should be activated |
|
|
756 | // when the map, object or player is completly loaded. |
|
|
757 | tmp->deactivate (); |
524 | tmp->deactivate (); |
758 | |
525 | |
759 | parse_object (tmp, thawer, map_flags); |
|
|
760 | |
|
|
761 | if (tmp->arch) |
|
|
762 | { |
526 | { |
763 | // was: insert_ob_in_ob (tmp, op); |
527 | // was: insert_ob_in_ob (tmp, op); |
764 | // but manually adding it can improve map loading times a lot |
528 | // but manually adding it can improve map loading times a lot |
765 | // also, appending instead of prepending keeps the |
529 | // also, appending instead of prepending keeps the |
766 | // save ordering the same between repeated load/saves. |
530 | // save ordering the same between repeated load/saves. |
767 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
531 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
768 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
532 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
769 | |
533 | |
770 | if (!op_inv) |
534 | if (!op_inv) |
771 | { |
535 | { |
772 | op->inv = tmp; |
|
|
773 | tmp->above = 0; |
|
|
774 | } |
|
|
775 | else |
|
|
776 | { |
|
|
777 | while (op_inv->below) |
|
|
778 | op_inv = op_inv->below; |
|
|
779 | |
|
|
780 | op_inv->below = tmp; |
|
|
781 | tmp->above = op_inv; |
|
|
782 | } |
|
|
783 | |
|
|
784 | tmp->below = 0; |
|
|
785 | tmp->env = op; |
|
|
786 | op_inv = tmp; |
536 | inv = tmp; |
|
|
537 | tmp->above = 0; |
787 | } |
538 | } |
788 | else |
539 | else |
789 | { |
540 | { |
790 | LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); |
541 | while (op_inv->below) |
791 | tmp->destroy (); |
542 | op_inv = op_inv->below; |
|
|
543 | |
|
|
544 | op_inv->below = tmp; |
|
|
545 | tmp->above = op_inv; |
792 | } |
546 | } |
|
|
547 | |
|
|
548 | tmp->below = 0; |
|
|
549 | tmp->env = this; |
|
|
550 | op_inv = tmp; |
793 | } |
551 | } |
794 | else |
|
|
795 | { |
|
|
796 | /* This is the actual archetype definition then */ |
|
|
797 | op->arch = archetype::find (str); |
|
|
798 | |
|
|
799 | if (op->arch) |
|
|
800 | { |
|
|
801 | op->arch->clone.copy_to (op); |
|
|
802 | // copy_to activates, this should be fixed properly |
|
|
803 | op->deactivate (); |
|
|
804 | } |
|
|
805 | else if (!arch_init) |
|
|
806 | /* record the name of the broken object */ |
|
|
807 | op->name = str; |
|
|
808 | } |
|
|
809 | } |
552 | } |
810 | break; |
553 | continue; |
811 | |
554 | |
812 | case KW_other_arch: |
555 | case KW_other_arch: |
|
|
556 | other_arch = |
|
|
557 | loading_arch |
|
|
558 | ? archetype::get (f.get_str ()) |
813 | op->other_arch = archetype::find (thawer.get_str ()); |
559 | : archetype::find (f.get_str ()); |
|
|
560 | |
|
|
561 | if (!other_arch) |
|
|
562 | LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); |
814 | break; |
563 | break; |
815 | |
564 | |
816 | case KW_animation: |
565 | case KW_animation: |
817 | { |
566 | { |
|
|
567 | CLEAR_FLAG (this, FLAG_ANIMATE); |
|
|
568 | animation_id = 0; |
|
|
569 | |
818 | const char *str = thawer.get_str (); |
570 | const char *str = f.get_str (); |
819 | |
|
|
820 | if (!str) |
|
|
821 | { |
|
|
822 | op->animation_id = 0; |
|
|
823 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
824 | } |
|
|
825 | else if ((op->animation_id = find_animation (str))) |
571 | if (str && (animation_id = find_animation (str))) |
826 | SET_FLAG (op, FLAG_ANIMATE); |
572 | SET_FLAG (this, FLAG_ANIMATE); |
827 | } |
573 | } |
828 | |
|
|
829 | break; |
574 | break; |
830 | |
575 | |
831 | case KW_last_heal: thawer.get (op->last_heal); break; |
576 | case KW_last_heal: f.get (last_heal); break; |
832 | case KW_last_sp: thawer.get (op->last_sp); break; |
577 | case KW_last_sp: f.get (last_sp); break; |
833 | case KW_last_grace: thawer.get (op->last_grace); break; |
578 | case KW_last_grace: f.get (last_grace); break; |
834 | case KW_last_eat: thawer.get (op->last_eat); break; |
579 | case KW_last_eat: f.get (last_eat); break; |
835 | case KW_speed_left: thawer.get (op->speed_left); break; |
580 | case KW_speed_left: f.get (speed_left); break; |
836 | |
581 | |
837 | case KW_speed: |
582 | case KW_speed: |
838 | thawer.get (op->speed); |
583 | f.get (speed); |
839 | |
584 | |
840 | //TODO: maybe do in check_object |
585 | //TODO: maybe do in check_object |
841 | // removed check for style maps |
586 | // removed check for style maps |
842 | if (op->speed < 0) |
587 | if (speed < 0) |
843 | op->speed_left = op->speed_left - rndm (); |
588 | speed_left = speed_left - rndm (); |
844 | |
589 | |
845 | break; |
590 | break; |
846 | |
591 | |
847 | case KW_slow_move: |
592 | case KW_slow_move: |
848 | op->move_slow |= MOVE_WALK; |
593 | move_slow |= MOVE_WALK; |
849 | thawer.get (op->move_slow_penalty); |
594 | f.get (move_slow_penalty); |
850 | break; |
595 | break; |
851 | |
596 | |
852 | case KW_face: |
597 | case KW_face: |
853 | op->face = &new_faces[FindFace (thawer.get_str (), 0)]; |
598 | face = face_find (f.get_str ()); |
854 | break; |
599 | break; |
855 | |
600 | |
856 | case KW_x: thawer.get (op->x); break; |
601 | case KW_x: f.get (x); break; |
857 | case KW_y: thawer.get (op->y); break; |
602 | case KW_y: f.get (y); break; |
858 | |
603 | |
859 | case KW_Str: // uppercase alias |
604 | case KW_Str: // uppercase alias |
860 | case KW_str: thawer.get (op->stats.Str); break; |
605 | case KW_str: f.get (stats.Str); break; |
861 | case KW_Dex: // uppercase alias |
606 | case KW_Dex: // uppercase alias |
862 | case KW_dex: thawer.get (op->stats.Dex); break; |
607 | case KW_dex: f.get (stats.Dex); break; |
863 | case KW_Con: // uppercase alias |
608 | case KW_Con: // uppercase alias |
864 | case KW_con: thawer.get (op->stats.Con); break; |
609 | case KW_con: f.get (stats.Con); break; |
865 | case KW_Wis: // uppercase alias |
610 | case KW_Wis: // uppercase alias |
866 | case KW_wis: thawer.get (op->stats.Wis); break; |
611 | case KW_wis: f.get (stats.Wis); break; |
867 | case KW_Cha: // uppercase alias |
612 | case KW_Cha: // uppercase alias |
868 | case KW_cha: thawer.get (op->stats.Cha); break; |
613 | case KW_cha: f.get (stats.Cha); break; |
869 | case KW_Int: // uppercase alias |
614 | case KW_Int: // uppercase alias |
870 | case KW_int: thawer.get (op->stats.Int); break; |
615 | case KW_int: f.get (stats.Int); break; |
871 | case KW_Pow: // uppercase alias |
616 | case KW_Pow: // uppercase alias |
872 | case KW_pow: thawer.get (op->stats.Pow); break; |
617 | case KW_pow: f.get (stats.Pow); break; |
873 | |
618 | |
874 | case KW_hp: thawer.get (op->stats.hp); break; |
619 | case KW_hp: f.get (stats.hp); break; |
875 | case KW_maxhp: thawer.get (op->stats.maxhp); break; |
620 | case KW_maxhp: f.get (stats.maxhp); break; |
876 | case KW_sp: thawer.get (op->stats.sp); break; |
621 | case KW_sp: f.get (stats.sp); break; |
877 | case KW_maxsp: thawer.get (op->stats.maxsp); break; |
622 | case KW_maxsp: f.get (stats.maxsp); break; |
878 | case KW_grace: thawer.get (op->stats.grace); break; |
623 | case KW_grace: f.get (stats.grace); break; |
879 | case KW_maxgrace: thawer.get (op->stats.maxgrace); break; |
624 | case KW_maxgrace: f.get (stats.maxgrace); break; |
880 | |
625 | |
881 | case KW_exp: thawer.get (op->stats.exp); break; |
626 | case KW_exp: f.get (stats.exp); break; |
882 | case KW_perm_exp: thawer.get (op->perm_exp); break; |
627 | case KW_perm_exp: f.get (perm_exp); break; |
883 | case KW_food: thawer.get (op->stats.food); break; |
628 | case KW_food: f.get (stats.food); break; |
884 | case KW_dam: thawer.get (op->stats.dam); break; |
629 | case KW_dam: f.get (stats.dam); break; |
885 | case KW_wc: thawer.get (op->stats.wc); break; |
630 | case KW_wc: f.get (stats.wc); break; |
886 | case KW_ac: thawer.get (op->stats.ac); break; |
631 | case KW_ac: f.get (stats.ac); break; |
887 | case KW_nrof: thawer.get (op->nrof); break; |
632 | case KW_nrof: f.get (nrof); break; |
888 | case KW_level: thawer.get (op->level); break; |
633 | case KW_level: f.get (level); break; |
889 | case KW_direction: thawer.get (op->direction); break; |
634 | case KW_direction: f.get (direction); break; |
890 | case KW_type: thawer.get (op->type); break; |
635 | case KW_type: f.get (type); break; |
891 | case KW_subtype: thawer.get (op->subtype); break; |
636 | case KW_subtype: f.get (subtype); break; |
892 | case KW_value: thawer.get (op->value); break; |
637 | case KW_value: f.get (value); break; |
893 | case KW_weight: thawer.get (op->weight); break; |
638 | case KW_weight: f.get (weight); break; |
894 | case KW_carrying: thawer.get (op->carrying); break; |
639 | case KW_carrying: f.get (carrying); break; |
895 | case KW_attacktype: thawer.get (op->attacktype); break; |
640 | case KW_attacktype: f.get (attacktype); break; |
896 | case KW_path_attuned: thawer.get (op->path_attuned); break; |
641 | case KW_path_attuned: f.get (path_attuned); break; |
897 | case KW_path_repelled: thawer.get (op->path_repelled); break; |
642 | case KW_path_repelled: f.get (path_repelled); break; |
898 | case KW_path_denied: thawer.get (op->path_denied); break; |
643 | case KW_path_denied: f.get (path_denied); break; |
899 | case KW_invisible: thawer.get (op->invisible); break; |
644 | case KW_invisible: f.get (invisible); break; |
900 | case KW_magic: thawer.get (op->magic); break; |
645 | case KW_magic: f.get (magic); break; |
901 | case KW_state: thawer.get (op->state); break; |
646 | case KW_state: f.get (state); break; |
902 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
647 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
903 | case KW_material: thawer.get (op->material); break; |
648 | case KW_material: f.get (materials); break; //TODO: nuke |
904 | case KW_materialname: thawer.get (op->materialname); break; |
649 | case KW_materialname: f.get (materialname); break; |
905 | |
650 | |
906 | /* These are the new values */ |
651 | /* These are the new values */ |
907 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
652 | case KW_move_block: set_move (move_block, f.get_str ()); break; |
908 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
653 | case KW_move_allow: set_move (move_allow, f.get_str ()); break; |
909 | case KW_move_type: set_move (op->move_type, thawer.get_str ()); break; |
654 | case KW_move_type: set_move (move_type, f.get_str ()); break; |
910 | case KW_move_on: set_move (op->move_on, thawer.get_str ()); break; |
655 | case KW_move_on: set_move (move_on, f.get_str ()); break; |
911 | case KW_move_off: set_move (op->move_off, thawer.get_str ()); break; |
656 | case KW_move_off: set_move (move_off, f.get_str ()); break; |
912 | case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break; |
657 | case KW_move_slow: set_move (move_slow, f.get_str ()); break; |
913 | |
658 | |
914 | /* These are all legacy - any new objects should use the move_ .. values */ |
659 | /* These are all legacy - any new objects should use the move_ .. values */ |
915 | case KW_no_pass: |
660 | case KW_no_pass: |
916 | { |
661 | { |
917 | if (thawer.get_sint32 ()) |
662 | if (f.get_sint32 ()) |
918 | op->move_block = MOVE_ALL; |
663 | move_block = MOVE_ALL; |
919 | else |
664 | else |
920 | op->move_block = 0; |
665 | move_block = 0; |
921 | } |
666 | } |
922 | |
667 | |
923 | break; |
668 | break; |
924 | |
669 | |
925 | /* These are all legacy - any new objects should use the move_ .. values */ |
670 | /* These are all legacy - any new objects should use the move_ .. values */ |
926 | case KW_walk_on: |
671 | case KW_walk_on: |
927 | { |
672 | { |
928 | if (thawer.get_sint32 ()) |
673 | if (f.get_sint32 ()) |
929 | op->move_on |= MOVE_WALK; |
674 | move_on |= MOVE_WALK; |
930 | else |
675 | else |
931 | op->move_on &= ~MOVE_WALK; |
676 | move_on &= ~MOVE_WALK; |
932 | } |
677 | } |
933 | |
678 | |
934 | break; |
679 | break; |
935 | |
680 | |
936 | /* These are all legacy - any new objects should use the move_ .. values */ |
681 | /* These are all legacy - any new objects should use the move_ .. values */ |
937 | case KW_walk_off: |
682 | case KW_walk_off: |
938 | { |
683 | { |
939 | if (thawer.get_sint32 ()) |
684 | if (f.get_sint32 ()) |
940 | op->move_off |= MOVE_WALK; |
685 | move_off |= MOVE_WALK; |
941 | else |
686 | else |
942 | op->move_off &= ~MOVE_WALK; |
687 | move_off &= ~MOVE_WALK; |
943 | } |
688 | } |
944 | break; |
689 | break; |
945 | |
690 | |
946 | /* These are all legacy - any new objects should use the move_ .. values */ |
691 | /* These are all legacy - any new objects should use the move_ .. values */ |
947 | case KW_fly_on: |
692 | case KW_fly_on: |
948 | { |
693 | { |
949 | if (thawer.get_sint32 ()) |
694 | if (f.get_sint32 ()) |
950 | op->move_on |= MOVE_FLY_LOW; |
695 | move_on |= MOVE_FLY_LOW; |
951 | else |
696 | else |
952 | op->move_on &= ~MOVE_FLY_LOW; |
697 | move_on &= ~MOVE_FLY_LOW; |
953 | } |
698 | } |
954 | break; |
699 | break; |
955 | |
700 | |
956 | /* These are all legacy - any new objects should use the move_ .. values */ |
701 | /* These are all legacy - any new objects should use the move_ .. values */ |
957 | case KW_fly_off: |
702 | case KW_fly_off: |
958 | { |
703 | { |
959 | if (thawer.get_sint32 ()) |
704 | if (f.get_sint32 ()) |
960 | op->move_off |= MOVE_FLY_LOW; |
705 | move_off |= MOVE_FLY_LOW; |
961 | else |
706 | else |
962 | op->move_off &= ~MOVE_FLY_LOW; |
707 | move_off &= ~MOVE_FLY_LOW; |
963 | } |
708 | } |
964 | break; |
709 | break; |
965 | |
710 | |
966 | //TODO: remove these after converting archetypes |
711 | //TODO: remove these after converting archetypes |
967 | case KW_can_use_wand: |
712 | case KW_can_use_wand: |
968 | GET_FLAG (op, FLAG_USE_RANGE); |
713 | GET_FLAG (this, FLAG_USE_RANGE); |
969 | break; |
714 | break; |
970 | |
715 | |
971 | /* These are all legacy - any new objects should use the move_ .. values */ |
716 | /* These are all legacy - any new objects should use the move_ .. values */ |
972 | case KW_flying: |
717 | case KW_flying: |
973 | { |
718 | { |
974 | if (thawer.get_sint32 ()) |
719 | if (f.get_sint32 ()) |
975 | op->move_type |= MOVE_FLY_LOW; |
720 | move_type |= MOVE_FLY_LOW; |
976 | else |
721 | else |
977 | op->move_type &= ~MOVE_FLY_LOW; |
722 | move_type &= ~MOVE_FLY_LOW; |
978 | } |
723 | } |
979 | break; |
724 | break; |
980 | |
725 | |
981 | |
726 | |
982 | case KW_identified: |
727 | case KW_identified: |
983 | GET_FLAG (op, FLAG_IDENTIFIED); |
728 | GET_FLAG (this, FLAG_IDENTIFIED); |
984 | //TODO: move to check_object or so |
729 | //TODO: move to check_object or so |
985 | if (QUERY_FLAG (op, FLAG_IDENTIFIED)) |
730 | if (QUERY_FLAG (this, FLAG_IDENTIFIED)) |
986 | CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); |
731 | CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); |
987 | |
732 | |
988 | break; |
733 | break; |
989 | |
734 | |
990 | case KW_wiz: |
735 | case KW_wiz: |
991 | GET_FLAG (op, FLAG_WIZ); |
736 | GET_FLAG (this, FLAG_WIZ); |
992 | //TODO: move to check_object |
737 | //TODO: move to check_object |
993 | if (QUERY_FLAG (op, FLAG_WIZ)) |
738 | if (QUERY_FLAG (this, FLAG_WIZ)) |
994 | { |
739 | { |
995 | SET_FLAG (op, FLAG_WAS_WIZ); |
740 | SET_FLAG (this, FLAG_WAS_WIZ); |
996 | SET_FLAG (op, FLAG_WIZPASS); |
741 | SET_FLAG (this, FLAG_WIZPASS); |
997 | SET_FLAG (op, FLAG_WIZCAST); |
742 | SET_FLAG (this, FLAG_WIZCAST); |
998 | } |
743 | } |
999 | else |
744 | else |
1000 | { |
745 | { |
1001 | CLEAR_FLAG (op, FLAG_WIZPASS); |
746 | CLEAR_FLAG (this, FLAG_WIZPASS); |
1002 | CLEAR_FLAG (op, FLAG_WIZCAST); |
747 | CLEAR_FLAG (this, FLAG_WIZCAST); |
1003 | } |
748 | } |
1004 | break; |
749 | break; |
1005 | |
750 | |
1006 | case KW_friendly: |
751 | case KW_friendly: |
1007 | if (thawer.get_sint32 ()) |
752 | if (f.get_sint32 ()) |
1008 | if (op->type != PLAYER) |
753 | if (type != PLAYER) |
1009 | add_friendly_object (op); |
754 | add_friendly_object (this); |
1010 | |
755 | |
1011 | break; |
756 | break; |
1012 | |
757 | |
1013 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
758 | case KW_monster: GET_FLAG (this, FLAG_MONSTER); break; |
1014 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
759 | case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break; |
1015 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
760 | case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break; |
1016 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
761 | case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break; |
1017 | case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break; |
762 | case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break; |
1018 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
763 | case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break; |
1019 | case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; |
764 | case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break; |
1020 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
765 | case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break; |
1021 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
766 | case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break; |
1022 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
767 | case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break; |
1023 | case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; |
768 | case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break; |
1024 | case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; |
769 | case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break; |
1025 | case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; |
770 | case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; |
1026 | case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; |
771 | case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; |
1027 | case KW_alive: GET_FLAG (op, FLAG_ALIVE); break; |
772 | case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; |
1028 | case KW_applied: GET_FLAG (op, FLAG_APPLIED); break; |
773 | case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; |
1029 | case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break; |
774 | case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; |
1030 | case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break; |
775 | case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; |
1031 | case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break; |
776 | case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; |
1032 | case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break; |
777 | case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; |
1033 | case KW_changing: GET_FLAG (op, FLAG_CHANGING); break; |
778 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
1034 | case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break; |
779 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
1035 | case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break; |
780 | case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; |
1036 | case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break; |
781 | case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; |
1037 | case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break; |
782 | case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; |
1038 | case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break; |
783 | case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; |
1039 | case KW_scared: GET_FLAG (op, FLAG_SCARED); break; |
784 | case KW_scared: GET_FLAG (this, FLAG_SCARED); break; |
1040 | case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break; |
785 | case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; |
1041 | case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break; |
786 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
1042 | case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break; |
787 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
1043 | case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break; |
788 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
1044 | case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break; |
789 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
1045 | case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break; |
790 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
1046 | case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break; |
791 | case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break; |
1047 | case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break; |
792 | case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; |
1048 | case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break; |
793 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
1049 | case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break; |
794 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
1050 | case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break; |
795 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
1051 | case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break; |
796 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
1052 | case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break; |
797 | case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; |
1053 | case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break; |
798 | case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break; |
1054 | case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; |
799 | case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break; |
1055 | case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; |
800 | case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break; |
1056 | case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; |
801 | case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break; |
1057 | case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; |
802 | case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break; |
1058 | case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; |
803 | case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break; |
1059 | case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break; |
804 | case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break; |
1060 | case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; |
805 | case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break; |
1061 | case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; |
806 | case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break; |
1062 | case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; |
807 | case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break; |
1063 | case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; |
808 | case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break; |
1064 | case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; |
809 | case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break; |
1065 | case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break; |
810 | case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break; |
1066 | case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break; |
811 | case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
1067 | case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break; |
812 | case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break; |
1068 | case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break; |
813 | case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break; |
1069 | case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break; |
814 | case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break; |
1070 | case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break; |
815 | case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break; |
1071 | case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break; |
816 | case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break; |
1072 | case KW_cursed: GET_FLAG (op, FLAG_CURSED); break; |
817 | case KW_cursed: GET_FLAG (this, FLAG_CURSED); break; |
1073 | case KW_damned: GET_FLAG (op, FLAG_DAMNED); break; |
818 | case KW_damned: GET_FLAG (this, FLAG_DAMNED); break; |
1074 | case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break; |
819 | case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break; |
1075 | case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break; |
820 | case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break; |
1076 | case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break; |
821 | case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break; |
1077 | case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break; |
822 | case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break; |
1078 | case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break; |
823 | case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break; |
1079 | case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break; |
824 | case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break; |
1080 | case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break; |
825 | case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break; |
1081 | case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break; |
826 | case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break; |
1082 | case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break; |
827 | case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break; |
1083 | case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break; |
828 | case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break; |
1084 | case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break; |
829 | case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break; |
1085 | case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break; |
830 | case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break; |
1086 | case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break; |
831 | case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break; |
1087 | case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break; |
832 | case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break; |
1088 | case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break; |
833 | case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break; |
1089 | case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break; |
834 | case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break; |
1090 | case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break; |
835 | case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break; |
1091 | case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break; |
836 | case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break; |
1092 | case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break; |
837 | case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break; |
1093 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
838 | case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break; |
1094 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
839 | case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break; |
1095 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
840 | case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break; |
1096 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
841 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
1097 | case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; |
842 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
1098 | case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break; |
843 | case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; |
1099 | |
844 | |
1100 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
845 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
1101 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
846 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
1102 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
847 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
1103 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
848 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
1104 | case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break; |
849 | case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break; |
1105 | case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break; |
850 | case KW_resist_cold: f.get (resist[ATNR_COLD]); break; |
1106 | case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break; |
851 | case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break; |
1107 | case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break; |
852 | case KW_resist_acid: f.get (resist[ATNR_ACID]); break; |
1108 | case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break; |
853 | case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break; |
1109 | case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break; |
854 | case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break; |
1110 | case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break; |
855 | case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break; |
1111 | case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break; |
856 | case KW_resist_poison: f.get (resist[ATNR_POISON]); break; |
1112 | case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break; |
857 | case KW_resist_slow: f.get (resist[ATNR_SLOW]); break; |
1113 | case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break; |
858 | case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break; |
1114 | case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break; |
859 | case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break; |
1115 | case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break; |
860 | case KW_resist_fear: f.get (resist[ATNR_FEAR]); break; |
1116 | case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break; |
861 | case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break; |
1117 | case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break; |
862 | case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break; |
1118 | case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break; |
863 | case KW_resist_death: f.get (resist[ATNR_DEATH]); break; |
1119 | case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break; |
864 | case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break; |
1120 | case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break; |
865 | case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break; |
1121 | case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break; |
866 | case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break; |
1122 | case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break; |
867 | case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break; |
1123 | case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break; |
868 | case KW_resist_blind: f.get (resist[ATNR_BLIND]); break; |
1124 | case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break; |
869 | case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break; |
1125 | case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break; |
870 | case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break; |
1126 | case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break; |
871 | case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break; |
1127 | |
872 | |
1128 | case KW_luck: thawer.get (op->stats.luck); break; |
873 | case KW_luck: f.get (stats.luck); break; |
1129 | case KW_run_away: thawer.get (op->run_away); break; |
874 | case KW_run_away: f.get (run_away); break; |
1130 | case KW_pick_up: thawer.get (op->pick_up); break; |
875 | case KW_pick_up: f.get (pick_up); break; |
1131 | case KW_item_power: thawer.get (op->item_power); break; |
876 | case KW_item_power: f.get (item_power); break; |
1132 | case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break; |
877 | case KW_gen_sp_armour: f.get (gen_sp_armour); break; |
1133 | case KW_anim_speed: thawer.get (op->anim_speed); break; |
878 | case KW_anim_speed: f.get (anim_speed); break; |
1134 | case KW_container: thawer.get (op->weight_limit); break; |
879 | case KW_container: f.get (weight_limit); break; |
1135 | case KW_will_apply: thawer.get (op->will_apply); break; |
880 | case KW_will_apply: f.get (will_apply); break; |
1136 | case KW_attack_movement: thawer.get (op->attack_movement); break; |
881 | case KW_attack_movement: f.get (attack_movement); break; |
1137 | case KW_move_state: thawer.get (op->move_status); break; |
882 | case KW_move_state: f.get (move_status); break; |
1138 | case KW_expmul: thawer.get (op->expmul); break; |
883 | case KW_expmul: f.get (expmul); break; |
1139 | case KW_glow_radius: thawer.get (op->glow_radius); break; |
884 | case KW_glow_radius: f.get (glow_radius); break; |
1140 | case KW_weapontype: thawer.get (op->weapontype); break; |
885 | case KW_weapontype: f.get (weapontype); break; |
1141 | case KW_tooltype: thawer.get (op->tooltype); break; |
886 | case KW_tooltype: f.get (tooltype); break; |
1142 | case KW_casting_time: thawer.get (op->casting_time); break; |
887 | case KW_casting_time: f.get (casting_time); break; |
1143 | case KW_elevation: thawer.get (op->elevation); break; |
888 | case KW_elevation: f.get (elevation); break; |
1144 | case KW_smoothlevel: thawer.get (op->smoothlevel); break; |
889 | case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; |
1145 | case KW_client_type: thawer.get (op->client_type); break; |
890 | case KW_client_type: f.get (client_type); break; |
1146 | case KW_duration: thawer.get (op->duration); break; |
891 | case KW_duration: f.get (duration); break; |
1147 | case KW_range: thawer.get (op->range); break; |
892 | case KW_range: f.get (range); break; |
1148 | case KW_range_modifier: thawer.get (op->range_modifier); break; |
893 | case KW_range_modifier: f.get (range_modifier); break; |
1149 | case KW_dam_modifier: thawer.get (op->dam_modifier); break; |
894 | case KW_dam_modifier: f.get (dam_modifier); break; |
1150 | case KW_duration_modifier: thawer.get (op->duration_modifier); break; |
895 | case KW_duration_modifier: f.get (duration_modifier); break; |
1151 | |
896 | |
1152 | //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess |
897 | //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess |
1153 | //TODO: parse from other include files |
898 | //TODO: parse from other include files |
1154 | case KW_body_range: thawer.get (op->body_info[0]); break; |
899 | case KW_body_range: f.get (body_info[0]); break; |
1155 | case KW_body_arm: thawer.get (op->body_info[1]); break; |
900 | case KW_body_arm: f.get (body_info[1]); break; |
1156 | case KW_body_torso: thawer.get (op->body_info[2]); break; |
901 | case KW_body_torso: f.get (body_info[2]); break; |
1157 | case KW_body_head: thawer.get (op->body_info[3]); break; |
902 | case KW_body_head: f.get (body_info[3]); break; |
1158 | case KW_body_neck: thawer.get (op->body_info[4]); break; |
903 | case KW_body_neck: f.get (body_info[4]); break; |
1159 | case KW_body_skill: thawer.get (op->body_info[5]); break; |
904 | case KW_body_skill: f.get (body_info[5]); break; |
1160 | case KW_body_finger: thawer.get (op->body_info[6]); break; |
905 | case KW_body_finger: f.get (body_info[6]); break; |
1161 | case KW_body_shoulder: thawer.get (op->body_info[7]); break; |
906 | case KW_body_shoulder: f.get (body_info[7]); break; |
1162 | case KW_body_foot: thawer.get (op->body_info[8]); break; |
907 | case KW_body_foot: f.get (body_info[8]); break; |
1163 | case KW_body_hand: thawer.get (op->body_info[9]); break; |
908 | case KW_body_hand: f.get (body_info[9]); break; |
1164 | case KW_body_wrist: thawer.get (op->body_info[10]); break; |
909 | case KW_body_wrist: f.get (body_info[10]); break; |
1165 | case KW_body_waist: thawer.get (op->body_info[11]); break; |
910 | case KW_body_waist: f.get (body_info[11]); break; |
1166 | case KW_can_apply: |
911 | case KW_can_apply: |
1167 | break; |
912 | break; |
1168 | |
913 | |
1169 | case KW_connected: |
914 | case KW_connected: |
1170 | add_button_link (op, op->map, thawer.get_sint32 ()); |
915 | add_button_link (this, map, f.get_sint32 ()); |
1171 | break; |
916 | break; |
1172 | |
917 | |
1173 | case KW_randomitems: |
918 | case KW_randomitems: |
1174 | op->randomitems = find_treasurelist (thawer.get_str ()); |
919 | if (f.get_str ()) |
|
|
920 | { |
|
|
921 | randomitems = |
|
|
922 | loading_arch |
|
|
923 | ? treasurelist::get (f.get_str ()) |
|
|
924 | : treasurelist::find (f.get_str ()); |
|
|
925 | |
|
|
926 | if (!randomitems) |
|
|
927 | LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); |
|
|
928 | } |
1175 | break; |
929 | break; |
1176 | |
930 | |
1177 | case KW_msg: |
931 | case KW_msg: |
1178 | thawer.get_ml (KW_endmsg, op->msg); |
932 | f.get_ml (KW_endmsg, msg); |
1179 | //TODO: allow longer messages |
933 | //TODO: allow longer messages |
1180 | if (strlen (op->msg) >= HUGE_BUF) |
934 | if (strlen (msg) >= HUGE_BUF) |
1181 | { |
935 | { |
1182 | LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
936 | LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg); |
1183 | op->msg = "ERROR, please report: string too long, winged.\n"; |
937 | msg = "ERROR, please report: string too long, winged.\n"; |
1184 | } |
938 | } |
1185 | break; |
939 | break; |
1186 | |
940 | |
1187 | case KW_lore: |
941 | case KW_lore: |
1188 | thawer.get_ml (KW_endlore, op->lore); |
942 | f.get_ml (KW_endlore, lore); |
1189 | //TODO: allow longer messages |
943 | //TODO: allow longer messages |
1190 | /* Just print a warning so we can be reasonably safe |
944 | /* Just print a warning so we can be reasonably safe |
1191 | * about not overflowing the buffer. |
945 | * about not overflowing the buffer. |
1192 | */ |
946 | */ |
1193 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
947 | if (strlen (lore) > (HUGE_BUF / 2)) |
1194 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
948 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
1195 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
949 | HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore); |
1196 | break; |
950 | break; |
1197 | |
951 | |
1198 | case KW_editable: |
952 | case KW_editable: |
1199 | case KW_editor_folder: |
953 | case KW_editor_folder: |
1200 | break; |
954 | break; |
1201 | |
955 | |
1202 | case KW_More: // uppercase alias |
|
|
1203 | case KW_more: |
|
|
1204 | /* We need to record that this is a multipart object, |
|
|
1205 | * so the calling function can glue things back together |
|
|
1206 | */ |
|
|
1207 | ismore = 1; |
|
|
1208 | break; |
|
|
1209 | |
|
|
1210 | case KW_end: |
956 | case KW_end: |
1211 | check_loaded_object (op); |
957 | check_loaded_object (this); |
1212 | |
958 | |
1213 | if (!arch_init) |
959 | if (!loading_arch) |
1214 | op->instantiate (); |
960 | instantiate (); |
1215 | |
961 | |
1216 | return ismore ? LL_MORE : LL_NORMAL; |
962 | f.next (); |
1217 | |
|
|
1218 | case KW_EOF: |
|
|
1219 | return LL_EOF; |
963 | return true; |
1220 | |
964 | |
1221 | case KW_ERROR: |
965 | case KW_ERROR: |
1222 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
966 | set_ob_key_value (this, f.kw_str, f.value, true); |
1223 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D |
967 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
1224 | break; |
968 | break; |
1225 | |
969 | |
1226 | default: |
970 | default: |
1227 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
971 | if (!f.parse_error ("object", name)) |
|
|
972 | return false; |
1228 | break; |
973 | break; |
1229 | } |
974 | } |
|
|
975 | |
|
|
976 | f.next (); |
1230 | } |
977 | } |
1231 | } |
978 | } |
1232 | |
979 | |
1233 | /* |
980 | object * |
1234 | * Loads an object from the given file-pointer. |
981 | object::read (object_thawer &f, maptile *map) |
1235 | * Variables will be read and parsed and patched into the object |
|
|
1236 | * until the string "end" is reached, or the end of the file. |
|
|
1237 | * |
|
|
1238 | * bufstat is used to determine various file attributes: |
|
|
1239 | * LO_REPATE (0): We are reading from the same buffer as the last call. |
|
|
1240 | * LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions |
|
|
1241 | * will also be reading from this (treasure file, artifacts.) |
|
|
1242 | * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should |
|
|
1243 | * be reset. |
|
|
1244 | * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) |
|
|
1245 | * |
|
|
1246 | */ |
|
|
1247 | int |
|
|
1248 | load_object (object_thawer &fp, object *op, int map_flags) |
|
|
1249 | { |
982 | { |
1250 | coroapi::cede_every (1000); // cede once in a while |
983 | assert (f.kw == KW_arch); |
1251 | |
984 | |
1252 | return parse_object (op, fp, map_flags); |
985 | archetype *arch = archetype::find (f.get_str ()); |
|
|
986 | |
|
|
987 | if (!arch) |
|
|
988 | { |
|
|
989 | LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); |
|
|
990 | arch = archetype::find ("earthwall"); |
|
|
991 | } |
|
|
992 | |
|
|
993 | assert (arch); //D maybe use exception handling of sorts? |
|
|
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; |
1253 | } |
1009 | } |
1254 | |
1010 | |
1255 | /* 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 |
1256 | * as appropriate in op. |
1012 | * as appropriate in op. |
1257 | * |
1013 | * |
… | |
… | |
1259 | * override values and in c_wiz to mutate values. |
1015 | * override values and in c_wiz to mutate values. |
1260 | */ |
1016 | */ |
1261 | int |
1017 | int |
1262 | set_variable (object *op, char *buf) |
1018 | set_variable (object *op, char *buf) |
1263 | { |
1019 | { |
1264 | object_thawer thawer (buf, (AV *)0); |
1020 | object_thawer f (buf, (AV *)0); |
1265 | |
1021 | |
1266 | return parse_object (op, thawer, 0); |
1022 | f.kw = KW_arch; // special hack so that parse_kv skips |
1267 | } |
1023 | return op->parse_kv (f); |
1268 | |
|
|
1269 | /* |
|
|
1270 | * Initialises the array of variable-names. Needed before any |
|
|
1271 | * objects can be loaded. Called by init_library(). |
|
|
1272 | */ |
|
|
1273 | |
|
|
1274 | void |
|
|
1275 | init_vars () |
|
|
1276 | { |
|
|
1277 | } |
1024 | } |
1278 | |
1025 | |
1279 | /* This returns a string of the integer movement type */ |
1026 | /* This returns a string of the integer movement type */ |
1280 | #if 0 |
1027 | #if 0 |
1281 | // unused function |
1028 | // unused function |
… | |
… | |
1326 | return retbuf + 1; |
1073 | return retbuf + 1; |
1327 | } |
1074 | } |
1328 | #endif |
1075 | #endif |
1329 | |
1076 | |
1330 | // compare *op against *tmp and output differences |
1077 | // compare *op against *tmp and output differences |
1331 | void |
1078 | static void |
1332 | put (object_freezer &f, object *op, object *tmp) |
1079 | write_diff (object_freezer &f, object *op, object *tmp) |
1333 | { |
1080 | { |
1334 | static const keyword resist_save[NROFATTACKS] = { |
1081 | static const keyword resist_save[NROFATTACKS] = { |
1335 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1082 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1336 | # include "attackinc.h" |
1083 | # include "attackinc.h" |
1337 | # undef def |
1084 | # undef def |
… | |
… | |
1508 | f.put (KW_msg, KW_endmsg, op->msg); |
1255 | f.put (KW_msg, KW_endmsg, op->msg); |
1509 | if (op->lore != tmp->lore) |
1256 | if (op->lore != tmp->lore) |
1510 | f.put (KW_lore, KW_endlore, op->lore); |
1257 | f.put (KW_lore, KW_endlore, op->lore); |
1511 | |
1258 | |
1512 | CMP_OUT (other_arch); |
1259 | CMP_OUT (other_arch); |
1513 | CMP_OUT (face); |
1260 | |
|
|
1261 | if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); |
1514 | |
1262 | |
1515 | if (op->animation_id != tmp->animation_id) |
1263 | if (op->animation_id != tmp->animation_id) |
1516 | if (op->animation_id) |
1264 | if (op->animation_id) |
1517 | { |
1265 | { |
1518 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1266 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
… | |
… | |
1566 | f.put (resist_save[i], op->resist[i]); |
1314 | f.put (resist_save[i], op->resist[i]); |
1567 | |
1315 | |
1568 | CMP_OUT (path_attuned); |
1316 | CMP_OUT (path_attuned); |
1569 | CMP_OUT (path_repelled); |
1317 | CMP_OUT (path_repelled); |
1570 | CMP_OUT (path_denied); |
1318 | CMP_OUT (path_denied); |
1571 | CMP_OUT (material); |
1319 | CMP_OUT2 (material, materials);//TODO: nuke |
1572 | CMP_OUT (materialname); |
1320 | CMP_OUT (materialname); |
1573 | CMP_OUT (value); |
1321 | CMP_OUT (value); |
1574 | CMP_OUT (carrying); |
1322 | CMP_OUT (carrying); |
1575 | CMP_OUT (weight); |
1323 | CMP_OUT (weight); |
1576 | CMP_OUT (invisible); |
1324 | CMP_OUT (invisible); |
… | |
… | |
1626 | /* |
1374 | /* |
1627 | * Dumps all variables in an object to a file. |
1375 | * Dumps all variables in an object to a file. |
1628 | * 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, |
1629 | * 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. |
1630 | */ |
1378 | */ |
1631 | void |
1379 | bool |
1632 | save_object (object_freezer &fp, object *op, int flag) |
1380 | object::write (object_freezer &f) |
1633 | { |
1381 | { |
1634 | /* 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 |
1635 | * still save it. |
1383 | * still save it. |
1636 | */ |
1384 | */ |
1637 | if (op->owner) |
1385 | if (owner) |
1638 | return; |
1386 | return true; |
1639 | |
1387 | |
1640 | /* If it is unpaid and we don't want to save those, just return. */ |
|
|
1641 | if (!(flag & 1) && op->flag [FLAG_UNPAID]) |
|
|
1642 | return; |
|
|
1643 | |
|
|
1644 | archetype *at = op->arch ? (archetype *)op->arch : empty_archetype; |
1388 | archetype *at = arch ? (archetype *)arch : empty_archetype; |
1645 | |
1389 | |
1646 | fp.put (KW_arch, at->name); |
1390 | f.put (KW_arch, at->name); |
1647 | put (fp, op, &at->clone); |
1391 | write_diff (f, this, &at->clone); |
1648 | |
1392 | |
1649 | /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ |
|
|
1650 | |
|
|
1651 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1393 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1652 | save_object (fp, tmp, flag); |
1394 | tmp->write (f); |
1653 | |
1395 | |
1654 | fp.put (op); |
1396 | f.put (this); |
1655 | fp.put (KW_end); |
1397 | f.put (KW_end); |
|
|
1398 | |
|
|
1399 | return true; |
1656 | } |
1400 | } |
1657 | |
1401 | |
|
|
1402 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1403 | |
|
|
1404 | bool load_resource_file (const char *filename) |
|
|
1405 | { |
|
|
1406 | object_thawer f (filename); |
|
|
1407 | |
|
|
1408 | f.next (); |
|
|
1409 | |
|
|
1410 | for (;;) |
|
|
1411 | { |
|
|
1412 | switch (f.kw) |
|
|
1413 | { |
|
|
1414 | case KW_region: |
|
|
1415 | if (!region::read (f)) |
|
|
1416 | return false; |
|
|
1417 | break; |
|
|
1418 | |
|
|
1419 | case KW_EOF: |
|
|
1420 | return true; |
|
|
1421 | |
|
|
1422 | default: |
|
|
1423 | if (!f.parse_error ("resource file")) |
|
|
1424 | return false; |
|
|
1425 | } |
|
|
1426 | |
|
|
1427 | f.next (); |
|
|
1428 | } |
|
|
1429 | } |
|
|
1430 | |