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.78 by root, Mon May 7 06:01:47 2007 UTC vs.
Revision 1.88 by root, Mon Jun 4 13:04:00 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * any later version.
12 * 12 *
13 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * for more details.
17 * 17 *
18 * 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 along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 23 */
24 24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 27 variable. */
… …
260 * 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.
261 */ 261 */
262void 262void
263object::post_load_check () 263object::post_load_check ()
264{ 264{
265 // as a kind of a hack, we now adjust the range, shield and combat slots 265 if (type >= NUM_TYPES)
266 {
267 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ());
268 type = 0;
269 }
270
266 switch (type) 271 switch (type)
267 { 272 {
268 case BOW: 273 case BOW:
269 case WAND: 274 case WAND:
270 case ROD: 275 case ROD:
271 case HORN: 276 case HORN:
272 case SKILL: // maybe have to think about this one, as skills get applied togethr with their governing weapons
273 case SKILL_TOOL:
274 if (slot [body_range].info != 1) 277 if (slot [body_range].info != -1)
275 { 278 {
276 LOG (llevInfo, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); 279 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
277 slot [body_range].info = 1; 280 slot [body_range].info = -1;
278 } 281 }
279 break; 282 break;
280 283
281 case WEAPON: 284 case WEAPON:
282 if (slot [body_combat].info != 1) 285 if (slot [body_combat].info != -1)
283 { 286 {
284 LOG (llevInfo, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); 287 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
285 slot [body_combat].info = 1; 288 slot [body_combat].info = -1;
286 } 289 }
287 break; 290 break;
288 291
289 case SHIELD: 292 case SHIELD:
290 if (slot [body_shield].info != 1) 293 if (slot [body_shield].info != -1)
291 { 294 {
292 LOG (llevInfo, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 295 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
293 slot [body_shield].info = 1; 296 slot [body_shield].info = -1;
294 } 297 }
295 break; 298 break;
296 299
297 case PLAYER: 300 case PLAYER:
298 if (slot [body_shield].info != 1) 301 if (slot [body_shield].info != 1)
299 { 302 {
300 LOG (llevInfo, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 303 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
301 slot [body_shield].info = 1; 304 slot [body_shield].info = 1;
302 } 305 }
303 306
304 if (slot [body_combat].info != 1) 307 if (slot [body_combat].info != 1)
305 { 308 {
306 LOG (llevInfo, "%s: body_shield %d != 1\n", debug_desc (), slot [body_combat].info); 309 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
307 slot [body_combat].info = 1; 310 slot [body_combat].info = 1;
311 }
312
313 if (slot [body_range].info != 1)
314 {
315 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
316 slot [body_range].info = 1;
308 } 317 }
309 break; 318 break;
310 } 319 }
311 320
312 /* We do some specialised handling to handle legacy cases of name_pl. 321 /* We do some specialised handling to handle legacy cases of name_pl.
… …
316 * also have to catch is if this object is not using the normal name for 325 * also have to catch is if this object is not using the normal name for
317 * the object. In that case, we also want to use the loaded name. 326 * the object. In that case, we also want to use the loaded name.
318 * Otherwise, what happens is that the the plural name will lose 327 * Otherwise, what happens is that the the plural name will lose
319 * information (appear as just 'hearts' and not 'goblins heart') 328 * information (appear as just 'hearts' and not 'goblins heart')
320 */ 329 */
321 if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl) 330 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
322 name_pl = 0; 331 name_pl = 0;
323 332
324 if (!name_pl) 333 if (!name_pl)
325 name_pl = name; 334 name_pl = name;
326 335
327 /* objects now have a materialname. try to patch it in */ 336 /* objects now have a materialname. try to patch it in */
328 if (!(is_weapon () && level > 0)) 337 if (!(is_weapon () && level > 0))
329 {
330 if (map != NULL)
331 set_materialname (this, map->difficulty, NULL); 338 set_materialname (this, map ? map->difficulty : 5, 0);
332 else
333 set_materialname (this, 5, NULL);
334 }
335 339
336 /* only do these when program is first run - a bit 340 /* only do these when program is first run - a bit
337 * excessive to do this at every run - most of this is 341 * excessive to do this at every run - most of this is
338 * really just to catch any errors - program will still run, but 342 * really just to catch any errors - program will still run, but
339 * not in the ideal fashion. 343 * not in the ideal fashion.
… …
380 * something that has item_power 1 is probably just fine if our calculated 384 * something that has item_power 1 is probably just fine if our calculated
381 * value is 1 or 2 - these values are small enough that hard to be precise. 385 * value is 1 or 2 - these values are small enough that hard to be precise.
382 * similarly, it item_power is 0, the first check will always pass, 386 * similarly, it item_power is 0, the first check will always pass,
383 * but not the second one. 387 * but not the second one.
384 */ 388 */
389#if 0 //TODO
385 if (ip > 2 * item_power && ip > (item_power + 3)) 390 if (ip > 2 * item_power && ip > (item_power + 3))
386 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 391 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
392#endif
387 } 393 }
388 394
389 /* Old spellcasting object - need to load in the appropiate object */ 395 /* Old spellcasting object - need to load in the appropiate object */
390 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 396 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
391 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 397 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
… …
404 { 410 {
405 object *tmp = get_archetype_by_object_name (slaying); 411 object *tmp = get_archetype_by_object_name (slaying);
406 insert_ob_in_ob (tmp, this); 412 insert_ob_in_ob (tmp, this);
407 randomitems = NULL; /* So another spell isn't created for this object */ 413 randomitems = NULL; /* So another spell isn't created for this object */
408 /* without this, value is all screwed up */ 414 /* without this, value is all screwed up */
409 value = arch->clone.value * inv->value; 415 value = arch->value * inv->value;
410 } 416 }
411 417
412 if (QUERY_FLAG (this, FLAG_MONSTER)) 418 if (QUERY_FLAG (this, FLAG_MONSTER))
413 { 419 {
414 if (stats.hp > stats.maxhp) 420 if (stats.hp > stats.maxhp)
… …
511 517
512next: ; 518next: ;
513 } 519 }
514} 520}
515 521
516#define GET_FLAG(op,flag) \ 522#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
517 if (f.get_sint32 ()) \
518 SET_FLAG (op, flag); \
519 else \
520 CLEAR_FLAG (op, flag) \
521 523
522bool 524bool
523object::parse_kv (object_thawer &f) 525object::parse_kv (object_thawer &f)
524{ 526{
525 object *op_inv = inv; 527 object *op_inv = inv;
… …
770 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 772 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
771 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 773 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
772 774
773 break; 775 break;
774 776
775 case KW_wiz:
776 GET_FLAG (this, FLAG_WIZ);
777 //TODO: move to check_object
778 if (QUERY_FLAG (this, FLAG_WIZ))
779 {
780 SET_FLAG (this, FLAG_WAS_WIZ);
781 SET_FLAG (this, FLAG_WIZPASS);
782 SET_FLAG (this, FLAG_WIZCAST);
783 }
784 else
785 {
786 CLEAR_FLAG (this, FLAG_WIZPASS);
787 CLEAR_FLAG (this, FLAG_WIZCAST);
788 }
789 break;
790
791 case KW_friendly: 777 case KW_friendly:
792 if (f.get_sint32 ()) 778 if (f.get_bool ())
793 if (type != PLAYER) 779 if (type != PLAYER)
794 add_friendly_object (this); 780 add_friendly_object (this);
795 781
796 break; 782 break;
797 783
… …
826 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 812 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
827 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 813 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
828 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 814 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
829 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 815 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
830 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 816 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
831 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
832 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; 817 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
833 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 818 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
834 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 819 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
835 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 820 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
836 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 821 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
… …
1039 f.next (); 1024 f.next ();
1040 1025
1041 object *op = object::create (); 1026 object *op = object::create ();
1042 1027
1043 op->map = map; 1028 op->map = map;
1044 arch->clone.copy_to (op); 1029 arch->copy_to (op);
1045 // copy_to activates, this should be fixed properly 1030 // copy_to activates, this should be fixed properly
1046 op->deactivate (); 1031 op->deactivate ();
1047 1032
1048 if (!op->parse_kv (f)) 1033 if (!op->parse_kv (f))
1049 { 1034 {
… …
1136 * the 15'th element of this array should match that name. 1121 * the 15'th element of this array should match that name.
1137 * If an entry is NULL, that is a flag not to loaded/saved. 1122 * If an entry is NULL, that is a flag not to loaded/saved.
1138 */ 1123 */
1139 static const keyword flag_names [NUM_FLAGS] = { 1124 static const keyword flag_names [NUM_FLAGS] = {
1140 KW_alive, 1125 KW_alive,
1141 KW_wiz,
1142 KW_NULL, 1126 KW_NULL,
1143 KW_NULL, 1127 KW_NULL,
1144 KW_was_wiz, 1128 KW_NULL,
1129 KW_NULL,
1145 KW_applied, 1130 KW_applied,
1146 KW_unpaid, 1131 KW_unpaid,
1147 KW_can_use_shield, 1132 KW_can_use_shield,
1148 KW_no_pick, 1133 KW_no_pick,
1149 KW_NULL, // walk_on 1134 KW_NULL, // walk_on
… …
1300 1285
1301 if (op->msg != tmp->msg) 1286 if (op->msg != tmp->msg)
1302 f.put (KW_msg, KW_endmsg, op->msg); 1287 f.put (KW_msg, KW_endmsg, op->msg);
1303 if (op->lore != tmp->lore) 1288 if (op->lore != tmp->lore)
1304 f.put (KW_lore, KW_endlore, op->lore); 1289 f.put (KW_lore, KW_endlore, op->lore);
1305 1290 if (op->other_arch != tmp->other_arch)
1306 CMP_OUT (other_arch); 1291 f.put (KW_other_arch, op->other_arch ? &op->other_arch->archname : 0);
1307 1292
1308 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1293 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
1309 1294
1310 if (op->animation_id != tmp->animation_id) 1295 if (op->animation_id != tmp->animation_id)
1311 if (op->animation_id) 1296 if (op->animation_id)
… …
1432 if (owner) 1417 if (owner)
1433 return true; 1418 return true;
1434 1419
1435 archetype *at = arch ? (archetype *)arch : empty_archetype; 1420 archetype *at = arch ? (archetype *)arch : empty_archetype;
1436 1421
1437 f.put (KW_arch, at->name); 1422 f.put (KW_arch, at->archname);
1438 write_diff (f, this, &at->clone); 1423 write_diff (f, this, at);
1439 1424
1440 for (object *tmp = inv; tmp; tmp = tmp->below) 1425 for (object *tmp = inv; tmp; tmp = tmp->below)
1441 tmp->write (f); 1426 tmp->write (f);
1442 1427
1443 f.put (this); 1428 f.put (this);

Diff Legend

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