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.52 by root, Thu Feb 1 19:15:38 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
35// the base class warns about and skips everything
36archetype *
37loader_base::get_arch (const char *name)
38{
39 LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of this type.\n",
40 filename, name);
41
42 return new archetype;
43}
44
45object *
46loader_base::get_object (const char *name)
47{
48 LOG (llevError, "%s: found object definition '%s', which is not allowed in files of this type.\n",
49 filename, name);
50
51 return object::create ();
52}
53
54player *
55loader_base::get_player ()
56{
57 LOG (llevError, "%s: found player definition, which is not allowed in files of this type.\n",
58 filename);
59
60 return player::create ();
61}
62
63region *
64loader_base::get_region (const char *name)
65{
66 LOG (llevError, "%s: found region definition '%s', which is not allowed in files of this type.\n",
67 filename, name);
68
69 return new region;
70}
71
72facetile *
73loader_base::get_face (const char *name)
74{
75 LOG (llevError, "%s: found face definition '%s', which is not allowed in files of this type.\n",
76 filename, name);
77
78 return new facetile;
79}
80
81treasurelist *
82loader_base::get_treasure (const char *name, bool one)
83{
84 LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of this type.\n",
85 filename, name);
86
87 return new treasurelist;//D
88}
89
90animation *
91loader_base::get_animation (const char *name)
92{
93 LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of this type.\n",
94 filename, name);
95
96 return new animation;
97}
98
99void
100loader_base::put_arch (archetype *arch)
101{
102 delete arch;
103}
104
105void
106loader_base::put_object (object *op)
107{
108 op->destroy ();
109}
110
111void
112loader_base::put_player (player *pl)
113{
114 delete pl;
115}
116
117void
118loader_base::put_region (region *region)
119{
120 delete region;
121}
122
123void
124loader_base::put_face (facetile *face)
125{
126 delete face;
127}
128
129void
130loader_base::put_treasure (treasurelist *treasure)
131{
132 delete treasure;
133}
134
135void
136loader_base::put_animation (animation *anim)
137{
138 delete anim;
139}
140
141/////////////////////////////////////////////////////////////////////////////
142
143bool loader_base::parse (object_thawer &thawer)
144{
145 for (;;)
146 {
147 keyword kw = thawer.get_kv ();
148
149 switch (kw)
150 {
151 case KW_region:
152 {
153 region *rgn = get_region (thawer.get_str ());
154
155 if (!parse_region (thawer, rgn))
156 {
157 delete rgn;
158 return false;
159 }
160
161 put_region (rgn);
162 }
163 break;
164
165 case KW_EOF:
166 return true;
167
168 default:
169 if (!thawer.parse_error (kw, "resource file"))
170 return false;
171 }
172 }
173}
174
175bool loader_base::load (const char *filename)
176{
177 this->filename = filename;
178
179 object_thawer fp (filename);
180
181 if (!fp)
182 return false;
183
184 return parse (fp);
185}
186
187/////////////////////////////////////////////////////////////////////////////
32 188
33/* Maps the MOVE_* values to names */ 189/* Maps the MOVE_* values to names */
34static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 190static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
35 191
36/* This table is only necessary to convert objects that existed before the 192/* This table is only necessary to convert objects that existed before the
… …
263static void 419static void
264check_loaded_object (object *op) 420check_loaded_object (object *op)
265{ 421{
266 int ip; 422 int ip;
267 423
268 /* We do some specialized handling to handle legacy cases of name_pl. 424 /* 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 - 425 * 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 426 * 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 427 * 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 428 * 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. 429 * 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 430 * Otherwise, what happens is that the the plural name will lose
275 * information (appear as just 'hearts' and not 'goblins heart') 431 * information (appear as just 'hearts' and not 'goblins heart')
… …
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 ip = calc_item_power (op, 0);
329 /* Legacy objects from before item power was in the game */ 483 /* Legacy objects from before item power was in the game */
330 if (!op->item_power && ip) 484 if (!op->item_power && ip)
331 { 485 {
332 if (ip > 3) 486 if (ip > 3)
333 { 487 {
… …
375 } 529 }
376 530
377 if (QUERY_FLAG (op, FLAG_MONSTER)) 531 if (QUERY_FLAG (op, FLAG_MONSTER))
378 { 532 {
379 if (op->stats.hp > op->stats.maxhp) 533 if (op->stats.hp > op->stats.maxhp)
534 {
380 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 535 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);
536 op->stats.maxhp = op->stats.hp;
537 }
381 538
382 /* The archs just need to be updated for this */ 539 /* The archs just need to be updated for this */
383 if (op->move_type == 0) 540 if (op->move_type == 0)
384 op->move_type = MOVE_WALK; 541 op->move_type = MOVE_WALK;
385 } 542 }
… …
540 case KW_slaying: thawer.get_ornull (op->slaying); break; 697 case KW_slaying: thawer.get_ornull (op->slaying); break;
541 698
542 case KW_arch: 699 case KW_arch:
543 { 700 {
544 const char *str = thawer.get_str (); 701 const char *str = thawer.get_str ();
545 fprintf (stderr, "arch %s\n", str);//D
546 702
547 if (op->arch) 703 if (op->arch)
548 { 704 {
549 /* If op->arch has been set, then this new object 705 /* If op->arch has been set, then this new object
550 * must be part of the inventory. So process 706 * must be part of the inventory. So process
… …
632 if (!str) 788 if (!str)
633 { 789 {
634 op->animation_id = 0; 790 op->animation_id = 0;
635 CLEAR_FLAG (op, FLAG_ANIMATE); 791 CLEAR_FLAG (op, FLAG_ANIMATE);
636 } 792 }
637 else
638 {
639 op->animation_id = find_animation (str); 793 else if ((op->animation_id = find_animation (str)))
640 SET_FLAG (op, FLAG_ANIMATE); 794 SET_FLAG (op, FLAG_ANIMATE);
641 }
642 } 795 }
643 796
644 break; 797 break;
645 798
646 case KW_last_heal: thawer.get (op->last_heal); break; 799 case KW_last_heal: thawer.get (op->last_heal); break;
… …
653 thawer.get (op->speed); 806 thawer.get (op->speed);
654 807
655 //TODO: maybe do in check_object 808 //TODO: maybe do in check_object
656 // removed check for style maps 809 // removed check for style maps
657 if (op->speed < 0) 810 if (op->speed < 0)
658 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 811 op->speed_left = op->speed_left - rndm ();
659 812
660 break; 813 break;
661 814
662 case KW_slow_move: 815 case KW_slow_move:
663 op->move_slow |= MOVE_WALK; 816 op->move_slow |= MOVE_WALK;
… …
817 CLEAR_FLAG (op, FLAG_WIZCAST); 970 CLEAR_FLAG (op, FLAG_WIZCAST);
818 } 971 }
819 break; 972 break;
820 973
821 case KW_friendly: 974 case KW_friendly:
822 GET_FLAG (op, FLAG_FRIENDLY); 975 if (thawer.get_sint32 ())
823 //TODO: move to check_object or so 976 if (op->type != PLAYER)
824 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
825 add_friendly_object (op); 977 add_friendly_object (op);
978
826 break; 979 break;
827 980
828 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 981 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
829 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 982 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
830 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 983 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
831 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 984 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
985 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
832 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 986 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
833 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 987 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; 988 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
835 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 989 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
836 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 990 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
… …
907 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 1061 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
908 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 1062 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
909 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 1063 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
910 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 1064 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
911 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 1065 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
1066 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
912 1067
913 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 1068 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
914 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 1069 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
915 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 1070 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
916 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 1071 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
990 case KW_msg: 1145 case KW_msg:
991 thawer.get_ml (KW_endmsg, op->msg); 1146 thawer.get_ml (KW_endmsg, op->msg);
992 //TODO: allow longer messages 1147 //TODO: allow longer messages
993 if (strlen (op->msg) >= HUGE_BUF) 1148 if (strlen (op->msg) >= HUGE_BUF)
994 { 1149 {
995 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 1150 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"; 1151 op->msg = "ERROR, please report: string too long, winged.\n";
997 } 1152 }
998 break; 1153 break;
999 1154
1000 case KW_lore: 1155 case KW_lore:
… …
1002 //TODO: allow longer messages 1157 //TODO: allow longer messages
1003 /* Just print a warning so we can be reasonably safe 1158 /* Just print a warning so we can be reasonably safe
1004 * about not overflowing the buffer. 1159 * about not overflowing the buffer.
1005 */ 1160 */
1006 if (strlen (op->lore) > (HUGE_BUF / 2)) 1161 if (strlen (op->lore) > (HUGE_BUF / 2))
1007 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1162 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1008 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1163 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1009 break; 1164 break;
1010 1165
1011 case KW_editable: 1166 case KW_editable:
1012 case KW_editor_folder: 1167 case KW_editor_folder:
… …
1035 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 1190 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 1191 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1037 break; 1192 break;
1038 1193
1039 default: 1194 default:
1040 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1195 if (!thawer.parse_error (kw, "object", op->name))
1196 return false;
1041 break; 1197 break;
1042 } 1198 }
1043 } 1199 }
1044} 1200}
1045 1201
… …
1058 * 1214 *
1059 */ 1215 */
1060int 1216int
1061load_object (object_thawer &fp, object *op, int map_flags) 1217load_object (object_thawer &fp, object *op, int map_flags)
1062{ 1218{
1063 // cede every 500 objects loaded 1219 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 1220
1075 return parse_object (op, fp, map_flags); 1221 return parse_object (op, fp, map_flags);
1076} 1222}
1077 1223
1078/* This takes a buffer, scans it for variables, and sets those variables 1224/* This takes a buffer, scans it for variables, and sets those variables
… …
1277 KW_berserk, 1423 KW_berserk,
1278 KW_neutral, 1424 KW_neutral,
1279 /* 100 */ 1425 /* 100 */
1280 KW_no_attack, 1426 KW_no_attack,
1281 KW_no_damage, 1427 KW_no_damage,
1282 KW_NULL, 1428 KW_obj_original,
1283 KW_NULL, 1429 KW_NULL,
1284 KW_activate_on_push, 1430 KW_activate_on_push,
1285 KW_activate_on_release, 1431 KW_activate_on_release,
1286 KW_is_water, 1432 KW_is_water,
1287 KW_use_content_on_gen, 1433 KW_use_content_on_gen,
1288 KW_NULL, 1434 KW_NULL,
1289 KW_is_buildable, 1435 KW_is_buildable,
1290 /* 110 */ 1436 /* 110 */
1437 KW_destroy_on_death,
1438 KW_NULL,
1291 }; 1439 };
1292 1440
1293 int i; 1441 int i;
1294 1442
1295 /* This saves the key/value lists. We do it first so that any 1443 /* 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. 1444 * keys that match field names will be overwritten by the loader.
1297 */ 1445 */
1298 for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) 1446 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1299 { 1447 {
1300 /* Find the field in the opposing member. */ 1448 /* Find the field in the opposing member. */
1301 key_value *arch_field = get_ob_key_link (tmp, my_field->key); 1449 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1302 1450
1303 /* If there's no partnering field, or it's got a different value, save our field. */ 1451 /* If there's no partnering field, or it's got a different value, save our field. */

Diff Legend

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