ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.33 by root, Sun Dec 31 17:17:22 2006 UTC vs.
Revision 1.57 by root, Sat Feb 10 01:52:25 2007 UTC

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
35loader_base::~loader_base ()
36{
37}
38
39// the base class warns about and skips everything
40archetype *
41loader_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
49object *
50loader_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
58player *
59loader_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
67region *
68loader_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
76facetile *
77loader_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
85treasurelist *
86loader_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
94animation *
95loader_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
103void
104loader_base::put_arch (archetype *arch)
105{
106 delete arch;
107}
108
109void
110loader_base::put_object (object *op)
111{
112 op->destroy ();
113}
114
115void
116loader_base::put_player (player *pl)
117{
118 delete pl;
119}
120
121void
122loader_base::put_region (region *region)
123{
124 delete region;
125}
126
127void
128loader_base::put_face (facetile *face)
129{
130 delete face;
131}
132
133void
134loader_base::put_treasure (treasurelist *treasure)
135{
136 delete treasure;
137}
138
139void
140loader_base::put_animation (animation *anim)
141{
142 delete anim;
143}
144
145/////////////////////////////////////////////////////////////////////////////
146
147bool 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
179bool 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 */
34static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 194static 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 */
263static void 423static void
264check_loaded_object (object *op) 424check_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
… …
540 case KW_slaying: thawer.get_ornull (op->slaying); break; 690 case KW_slaying: thawer.get_ornull (op->slaying); break;
541 691
542 case KW_arch: 692 case KW_arch:
543 { 693 {
544 const char *str = thawer.get_str (); 694 const char *str = thawer.get_str ();
545 fprintf (stderr, "arch %s\n", str);//D
546 695
547 if (op->arch) 696 if (op->arch)
548 { 697 {
549 /* If op->arch has been set, then this new object 698 /* If op->arch has been set, then this new object
550 * must be part of the inventory. So process 699 * must be part of the inventory. So process
… …
558 tmp = arch_to_object (arch); 707 tmp = arch_to_object (arch);
559 else 708 else
560 { 709 {
561 tmp = object::create (); 710 tmp = object::create ();
562 /* record the name of the broken object */ 711 /* record the name of the broken object */
712 //TODO: but do not log???
563 tmp->name = str; 713 tmp->name = str;
564 } 714 }
565 715
566 // decativate the object we, as we are still going 716 // decativate the object we, as we are still going
567 // to read the speed value. Objects should be activated 717 // to read the speed value. Objects should be activated
… …
625 op->other_arch = archetype::find (thawer.get_str ()); 775 op->other_arch = archetype::find (thawer.get_str ());
626 break; 776 break;
627 777
628 case KW_animation: 778 case KW_animation:
629 { 779 {
780 CLEAR_FLAG (op, FLAG_ANIMATE);
781 op->animation_id = 0;
782
630 const char *str = thawer.get_str (); 783 const char *str = thawer.get_str ();
631
632 if (!str)
633 {
634 op->animation_id = 0;
635 CLEAR_FLAG (op, FLAG_ANIMATE);
636 }
637 else
638 {
639 op->animation_id = find_animation (str); 784 if (str && (op->animation_id = find_animation (str)))
640 SET_FLAG (op, FLAG_ANIMATE); 785 SET_FLAG (op, FLAG_ANIMATE);
641 }
642 } 786 }
643
644 break; 787 break;
645 788
646 case KW_last_heal: thawer.get (op->last_heal); break; 789 case KW_last_heal: thawer.get (op->last_heal); break;
647 case KW_last_sp: thawer.get (op->last_sp); break; 790 case KW_last_sp: thawer.get (op->last_sp); break;
648 case KW_last_grace: thawer.get (op->last_grace); break; 791 case KW_last_grace: thawer.get (op->last_grace); break;
… …
653 thawer.get (op->speed); 796 thawer.get (op->speed);
654 797
655 //TODO: maybe do in check_object 798 //TODO: maybe do in check_object
656 // removed check for style maps 799 // removed check for style maps
657 if (op->speed < 0) 800 if (op->speed < 0)
658 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 801 op->speed_left = op->speed_left - rndm ();
659 802
660 break; 803 break;
661 804
662 case KW_slow_move: 805 case KW_slow_move:
663 op->move_slow |= MOVE_WALK; 806 op->move_slow |= MOVE_WALK;
… …
713 case KW_path_denied: thawer.get (op->path_denied); break; 856 case KW_path_denied: thawer.get (op->path_denied); break;
714 case KW_invisible: thawer.get (op->invisible); break; 857 case KW_invisible: thawer.get (op->invisible); break;
715 case KW_magic: thawer.get (op->magic); break; 858 case KW_magic: thawer.get (op->magic); break;
716 case KW_state: thawer.get (op->state); break; 859 case KW_state: thawer.get (op->state); break;
717 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;
718 case KW_material: thawer.get (op->material); break; 861 case KW_material: thawer.get (op->materials); break; //TODO: nuke
719 case KW_materialname: thawer.get (op->materialname); break; 862 case KW_materialname: thawer.get (op->materialname); break;
720 863
721 /* These are the new values */ 864 /* These are the new values */
722 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;
723 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;
… …
817 CLEAR_FLAG (op, FLAG_WIZCAST); 960 CLEAR_FLAG (op, FLAG_WIZCAST);
818 } 961 }
819 break; 962 break;
820 963
821 case KW_friendly: 964 case KW_friendly:
822 GET_FLAG (op, FLAG_FRIENDLY); 965 if (thawer.get_sint32 ())
823 //TODO: move to check_object or so 966 if (op->type != PLAYER)
824 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
825 add_friendly_object (op); 967 add_friendly_object (op);
968
826 break; 969 break;
827 970
828 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 971 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
829 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 972 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
830 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 973 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
831 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;
832 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 976 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
833 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;
834 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 978 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
835 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 979 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
836 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 980 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
… …
907 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 1051 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
908 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 1052 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
909 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 1053 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
910 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 1054 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
911 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;
912 1057
913 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 1058 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
914 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 1059 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
915 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 1060 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
916 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 1061 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
983 add_button_link (op, op->map, thawer.get_sint32 ()); 1128 add_button_link (op, op->map, thawer.get_sint32 ());
984 break; 1129 break;
985 1130
986 case KW_randomitems: 1131 case KW_randomitems:
987 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 ());
988 break; 1135 break;
989 1136
990 case KW_msg: 1137 case KW_msg:
991 thawer.get_ml (KW_endmsg, op->msg); 1138 thawer.get_ml (KW_endmsg, op->msg);
992 //TODO: allow longer messages 1139 //TODO: allow longer messages
993 if (strlen (op->msg) >= HUGE_BUF) 1140 if (strlen (op->msg) >= HUGE_BUF)
994 { 1141 {
995 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);
996 op->msg = "ERROR, please report: string too long, winged.\n"; 1143 op->msg = "ERROR, please report: string too long, winged.\n";
997 } 1144 }
998 break; 1145 break;
999 1146
1000 case KW_lore: 1147 case KW_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 break; 1156 break;
1010 1157
1011 case KW_editable: 1158 case KW_editable:
1012 case KW_editor_folder: 1159 case KW_editor_folder:
… …
1035 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 1182 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1036 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D 1183 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1037 break; 1184 break;
1038 1185
1039 default: 1186 default:
1040 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;
1041 break; 1189 break;
1042 } 1190 }
1043 } 1191 }
1044} 1192}
1045 1193
… …
1058 * 1206 *
1059 */ 1207 */
1060int 1208int
1061load_object (object_thawer &fp, object *op, int map_flags) 1209load_object (object_thawer &fp, object *op, int map_flags)
1062{ 1210{
1063 // cede every 500 objects loaded 1211 coroapi::cede_every (1000); // cede once in a while
1064 {
1065 static int cede_counter = 0;
1066
1067 if (++cede_counter >= 500)
1068 {
1069 cede_counter = 0;
1070 if (coroapi::nready ())
1071 coroapi::cede ();
1072 }
1073 }
1074 1212
1075 return parse_object (op, fp, map_flags); 1213 return parse_object (op, fp, map_flags);
1076} 1214}
1077 1215
1078/* 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
… …
1277 KW_berserk, 1415 KW_berserk,
1278 KW_neutral, 1416 KW_neutral,
1279 /* 100 */ 1417 /* 100 */
1280 KW_no_attack, 1418 KW_no_attack,
1281 KW_no_damage, 1419 KW_no_damage,
1282 KW_NULL, 1420 KW_obj_original,
1283 KW_NULL, 1421 KW_NULL,
1284 KW_activate_on_push, 1422 KW_activate_on_push,
1285 KW_activate_on_release, 1423 KW_activate_on_release,
1286 KW_is_water, 1424 KW_is_water,
1287 KW_use_content_on_gen, 1425 KW_use_content_on_gen,
1288 KW_NULL, 1426 KW_NULL,
1289 KW_is_buildable, 1427 KW_is_buildable,
1290 /* 110 */ 1428 /* 110 */
1429 KW_destroy_on_death,
1430 KW_NULL,
1291 }; 1431 };
1292 1432
1293 int i; 1433 int i;
1294 1434
1295 /* 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
1296 * keys that match field names will be overwritten by the loader. 1436 * keys that match field names will be overwritten by the loader.
1297 */ 1437 */
1298 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)
1299 { 1439 {
1300 /* Find the field in the opposing member. */ 1440 /* Find the field in the opposing member. */
1301 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);
1302 1442
1303 /* 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. */
… …
1387 f.put (resist_save[i], op->resist[i]); 1527 f.put (resist_save[i], op->resist[i]);
1388 1528
1389 CMP_OUT (path_attuned); 1529 CMP_OUT (path_attuned);
1390 CMP_OUT (path_repelled); 1530 CMP_OUT (path_repelled);
1391 CMP_OUT (path_denied); 1531 CMP_OUT (path_denied);
1392 CMP_OUT (material); 1532 CMP_OUT2 (material, materials);//TODO: nuke
1393 CMP_OUT (materialname); 1533 CMP_OUT (materialname);
1394 CMP_OUT (value); 1534 CMP_OUT (value);
1395 CMP_OUT (carrying); 1535 CMP_OUT (carrying);
1396 CMP_OUT (weight); 1536 CMP_OUT (weight);
1397 CMP_OUT (invisible); 1537 CMP_OUT (invisible);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines