1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game for X-windows |
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 <sproto.h> |
31 | #include <sproto.h> |
|
|
32 | |
|
|
33 | ///////////////////////////////////////////////////////////////////////////// |
|
|
34 | |
|
|
35 | loader_base::~loader_base () |
|
|
36 | { |
|
|
37 | } |
|
|
38 | |
|
|
39 | // the base class warns about and skips everything |
|
|
40 | archetype * |
|
|
41 | loader_base::get_arch (const char *name) |
|
|
42 | { |
|
|
43 | LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of this type.\n", |
|
|
44 | filename, name); |
|
|
45 | |
|
|
46 | return new archetype; |
|
|
47 | } |
|
|
48 | |
|
|
49 | object * |
|
|
50 | loader_base::get_object (const char *name) |
|
|
51 | { |
|
|
52 | LOG (llevError, "%s: found object definition '%s', which is not allowed in files of this type.\n", |
|
|
53 | filename, name); |
|
|
54 | |
|
|
55 | return object::create (); |
|
|
56 | } |
|
|
57 | |
|
|
58 | player * |
|
|
59 | loader_base::get_player () |
|
|
60 | { |
|
|
61 | LOG (llevError, "%s: found player definition, which is not allowed in files of this type.\n", |
|
|
62 | filename); |
|
|
63 | |
|
|
64 | return player::create (); |
|
|
65 | } |
|
|
66 | |
|
|
67 | region * |
|
|
68 | loader_base::get_region (const char *name) |
|
|
69 | { |
|
|
70 | LOG (llevError, "%s: found region definition '%s', which is not allowed in files of this type.\n", |
|
|
71 | filename, name); |
|
|
72 | |
|
|
73 | return new region; |
|
|
74 | } |
|
|
75 | |
|
|
76 | facetile * |
|
|
77 | loader_base::get_face (const char *name) |
|
|
78 | { |
|
|
79 | LOG (llevError, "%s: found face definition '%s', which is not allowed in files of this type.\n", |
|
|
80 | filename, name); |
|
|
81 | |
|
|
82 | return new facetile; |
|
|
83 | } |
|
|
84 | |
|
|
85 | treasurelist * |
|
|
86 | loader_base::get_treasure (const char *name, bool one) |
|
|
87 | { |
|
|
88 | LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of this type.\n", |
|
|
89 | filename, name); |
|
|
90 | |
|
|
91 | return new treasurelist;//D |
|
|
92 | } |
|
|
93 | |
|
|
94 | animation * |
|
|
95 | loader_base::get_animation (const char *name) |
|
|
96 | { |
|
|
97 | LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of this type.\n", |
|
|
98 | filename, name); |
|
|
99 | |
|
|
100 | return new animation; |
|
|
101 | } |
|
|
102 | |
|
|
103 | void |
|
|
104 | loader_base::put_arch (archetype *arch) |
|
|
105 | { |
|
|
106 | delete arch; |
|
|
107 | } |
|
|
108 | |
|
|
109 | void |
|
|
110 | loader_base::put_object (object *op) |
|
|
111 | { |
|
|
112 | op->destroy (); |
|
|
113 | } |
|
|
114 | |
|
|
115 | void |
|
|
116 | loader_base::put_player (player *pl) |
|
|
117 | { |
|
|
118 | delete pl; |
|
|
119 | } |
|
|
120 | |
|
|
121 | void |
|
|
122 | loader_base::put_region (region *region) |
|
|
123 | { |
|
|
124 | delete region; |
|
|
125 | } |
|
|
126 | |
|
|
127 | void |
|
|
128 | loader_base::put_face (facetile *face) |
|
|
129 | { |
|
|
130 | delete face; |
|
|
131 | } |
|
|
132 | |
|
|
133 | void |
|
|
134 | loader_base::put_treasure (treasurelist *treasure) |
|
|
135 | { |
|
|
136 | delete treasure; |
|
|
137 | } |
|
|
138 | |
|
|
139 | void |
|
|
140 | loader_base::put_animation (animation *anim) |
|
|
141 | { |
|
|
142 | delete anim; |
|
|
143 | } |
|
|
144 | |
|
|
145 | ///////////////////////////////////////////////////////////////////////////// |
|
|
146 | |
|
|
147 | bool loader_base::parse (object_thawer &thawer) |
|
|
148 | { |
|
|
149 | for (;;) |
|
|
150 | { |
|
|
151 | keyword kw = thawer.get_kv (); |
|
|
152 | |
|
|
153 | switch (kw) |
|
|
154 | { |
|
|
155 | case KW_region: |
|
|
156 | { |
|
|
157 | region *rgn = get_region (thawer.get_str ()); |
|
|
158 | |
|
|
159 | if (!parse_region (thawer, rgn)) |
|
|
160 | { |
|
|
161 | delete rgn; |
|
|
162 | return false; |
|
|
163 | } |
|
|
164 | |
|
|
165 | put_region (rgn); |
|
|
166 | } |
|
|
167 | break; |
|
|
168 | |
|
|
169 | case KW_EOF: |
|
|
170 | return true; |
|
|
171 | |
|
|
172 | default: |
|
|
173 | if (!thawer.parse_error (kw, "resource file")) |
|
|
174 | return false; |
|
|
175 | } |
|
|
176 | } |
|
|
177 | } |
|
|
178 | |
|
|
179 | bool loader_base::load (const char *filename) |
|
|
180 | { |
|
|
181 | this->filename = filename; |
|
|
182 | |
|
|
183 | object_thawer fp (filename); |
|
|
184 | |
|
|
185 | if (!fp) |
|
|
186 | return false; |
|
|
187 | |
|
|
188 | return parse (fp); |
|
|
189 | } |
|
|
190 | |
|
|
191 | ///////////////////////////////////////////////////////////////////////////// |
32 | |
192 | |
33 | /* Maps the MOVE_* values to names */ |
193 | /* Maps the MOVE_* values to names */ |
34 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
194 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
35 | |
195 | |
36 | /* This table is only necessary to convert objects that existed before the |
196 | /* This table is only necessary to convert objects that existed before the |
… | |
… | |
261 | * to check for objects to make sure there are no common errors. |
421 | * to check for objects to make sure there are no common errors. |
262 | */ |
422 | */ |
263 | static void |
423 | static void |
264 | check_loaded_object (object *op) |
424 | check_loaded_object (object *op) |
265 | { |
425 | { |
266 | int ip; |
|
|
267 | |
|
|
268 | /* We do some specialized handling to handle legacy cases of name_pl. |
426 | /* We do some specialised handling to handle legacy cases of name_pl. |
269 | * If the object doesn't have a name_pl, we just use the object name - |
427 | * If the object doesn't have a name_pl, we just use the object name - |
270 | * this isn't perfect (things won't be properly pluralized), but works to |
428 | * this isn't perfect (things won't be properly pluralised), but works to |
271 | * that degree (5 heart is still quite understandable). But the case we |
429 | * that degree (5 heart is still quite understandable). But the case we |
272 | * also have to catch is if this object is not using the normal name for |
430 | * also have to catch is if this object is not using the normal name for |
273 | * the object. In that case, we also want to use the loaded name. |
431 | * the object. In that case, we also want to use the loaded name. |
274 | * Otherwise, what happens is that the the plural name will lose |
432 | * Otherwise, what happens is that the the plural name will lose |
275 | * information (appear as just 'hearts' and not 'goblins heart') |
433 | * information (appear as just 'hearts' and not 'goblins heart') |
276 | */ |
434 | */ |
277 | if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) |
435 | if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) |
278 | op->name_pl = NULL; |
436 | op->name_pl = 0; |
279 | |
437 | |
280 | if (!op->name_pl) |
438 | if (!op->name_pl) |
281 | op->name_pl = op->name; |
439 | op->name_pl = op->name; |
282 | |
440 | |
283 | /* objects now have a materialname. try to patch it in */ |
441 | /* objects now have a materialname. try to patch it in */ |
… | |
… | |
286 | if (op->map != NULL) |
444 | if (op->map != NULL) |
287 | set_materialname (op, op->map->difficulty, NULL); |
445 | set_materialname (op, op->map->difficulty, NULL); |
288 | else |
446 | else |
289 | set_materialname (op, 5, NULL); |
447 | set_materialname (op, 5, NULL); |
290 | } |
448 | } |
|
|
449 | |
291 | /* only do these when program is first run - a bit |
450 | /* only do these when program is first run - a bit |
292 | * excessive to do this at every run - most of this is |
451 | * excessive to do this at every run - most of this is |
293 | * really just to catch any errors - program will still run, but |
452 | * really just to catch any errors - program will still run, but |
294 | * not in the ideal fashion. |
453 | * not in the ideal fashion. |
295 | */ |
454 | */ |
296 | if ((op->type == WEAPON || op->type == BOW) && arch_init) |
455 | if ((op->type == WEAPON || op->type == BOW) && arch_init) |
297 | { |
456 | { |
298 | if (!op->skill) |
457 | if (!op->skill) |
299 | { |
|
|
300 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
458 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
301 | } |
|
|
302 | else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || |
459 | else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || |
303 | (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) |
460 | (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) |
304 | { |
|
|
305 | LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); |
461 | LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); |
306 | } |
|
|
307 | } |
462 | } |
308 | |
463 | |
309 | /* We changed last_heal to gen_sp_armour, which is what it |
464 | /* We changed last_heal to gen_sp_armour, which is what it |
310 | * really does for many objects. Need to catch any in maps |
465 | * really does for many objects. Need to catch any in maps |
311 | * that may have an old value. |
466 | * that may have an old value. |
312 | */ |
467 | */ |
313 | if ((op->type == WEAPON) || |
468 | if (op->type == WEAPON |
314 | (op->type == ARMOUR) || (op->type == HELMET) || |
469 | || op->type == ARMOUR || op->type == HELMET |
315 | (op->type == SHIELD) || (op->type == RING) || |
470 | || op->type == SHIELD || op->type == RING |
316 | (op->type == BOOTS) || (op->type == GLOVES) || |
471 | || op->type == BOOTS || op->type == GLOVES |
317 | (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) |
472 | || op->type == AMULET || op->type == GIRDLE |
|
|
473 | || op->type == BRACERS || op->type == CLOAK) |
318 | { |
474 | { |
319 | if (op->last_heal) |
475 | if (op->last_heal) |
320 | { |
476 | { |
321 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
477 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
322 | op->gen_sp_armour = op->last_heal; |
478 | op->gen_sp_armour = op->last_heal; |
323 | op->last_heal = 0; |
479 | op->last_heal = 0; |
324 | } |
480 | } |
325 | if (editor) |
481 | |
326 | ip = 0; |
|
|
327 | else |
|
|
328 | ip = calc_item_power (op, 0); |
482 | int ip = calc_item_power (op, 0); |
|
|
483 | |
329 | /* Legacy objects from before item power was in the game */ |
484 | /* Legacy objects from before item power was in the game */ |
330 | if (!op->item_power && ip) |
485 | if (!op->item_power && ip) |
331 | { |
486 | { |
332 | if (ip > 3) |
487 | if (ip > 3) |
333 | { |
|
|
334 | LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); |
488 | LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); |
335 | } |
489 | |
336 | op->item_power = ip; |
490 | op->item_power = ip; |
337 | } |
491 | } |
|
|
492 | |
338 | /* Check for possibly bogus values. Has to meet both these criteria - |
493 | /* Check for possibly bogus values. Has to meet both these criteria - |
339 | * something that has item_power 1 is probably just fine if our calculated |
494 | * something that has item_power 1 is probably just fine if our calculated |
340 | * value is 1 or 2 - these values are small enough that hard to be precise. |
495 | * value is 1 or 2 - these values are small enough that hard to be precise. |
341 | * similarly, it item_power is 0, the first check will always pass, |
496 | * similarly, it item_power is 0, the first check will always pass, |
342 | * but not the second one. |
497 | * but not the second one. |
343 | */ |
498 | */ |
344 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
499 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
345 | { |
|
|
346 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); |
500 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); |
347 | } |
|
|
348 | |
|
|
349 | } |
501 | } |
|
|
502 | |
350 | /* Old spellcasting object - need to load in the appropiate object */ |
503 | /* Old spellcasting object - need to load in the appropiate object */ |
351 | if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || |
504 | if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || |
352 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
505 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
353 | ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) |
506 | ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) |
354 | { |
507 | { |
355 | object *tmp; |
|
|
356 | |
|
|
357 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
508 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
358 | * in that spell was stored in sp. |
509 | * in that spell was stored in sp. |
359 | */ |
510 | */ |
360 | tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); |
511 | object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); |
361 | insert_ob_in_ob (tmp, op); |
512 | insert_ob_in_ob (tmp, op); |
362 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
513 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
363 | } |
514 | } |
|
|
515 | |
364 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
516 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
365 | |
|
|
366 | if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) |
517 | if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) |
367 | { |
518 | { |
368 | object *tmp; |
|
|
369 | |
|
|
370 | tmp = get_archetype_by_object_name (op->slaying); |
519 | object *tmp = get_archetype_by_object_name (op->slaying); |
371 | insert_ob_in_ob (tmp, op); |
520 | insert_ob_in_ob (tmp, op); |
372 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
521 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
373 | /* without this, value is all screwed up */ |
522 | /* without this, value is all screwed up */ |
374 | op->value = op->arch->clone.value * op->inv->value; |
523 | op->value = op->arch->clone.value * op->inv->value; |
375 | } |
524 | } |
376 | |
525 | |
377 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
526 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
378 | { |
527 | { |
379 | if (op->stats.hp > op->stats.maxhp) |
528 | if (op->stats.hp > op->stats.maxhp) |
|
|
529 | { |
380 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); |
530 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); |
|
|
531 | op->stats.maxhp = op->stats.hp; |
|
|
532 | } |
381 | |
533 | |
382 | /* The archs just need to be updated for this */ |
534 | /* The archs just need to be updated for this */ |
383 | if (op->move_type == 0) |
535 | if (op->move_type == 0) |
384 | op->move_type = MOVE_WALK; |
536 | op->move_type = MOVE_WALK; |
385 | } |
537 | } |
… | |
… | |
408 | { |
560 | { |
409 | op->move_type = MOVE_ALL; |
561 | op->move_type = MOVE_ALL; |
410 | op->stats.maxhp = 0; |
562 | op->stats.maxhp = 0; |
411 | } |
563 | } |
412 | else |
564 | else |
413 | { |
|
|
414 | op->move_type = MOVE_WALK; |
565 | op->move_type = MOVE_WALK; |
415 | } |
|
|
416 | } |
566 | } |
417 | } |
567 | } |
418 | |
568 | |
419 | } |
569 | } |
420 | |
570 | |
… | |
… | |
487 | SET_FLAG (op, flag); \ |
637 | SET_FLAG (op, flag); \ |
488 | else \ |
638 | else \ |
489 | CLEAR_FLAG (op, flag) \ |
639 | CLEAR_FLAG (op, flag) \ |
490 | |
640 | |
491 | int |
641 | int |
492 | parse_object (object *op, object_thawer & thawer, int map_flags) |
642 | parse_object (object *op, object_thawer &thawer, int map_flags) |
493 | { |
643 | { |
494 | bool ismore = 0; |
644 | bool ismore = 0; |
495 | object *op_inv = op->inv; |
645 | object *op_inv = op->inv; |
496 | |
646 | |
497 | for (;;) |
647 | for (;;) |
… | |
… | |
502 | { |
652 | { |
503 | case KW_Object: // uppercase alias |
653 | case KW_Object: // uppercase alias |
504 | case KW_object: |
654 | case KW_object: |
505 | thawer.get (op->name); |
655 | thawer.get (op->name); |
506 | |
656 | |
507 | if (op->arch != NULL) |
657 | if (op->arch) |
508 | op->arch->name = op->name; |
658 | op->arch->name = op->name; |
509 | |
659 | |
510 | break; |
660 | break; |
511 | |
661 | |
512 | case KW_uuid: |
662 | case KW_uuid: |
… | |
… | |
551 | */ |
701 | */ |
552 | archetype *arch = archetype::find (str); |
702 | archetype *arch = archetype::find (str); |
553 | |
703 | |
554 | object *tmp; |
704 | object *tmp; |
555 | |
705 | |
556 | if (arch != NULL) |
706 | if (arch) |
557 | tmp = arch_to_object (arch); |
707 | tmp = arch_to_object (arch); |
558 | else |
708 | else |
559 | { |
709 | { |
560 | tmp = object::create (); |
710 | tmp = object::create (); |
561 | /* record the name of the broken object */ |
711 | /* record the name of the broken object */ |
|
|
712 | //TODO: but do not log??? |
562 | tmp->name = str; |
713 | tmp->name = str; |
563 | } |
714 | } |
|
|
715 | |
|
|
716 | // decativate the object we, as we are still going |
|
|
717 | // to read the speed value. Objects should be activated |
|
|
718 | // when the map, object or player is completly loaded. |
|
|
719 | tmp->deactivate (); |
564 | |
720 | |
565 | parse_object (tmp, thawer, map_flags); |
721 | parse_object (tmp, thawer, map_flags); |
566 | |
722 | |
567 | if (tmp->arch) |
723 | if (tmp->arch) |
568 | { |
724 | { |
… | |
… | |
601 | { |
757 | { |
602 | /* This is the actual archetype definition then */ |
758 | /* This is the actual archetype definition then */ |
603 | op->arch = archetype::find (str); |
759 | op->arch = archetype::find (str); |
604 | |
760 | |
605 | if (op->arch) |
761 | if (op->arch) |
|
|
762 | { |
606 | op->arch->clone.copy_to (op); |
763 | op->arch->clone.copy_to (op); |
|
|
764 | // copy_to activates, this should be fixed properly |
|
|
765 | op->deactivate (); |
|
|
766 | } |
607 | else if (!arch_init) |
767 | else if (!arch_init) |
608 | /* record the name of the broken object */ |
768 | /* record the name of the broken object */ |
609 | op->name = str; |
769 | op->name = str; |
610 | } |
770 | } |
611 | } |
771 | } |
… | |
… | |
615 | op->other_arch = archetype::find (thawer.get_str ()); |
775 | op->other_arch = archetype::find (thawer.get_str ()); |
616 | break; |
776 | break; |
617 | |
777 | |
618 | case KW_animation: |
778 | case KW_animation: |
619 | { |
779 | { |
|
|
780 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
781 | op->animation_id = 0; |
|
|
782 | |
620 | const char *str = thawer.get_str (); |
783 | const char *str = thawer.get_str (); |
621 | |
|
|
622 | if (!str) |
|
|
623 | { |
|
|
624 | op->animation_id = 0; |
|
|
625 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
626 | } |
|
|
627 | else |
|
|
628 | { |
|
|
629 | op->animation_id = find_animation (str); |
784 | if (str && (op->animation_id = find_animation (str))) |
630 | SET_FLAG (op, FLAG_ANIMATE); |
785 | SET_FLAG (op, FLAG_ANIMATE); |
631 | } |
|
|
632 | } |
786 | } |
633 | |
|
|
634 | break; |
787 | break; |
635 | |
788 | |
636 | case KW_last_heal: thawer.get (op->last_heal); break; |
789 | case KW_last_heal: thawer.get (op->last_heal); break; |
637 | case KW_last_sp: thawer.get (op->last_sp); break; |
790 | case KW_last_sp: thawer.get (op->last_sp); break; |
638 | case KW_last_grace: thawer.get (op->last_grace); break; |
791 | case KW_last_grace: thawer.get (op->last_grace); break; |
… | |
… | |
641 | |
794 | |
642 | case KW_speed: |
795 | case KW_speed: |
643 | thawer.get (op->speed); |
796 | thawer.get (op->speed); |
644 | |
797 | |
645 | //TODO: maybe do in check_object |
798 | //TODO: maybe do in check_object |
646 | if (!(map_flags & MAP_STYLE)) |
799 | // removed check for style maps |
647 | { |
|
|
648 | if (op->speed < 0) |
800 | if (op->speed < 0) |
649 | op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; |
801 | op->speed_left = op->speed_left - rndm (); |
650 | |
|
|
651 | update_ob_speed (op); |
|
|
652 | } |
|
|
653 | |
802 | |
654 | break; |
803 | break; |
655 | |
804 | |
656 | case KW_slow_move: |
805 | case KW_slow_move: |
657 | op->move_slow |= MOVE_WALK; |
806 | op->move_slow |= MOVE_WALK; |
… | |
… | |
707 | case KW_path_denied: thawer.get (op->path_denied); break; |
856 | case KW_path_denied: thawer.get (op->path_denied); break; |
708 | case KW_invisible: thawer.get (op->invisible); break; |
857 | case KW_invisible: thawer.get (op->invisible); break; |
709 | case KW_magic: thawer.get (op->magic); break; |
858 | case KW_magic: thawer.get (op->magic); break; |
710 | case KW_state: thawer.get (op->state); break; |
859 | case KW_state: thawer.get (op->state); break; |
711 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
860 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
712 | case KW_material: thawer.get (op->material); break; |
861 | case KW_material: thawer.get (op->materials); break; //TODO: nuke |
713 | case KW_materialname: thawer.get (op->materialname); break; |
862 | case KW_materialname: thawer.get (op->materialname); break; |
714 | |
863 | |
715 | /* These are the new values */ |
864 | /* These are the new values */ |
716 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
865 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
717 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
866 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
… | |
… | |
811 | CLEAR_FLAG (op, FLAG_WIZCAST); |
960 | CLEAR_FLAG (op, FLAG_WIZCAST); |
812 | } |
961 | } |
813 | break; |
962 | break; |
814 | |
963 | |
815 | case KW_friendly: |
964 | case KW_friendly: |
816 | GET_FLAG (op, FLAG_FRIENDLY); |
965 | if (thawer.get_sint32 ()) |
817 | //TODO: move to check_object or so |
966 | if (op->type != PLAYER) |
818 | if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY)) |
|
|
819 | add_friendly_object (op); |
967 | add_friendly_object (op); |
|
|
968 | |
820 | break; |
969 | break; |
821 | |
970 | |
822 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
971 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
823 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
972 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
824 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
973 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
825 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
974 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
|
|
975 | case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break; |
826 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
976 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
827 | case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; |
977 | case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; |
828 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
978 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
829 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
979 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
830 | case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break; |
|
|
831 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
980 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
832 | case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; |
981 | case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; |
833 | case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; |
982 | case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; |
834 | case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; |
983 | case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; |
835 | case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; |
984 | case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; |
… | |
… | |
902 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
1051 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
903 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
1052 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
904 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
1053 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
905 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
1054 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
906 | case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; |
1055 | case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; |
|
|
1056 | case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break; |
907 | |
1057 | |
908 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
1058 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
909 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
1059 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
910 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
1060 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
911 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
1061 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
… | |
… | |
978 | add_button_link (op, op->map, thawer.get_sint32 ()); |
1128 | add_button_link (op, op->map, thawer.get_sint32 ()); |
979 | break; |
1129 | break; |
980 | |
1130 | |
981 | case KW_randomitems: |
1131 | case KW_randomitems: |
982 | op->randomitems = find_treasurelist (thawer.get_str ()); |
1132 | op->randomitems = find_treasurelist (thawer.get_str ()); |
|
|
1133 | //if (!op->randomitems) |
|
|
1134 | // LOG (llevError, "%s uses unknown randomitems '%s'.\n", op->debug_desc (), thawer.get_str ()); |
983 | break; |
1135 | break; |
984 | |
1136 | |
985 | case KW_msg: |
1137 | case KW_msg: |
986 | { |
|
|
987 | thawer.get_ml (KW_endmsg, op->msg); |
1138 | thawer.get_ml (KW_endmsg, op->msg); |
988 | //TODO: allow longer messages |
1139 | //TODO: allow longer messages |
989 | if (strlen (op->msg) >= HUGE_BUF) |
1140 | if (strlen (op->msg) >= HUGE_BUF) |
990 | { |
1141 | { |
991 | LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
1142 | LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
992 | op->msg = "ERROR, please report: string too long, winged.\n"; |
1143 | op->msg = "ERROR, please report: string too long, winged.\n"; |
993 | } |
1144 | } |
994 | } |
|
|
995 | break; |
1145 | break; |
996 | |
1146 | |
997 | case KW_lore: |
1147 | case KW_lore: |
998 | { |
|
|
999 | shstr msgbuf; |
|
|
1000 | |
|
|
1001 | thawer.get_ml (KW_endlore, op->lore); |
1148 | thawer.get_ml (KW_endlore, op->lore); |
1002 | //TODO: allow longer messages |
1149 | //TODO: allow longer messages |
1003 | /* Just print a warning so we can be reasonably safe |
1150 | /* Just print a warning so we can be reasonably safe |
1004 | * about not overflowing the buffer. |
1151 | * about not overflowing the buffer. |
1005 | */ |
1152 | */ |
1006 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1153 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1007 | LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
1154 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
1008 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1155 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1009 | } |
|
|
1010 | break; |
1156 | break; |
1011 | |
1157 | |
1012 | case KW_editable: |
1158 | case KW_editable: |
1013 | case KW_editor_folder: |
1159 | case KW_editor_folder: |
1014 | break; |
1160 | break; |
… | |
… | |
1031 | |
1177 | |
1032 | case KW_EOF: |
1178 | case KW_EOF: |
1033 | return LL_EOF; |
1179 | return LL_EOF; |
1034 | |
1180 | |
1035 | case KW_ERROR: |
1181 | case KW_ERROR: |
1036 | set_ob_key_value (op, thawer.line, thawer.last_value, true); |
1182 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
1037 | //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D |
1183 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D |
1038 | |
|
|
1039 | //TODO: skip line, ugly, factor parsing better |
|
|
1040 | if (thawer.last_value) |
|
|
1041 | thawer.line = thawer.last_value; |
|
|
1042 | |
|
|
1043 | thawer.line += strlen (thawer.line) + 1; |
|
|
1044 | |
|
|
1045 | break; |
1184 | break; |
1046 | |
1185 | |
1047 | default: |
1186 | default: |
1048 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
1187 | if (!thawer.parse_error (kw, "object", op->name)) |
|
|
1188 | return false; |
1049 | break; |
1189 | break; |
1050 | } |
1190 | } |
1051 | } |
1191 | } |
1052 | } |
1192 | } |
1053 | |
1193 | |
… | |
… | |
1063 | * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should |
1203 | * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should |
1064 | * be reset. |
1204 | * be reset. |
1065 | * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) |
1205 | * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) |
1066 | * |
1206 | * |
1067 | */ |
1207 | */ |
1068 | |
|
|
1069 | int |
1208 | int |
1070 | load_object (object_thawer & fp, object *op, int map_flags) |
1209 | load_object (object_thawer &fp, object *op, int map_flags) |
1071 | { |
1210 | { |
|
|
1211 | coroapi::cede_every (1000); // cede once in a while |
|
|
1212 | |
1072 | return parse_object (op, fp, map_flags); |
1213 | return parse_object (op, fp, map_flags); |
1073 | } |
1214 | } |
1074 | |
|
|
1075 | |
1215 | |
1076 | /* This takes a buffer, scans it for variables, and sets those variables |
1216 | /* This takes a buffer, scans it for variables, and sets those variables |
1077 | * as appropriate in op. |
1217 | * as appropriate in op. |
1078 | * |
1218 | * |
1079 | * This function appears to be used in only 2 places - in crossedit to |
1219 | * This function appears to be used in only 2 places - in crossedit to |
… | |
… | |
1182 | KW_monster, |
1322 | KW_monster, |
1183 | KW_friendly, |
1323 | KW_friendly, |
1184 | KW_generator, |
1324 | KW_generator, |
1185 | KW_is_thrown, |
1325 | KW_is_thrown, |
1186 | KW_auto_apply, |
1326 | KW_auto_apply, |
1187 | KW_treasure, |
1327 | KW_NULL, // was KW_treasure |
1188 | KW_player_sold, |
1328 | KW_player_sold, |
1189 | /* 20 */ |
1329 | /* 20 */ |
1190 | KW_see_invisible, |
1330 | KW_see_invisible, |
1191 | KW_can_roll, |
1331 | KW_can_roll, |
1192 | KW_overlay_floor, |
1332 | KW_overlay_floor, |
… | |
… | |
1275 | KW_berserk, |
1415 | KW_berserk, |
1276 | KW_neutral, |
1416 | KW_neutral, |
1277 | /* 100 */ |
1417 | /* 100 */ |
1278 | KW_no_attack, |
1418 | KW_no_attack, |
1279 | KW_no_damage, |
1419 | KW_no_damage, |
1280 | KW_NULL, |
1420 | KW_obj_original, |
1281 | KW_NULL, |
1421 | KW_NULL, |
1282 | KW_activate_on_push, |
1422 | KW_activate_on_push, |
1283 | KW_activate_on_release, |
1423 | KW_activate_on_release, |
1284 | KW_is_water, |
1424 | KW_is_water, |
1285 | KW_use_content_on_gen, |
1425 | KW_use_content_on_gen, |
1286 | KW_NULL, |
1426 | KW_NULL, |
1287 | KW_is_buildable, |
1427 | KW_is_buildable, |
1288 | /* 110 */ |
1428 | /* 110 */ |
|
|
1429 | KW_destroy_on_death, |
|
|
1430 | KW_NULL, |
1289 | }; |
1431 | }; |
1290 | |
1432 | |
1291 | int i; |
1433 | int i; |
1292 | |
1434 | |
1293 | /* This saves the key/value lists. We do it first so that any |
1435 | /* This saves the key/value lists. We do it first so that any |
1294 | * keys that match field names will be overwritten by the loader. |
1436 | * keys that match field names will be overwritten by the loader. |
1295 | */ |
1437 | */ |
1296 | for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) |
1438 | for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) |
1297 | { |
1439 | { |
1298 | /* Find the field in the opposing member. */ |
1440 | /* Find the field in the opposing member. */ |
1299 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
1441 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
1300 | |
1442 | |
1301 | /* If there's no partnering field, or it's got a different value, save our field. */ |
1443 | /* If there's no partnering field, or it's got a different value, save our field. */ |
… | |
… | |
1385 | f.put (resist_save[i], op->resist[i]); |
1527 | f.put (resist_save[i], op->resist[i]); |
1386 | |
1528 | |
1387 | CMP_OUT (path_attuned); |
1529 | CMP_OUT (path_attuned); |
1388 | CMP_OUT (path_repelled); |
1530 | CMP_OUT (path_repelled); |
1389 | CMP_OUT (path_denied); |
1531 | CMP_OUT (path_denied); |
1390 | CMP_OUT (material); |
1532 | CMP_OUT2 (material, materials);//TODO: nuke |
1391 | CMP_OUT (materialname); |
1533 | CMP_OUT (materialname); |
1392 | CMP_OUT (value); |
1534 | CMP_OUT (value); |
1393 | CMP_OUT (carrying); |
1535 | CMP_OUT (carrying); |
1394 | CMP_OUT (weight); |
1536 | CMP_OUT (weight); |
1395 | CMP_OUT (invisible); |
1537 | CMP_OUT (invisible); |
… | |
… | |
1429 | CMP_OUT (move_on); |
1571 | CMP_OUT (move_on); |
1430 | CMP_OUT (move_off); |
1572 | CMP_OUT (move_off); |
1431 | CMP_OUT (move_slow); |
1573 | CMP_OUT (move_slow); |
1432 | CMP_OUT (move_slow_penalty); |
1574 | CMP_OUT (move_slow_penalty); |
1433 | |
1575 | |
1434 | if (op->flags != tmp->flags) |
1576 | if (op->flag != tmp->flag) |
1435 | for (i = 0; i <= NUM_FLAGS; i++) |
1577 | for (i = 0; i <= NUM_FLAGS; i++) |
1436 | if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) |
1578 | if (flag_names [i] && op->flag [i] != tmp->flag [i]) |
1437 | f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); |
1579 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1438 | |
1580 | |
1439 | /* Save body locations */ |
1581 | /* Save body locations */ |
1440 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1582 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1441 | if (op->body_info[i] != tmp->body_info[i]) |
1583 | if (op->body_info[i] != tmp->body_info[i]) |
1442 | f.put (body_locations[i].save_name, op->body_info[i]); |
1584 | f.put (body_locations[i].save_name, op->body_info[i]); |
… | |
… | |
1444 | |
1586 | |
1445 | /* |
1587 | /* |
1446 | * Dumps all variables in an object to a file. |
1588 | * Dumps all variables in an object to a file. |
1447 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1589 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1448 | * the only place this is not set is when saving the player. |
1590 | * the only place this is not set is when saving the player. |
1449 | * If bit 1 of flag is set, don't remove the object after save. As of now, |
|
|
1450 | * all of the callers are setting this. |
|
|
1451 | */ |
1591 | */ |
1452 | |
|
|
1453 | void |
1592 | void |
1454 | save_object (object_freezer & fp, object *op, int flag) |
1593 | save_object (object_freezer &fp, object *op, int flag) |
1455 | { |
1594 | { |
1456 | archetype *at; |
|
|
1457 | object *tmp, *old; |
|
|
1458 | |
|
|
1459 | /* Even if the object does have an owner, it would seem that we should |
1595 | /* Even if the object does have an owner, it would seem that we should |
1460 | * still save it. |
1596 | * still save it. |
1461 | */ |
1597 | */ |
1462 | if (op->owner) |
1598 | if (op->owner) |
1463 | return; |
1599 | return; |
1464 | |
1600 | |
1465 | /* If it is unpaid and we don't want to save those, just return. */ |
1601 | /* If it is unpaid and we don't want to save those, just return. */ |
1466 | if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) |
1602 | if (!(flag & 1) && op->flag [FLAG_UNPAID]) |
1467 | return; |
1603 | return; |
1468 | |
1604 | |
1469 | if ((at = op->arch) == NULL) |
1605 | archetype *at = op->arch ? (archetype *)op->arch : empty_archetype; |
1470 | at = empty_archetype; |
|
|
1471 | |
1606 | |
1472 | fp.put (KW_arch, at->name); |
1607 | fp.put (KW_arch, at->name); |
1473 | |
|
|
1474 | put (fp, op, &at->clone); |
1608 | put (fp, op, &at->clone); |
1475 | |
1609 | |
1476 | /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ |
1610 | /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ |
1477 | |
1611 | |
1478 | old = NULL; |
|
|
1479 | |
|
|
1480 | if (flag & 2) |
|
|
1481 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1612 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1482 | save_object (fp, tmp, flag); |
1613 | save_object (fp, tmp, flag); |
1483 | else |
|
|
1484 | /* Slightly different logic because tmp/op will be removed by |
|
|
1485 | * the save_object we call. So we just keep looking at op->inv |
|
|
1486 | * until there is nothing left. In theory, the variable old |
|
|
1487 | * should not be needed, as recursive loops shouldn't happen. |
|
|
1488 | */ |
|
|
1489 | while ((tmp = op->inv) != NULL) |
|
|
1490 | { |
|
|
1491 | if (old == tmp) |
|
|
1492 | { |
|
|
1493 | LOG (llevError, " Recursive loop in inventory\n"); |
|
|
1494 | break; |
|
|
1495 | } |
|
|
1496 | |
|
|
1497 | save_object (fp, tmp, flag); |
|
|
1498 | old = tmp; |
|
|
1499 | } |
|
|
1500 | |
|
|
1501 | if (!(flag & 2)) |
|
|
1502 | op->destroy (); |
|
|
1503 | |
1614 | |
1504 | fp.put (op); |
1615 | fp.put (op); |
1505 | fprintf (fp, "end\n"); |
1616 | fp.put (KW_end); |
1506 | } |
1617 | } |
1507 | |
1618 | |