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.77 by root, Mon May 7 04:21:09 2007 UTC vs.
Revision 1.111 by root, Sun Apr 20 23:25:09 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License 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
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying
27 variable. */
28 23
29#include <global.h> 24#include <global.h>
30#include <loader.h> 25#include <loader.h>
31#include <sproto.h> 26#include <sproto.h>
32 27
33///////////////////////////////////////////////////////////////////////////// 28/////////////////////////////////////////////////////////////////////////////
29
30extern archetype *loading_arch;
34 31
35/* This table is only necessary to convert objects that existed before the 32/* This table is only necessary to convert objects that existed before the
36 * spell object conversion to the new object. It was not practical 33 * spell object conversion to the new object. It was not practical
37 * to go through every mapping looking for every potion, rod, wand, etc 34 * to go through every mapping looking for every potion, rod, wand, etc
38 * that had a sp set and update to the new value. So this maps the 35 * that had a sp set and update to the new value. So this maps the
… …
168 "spell_magic_drain", /* 122 */ 165 "spell_magic_drain", /* 122 */
169 "spell_counterspell", /* 123 */ 166 "spell_counterspell", /* 123 */
170 "spell_disarm", /* 124 */ 167 "spell_disarm", /* 124 */
171 "spell_cure_confusion", /* 125 */ 168 "spell_cure_confusion", /* 125 */
172 "spell_restoration", /* 126 */ 169 "spell_restoration", /* 126 */
173 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 170 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
174 "spell_counterwall", /* 128 */ 171 "spell_counterwall", /* 128 */
175 "spell_cause_light_wounds", /* 129 */ 172 "spell_cause_light_wounds", /* 129 */
176 "spell_cause_medium_wounds", /* 130 */ 173 "spell_cause_medium_wounds", /* 130 */
177 "spell_cause_heavy_wounds", /* 131 */ 174 "spell_cause_heavy_wounds", /* 131 */
178 "spell_charm_monsters", /* 132 */ 175 "spell_charm_monsters", /* 132 */
… …
250 "spell_cause_rabies", /* 204 */ 247 "spell_cause_rabies", /* 204 */
251 "spell_glyph", /* 205 */ 248 "spell_glyph", /* 205 */
252 NULL 249 NULL
253}; 250};
254 251
255extern bool loading_arch;
256
257/* This function checks the object after it has been loaded (when we 252/* This function checks the object after it has been loaded (when we
258 * get the 'end' in the input stream). This function can be used to 253 * get the 'end' in the input stream). This function can be used to
259 * deal with legacy objects where fields may have changed. It can also be used 254 * deal with legacy objects where fields may have changed. It can also be used
260 * to check for objects to make sure there are no common errors. 255 * to check for objects to make sure there are no common errors.
261 */ 256 */
262static void 257void
263check_loaded_object (object *op) 258object::post_load_check ()
264{ 259{
260 if (type >= NUM_TYPES)
261 {
262 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ());
263 type = 0;
264 }
265
266 switch (type)
267 {
268 case BOW:
269 case WAND:
270 case ROD:
271 case HORN:
272 if (slot [body_range].info != -1)
273 {
274 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
275 slot [body_range].info = -1;
276 }
277 break;
278
279 case WEAPON:
280 if (slot [body_combat].info != -1)
281 {
282 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
283 slot [body_combat].info = -1;
284 }
285 break;
286
287 case SHIELD:
288 if (slot [body_shield].info != -1)
289 {
290 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
291 slot [body_shield].info = -1;
292 }
293 break;
294
295 case PLAYER:
296 if (slot [body_shield].info != 1)
297 {
298 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
299 slot [body_shield].info = 1;
300 }
301
302 if (slot [body_combat].info != 1)
303 {
304 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
305 slot [body_combat].info = 1;
306 }
307
308 if (slot [body_range].info != 1)
309 {
310 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
311 slot [body_range].info = 1;
312 }
313 break;
314 }
315
265 /* We do some specialised handling to handle legacy cases of name_pl. 316 /* We do some specialised handling to handle legacy cases of name_pl.
266 * If the object doesn't have a name_pl, we just use the object name - 317 * If the object doesn't have a name_pl, we just use the object name -
267 * this isn't perfect (things won't be properly pluralised), but works to 318 * this isn't perfect (things won't be properly pluralised), but works to
268 * that degree (5 heart is still quite understandable). But the case we 319 * that degree (5 heart is still quite understandable). But the case we
269 * also have to catch is if this object is not using the normal name for 320 * also have to catch is if this object is not using the normal name for
270 * the object. In that case, we also want to use the loaded name. 321 * the object. In that case, we also want to use the loaded name.
271 * Otherwise, what happens is that the the plural name will lose 322 * Otherwise, what happens is that the the plural name will lose
272 * information (appear as just 'hearts' and not 'goblins heart') 323 * information (appear as just 'hearts' and not 'goblins heart')
273 */ 324 */
274 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) 325 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
275 op->name_pl = 0; 326 name_pl = 0;
276 327
277 if (!op->name_pl) 328 if (!name_pl)
278 op->name_pl = op->name; 329 name_pl = name;
279 330
280 /* objects now have a materialname. try to patch it in */ 331 /* objects now have a materialname. try to patch it in */
281 if (!(op->is_weapon () && op->level > 0)) 332 if (!(is_weapon () && level > 0))
282 { 333 set_materialname (this, map ? map->difficulty : 5, 0);
283 if (op->map != NULL)
284 set_materialname (op, op->map->difficulty, NULL);
285 else
286 set_materialname (op, 5, NULL);
287 }
288 334
289 /* only do these when program is first run - a bit 335 /* only do these when program is first run - a bit
290 * excessive to do this at every run - most of this is 336 * excessive to do this at every run - most of this is
291 * really just to catch any errors - program will still run, but 337 * really just to catch any errors - program will still run, but
292 * not in the ideal fashion. 338 * not in the ideal fashion.
293 */ 339 */
294 if ((op->type == WEAPON || op->type == BOW) && loading_arch) 340 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
295 { 341 {
296 if (!op->skill) 342 if (!skill)
297 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 343 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ());
298 else if ((!strcmp (op->skill, "one handed weapons") && op->slot[1].info != -1) || 344 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) ||
299 (!strcmp (op->skill, "two handed weapons") && op->slot[1].info != -2)) 345 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2))
300 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->slot[1].info, &op->skill); 346 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
301 } 347 }
302 348
303 /* We changed last_heal to gen_sp_armour, which is what it 349 /* We changed last_heal to gen_sp_armour, which is what it
304 * really does for many objects. Need to catch any in maps 350 * really does for many objects. Need to catch any in maps
305 * that may have an old value. 351 * that may have an old value.
306 */ 352 */
307 if (op->type == WEAPON 353 if (type == WEAPON
308 || op->type == ARMOUR || op->type == HELMET 354 || type == ARMOUR || type == HELMET
309 || op->type == SHIELD || op->type == RING 355 || type == SHIELD || type == RING
310 || op->type == BOOTS || op->type == GLOVES 356 || type == BOOTS || type == GLOVES
311 || op->type == AMULET || op->type == GIRDLE 357 || type == AMULET || type == GIRDLE
312 || op->type == BRACERS || op->type == CLOAK) 358 || type == BRACERS || type == CLOAK)
313 { 359 {
314 if (op->last_heal) 360 if (last_heal)
315 { 361 {
316 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 362 LOG (llevError, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
317 op->gen_sp_armour = op->last_heal; 363 gen_sp_armour = last_heal;
318 op->last_heal = 0; 364 last_heal = 0;
319 } 365 }
320 366
321 int ip = calc_item_power (op, 0); 367 int ip = calc_item_power (this, 0);
322 368
323 /* Legacy objects from before item power was in the game */ 369 /* Legacy objects from before item power was in the game */
324 if (!op->item_power && ip) 370 if (!item_power && ip)
325 { 371 {
326 if (ip > 3) 372 if (ip > 3)
327 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); 373 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip);
328 374
329 op->item_power = ip; 375 item_power = ip;
330 } 376 }
331 377
332 /* Check for possibly bogus values. Has to meet both these criteria - 378 /* Check for possibly bogus values. Has to meet both these criteria -
333 * something that has item_power 1 is probably just fine if our calculated 379 * something that has item_power 1 is probably just fine if our calculated
334 * value is 1 or 2 - these values are small enough that hard to be precise. 380 * value is 1 or 2 - these values are small enough that hard to be precise.
335 * similarly, it item_power is 0, the first check will always pass, 381 * similarly, it item_power is 0, the first check will always pass,
336 * but not the second one. 382 * but not the second one.
337 */ 383 */
384#if 0 //TODO
338 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 385 if (ip > 2 * item_power && ip > (item_power + 3))
339 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); 386 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
387#endif
340 } 388 }
341 389
342 /* Old spellcasting object - need to load in the appropiate object */ 390 /* Old spellcasting object - need to load in the appropiate object */
343 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || 391 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
344 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 392 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
345 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !loading_arch) 393 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
346 { 394 {
347 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 395 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
348 * in that spell was stored in sp. 396 * in that spell was stored in sp.
349 */ 397 */
398 LOG (llevError, "old spellcasting object found: %s", debug_desc ());
350 object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); 399 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
351 insert_ob_in_ob (tmp, op); 400 insert_ob_in_ob (tmp, this);
352 op->randomitems = NULL; /* So another spell isn't created for this object */ 401 randomitems = NULL; /* So another spell isn't created for this object */
353 } 402 }
354 403
355 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 404 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
356 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !loading_arch) 405 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
357 { 406 {
407 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
358 object *tmp = get_archetype_by_object_name (op->slaying); 408 object *tmp = get_archetype_by_object_name (slaying);
359 insert_ob_in_ob (tmp, op); 409 insert_ob_in_ob (tmp, this);
360 op->randomitems = NULL; /* So another spell isn't created for this object */ 410 randomitems = NULL; /* So another spell isn't created for this object */
361 /* without this, value is all screwed up */ 411 /* without this, value is all screwed up */
362 op->value = op->arch->clone.value * op->inv->value; 412 value = arch->value * inv->value;
363 } 413 }
364 414
365 if (QUERY_FLAG (op, FLAG_MONSTER)) 415 if (QUERY_FLAG (this, FLAG_MONSTER))
366 { 416 {
367 if (op->stats.hp > op->stats.maxhp) 417 if (stats.hp > stats.maxhp)
368 { 418 {
369 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 419 LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
370 op->stats.maxhp = op->stats.hp; 420 stats.maxhp = stats.hp;
371 } 421 }
372 422
373 /* The archs just need to be updated for this */ 423 /* The archs just need to be updated for this */
374 if (op->move_type == 0) 424 if (move_type == 0)
375 op->move_type = MOVE_WALK; 425 move_type = MOVE_WALK;
376 } 426 }
377 427
378 if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER) 428 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
379 {
380 /* Object will duplicate it's content as part of the 429 /* Object will duplicate it's content as part of the
381 * generation process. To do this, we must flag inventory 430 * generation process. To do this, we must flag inventory
382 * so it remains unevaluated concerning the randomitems and 431 * so it remains unevaluated concerning the randomitems and
383 * the living (a demonlord shouldn't cast from inside generator!) 432 * the living (a demonlord shouldn't cast from inside generator!)
384 */ 433 */
434 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
385 flag_inv (op, FLAG_IS_A_TEMPLATE); 435 flag_inv (this, FLAG_IS_A_TEMPLATE);
386 }
387 436
388 /* Handle player movers. We use move_type for player movers 437 /* Handle player movers. We use move_type for player movers
389 * because they operate on their own time (move_on 438 * because they operate on their own time (move_on
390 * would potentially cause them to be triggered when someone steps 439 * would potentially cause them to be triggered when someone steps
391 * on them). If move_type is set, presume person knows what they 440 * on them). If move_type is set, presume person knows what they
392 * are doing, otherwise, set move_type based on maxhp value. 441 * are doing, otherwise, set move_type based on maxhp value.
393 */ 442 */
394 if (op->type == PLAYERMOVER) 443 if (type == PLAYERMOVER)
395 { 444 {
396 if (!op->move_type) 445 if (!move_type)
397 { 446 {
398 if (op->stats.maxhp) 447 if (stats.maxhp)
399 { 448 {
400 op->move_type = MOVE_ALL; 449 move_type = MOVE_ALL;
401 op->stats.maxhp = 0; 450 stats.maxhp = 0;
402 } 451 }
403 else 452 else
404 op->move_type = MOVE_WALK; 453 move_type = MOVE_WALK;
405 } 454 }
406 } 455 }
407
408} 456}
409 457
410static void 458static void
411set_move (MoveType &mt, const char *str) 459set_move (MoveType &mt, const char *str)
412{ 460{
… …
459 507
460 goto next; 508 goto next;
461 } 509 }
462 } 510 }
463 511
464 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 512 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
465 513
466next: ; 514next: ;
467 } 515 }
468} 516}
469 517
470#define GET_FLAG(op,flag) \ 518#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
471 if (f.get_sint32 ()) \
472 SET_FLAG (op, flag); \
473 else \
474 CLEAR_FLAG (op, flag) \
475 519
476bool 520bool
477object::parse_kv (object_thawer &f) 521object::parse_kv (object_thawer &f)
478{ 522{
479 object *op_inv = inv; 523 object *op_inv = inv;
… …
482 { 526 {
483 switch (f.kw) 527 switch (f.kw)
484 { 528 {
485 case KW_uuid: 529 case KW_uuid:
486 if (const char *s = f.get_str ()) 530 if (const char *s = f.get_str ())
487 { 531 if (!uuid.parse (s))
488 unsigned int version;
489 unsigned long long seq;
490
491 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
492 { 532 {
493 uuid.seq = seq; 533 f.parse_warn ("unparseable uuid");
494 break; 534 uuid = UUID::gen ();
495 } 535 }
496 }
497
498 uuid = gen_uuid ();
499 break; 536 break;
500 537
501 case KW_oid: 538 case KW_oid:
502 f.get (this, f.get_sint32 ()); 539 f.get (this, f.get_sint32 ());
503 break; 540 break;
… …
509 546
510 case KW_attach: f.get_ornull (attach); break; 547 case KW_attach: f.get_ornull (attach); break;
511 case KW_skill: f.get_ornull (skill); break; 548 case KW_skill: f.get_ornull (skill); break;
512 case KW_race: f.get_ornull (race); break; 549 case KW_race: f.get_ornull (race); break;
513 case KW_slaying: f.get_ornull (slaying); break; 550 case KW_slaying: f.get_ornull (slaying); break;
551 case KW_tag: f.get_ornull (tag); break;
514 552
515 case KW_arch: 553 case KW_arch:
516 { 554 {
517 object *tmp = object::read (f); 555 object *tmp = object::read (f);
518 tmp->deactivate (); 556 tmp->deactivate ();
… …
520 { 558 {
521 // was: insert_ob_in_ob (tmp, op); 559 // was: insert_ob_in_ob (tmp, op);
522 // but manually adding it can improve map loading times a lot 560 // but manually adding it can improve map loading times a lot
523 // also, appending instead of prepending keeps the 561 // also, appending instead of prepending keeps the
524 // save ordering the same between repeated load/saves. 562 // save ordering the same between repeated load/saves.
563 // and finally we do not want any funny effects
525 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 564 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
526 CLEAR_FLAG (tmp, FLAG_REMOVED); 565 CLEAR_FLAG (tmp, FLAG_REMOVED);
527 566
528 if (!op_inv) 567 if (!op_inv)
529 { 568 {
… …
545 } 584 }
546 } 585 }
547 continue; 586 continue;
548 587
549 case KW_other_arch: 588 case KW_other_arch:
550 other_arch =
551 loading_arch 589 if (loading_arch == this)
552 ? archetype::get (f.get_str ()) 590 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
591 else
592 {
553 : archetype::find (f.get_str ()); 593 other_arch = archetype::find (f.get_str ());
554 594
555 if (!other_arch) 595 if (!other_arch)
556 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 596 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
597 }
598 break;
599
600 case KW_owner:
601 f.delayed_deref (this, owner, f.get_str ());
557 break; 602 break;
558 603
559 case KW_animation: 604 case KW_animation:
560 { 605 {
561 CLEAR_FLAG (this, FLAG_ANIMATE); 606 CLEAR_FLAG (this, FLAG_ANIMATE);
… …
588 f.get (move_slow_penalty); 633 f.get (move_slow_penalty);
589 break; 634 break;
590 635
591 case KW_face: 636 case KW_face:
592 face = face_find (f.get_str ()); 637 face = face_find (f.get_str ());
638 break;
639
640 case KW_sound:
641 sound = sound_find (f.get_str ());
642 if (!sound)
643 f.parse_warn ("sound not found");
644 break;
645
646 case KW_sound_destroy:
647 sound_destroy = sound_find (f.get_str ());
648 if (!sound_destroy)
649 f.parse_warn ("sound not found");
593 break; 650 break;
594 651
595 case KW_x: f.get (x); break; 652 case KW_x: f.get (x); break;
596 case KW_y: f.get (y); break; 653 case KW_y: f.get (y); break;
597 654
… …
724 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 781 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
725 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 782 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
726 783
727 break; 784 break;
728 785
729 case KW_wiz:
730 GET_FLAG (this, FLAG_WIZ);
731 //TODO: move to check_object
732 if (QUERY_FLAG (this, FLAG_WIZ))
733 {
734 SET_FLAG (this, FLAG_WAS_WIZ);
735 SET_FLAG (this, FLAG_WIZPASS);
736 SET_FLAG (this, FLAG_WIZCAST);
737 }
738 else
739 {
740 CLEAR_FLAG (this, FLAG_WIZPASS);
741 CLEAR_FLAG (this, FLAG_WIZCAST);
742 }
743 break;
744
745 case KW_friendly: 786 case KW_friendly:
746 if (f.get_sint32 ()) 787 if (f.get_bool ())
747 if (type != PLAYER) 788 if (type != PLAYER)
748 add_friendly_object (this); 789 add_friendly_object (this);
749 790
750 break; 791 break;
751 792
… …
764 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 805 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
765 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 806 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
766 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 807 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
767 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 808 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
768 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 809 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
810 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
769 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 811 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
770 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 812 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
771 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 813 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
772 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 814 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
773 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 815 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
780 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 822 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
781 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 823 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
782 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 824 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
783 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 825 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
784 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 826 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
785 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
786 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; 827 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
787 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 828 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
788 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 829 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
789 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 830 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
790 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 831 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
… …
890 case KW_dam_modifier: f.get (dam_modifier); break; 931 case KW_dam_modifier: f.get (dam_modifier); break;
891 case KW_duration_modifier: f.get (duration_modifier); break; 932 case KW_duration_modifier: f.get (duration_modifier); break;
892 933
893 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 934 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
894 //TODO: parse from other include files 935 //TODO: parse from other include files
895 case KW_body_range: slot[ 0].info = f.get_sint32 (); break; 936 case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
937 case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
938 case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
896 case KW_body_arm: slot[ 1].info = f.get_sint32 (); break; 939 case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
897 case KW_body_torso: slot[ 2].info = f.get_sint32 (); break; 940 case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
898 case KW_body_head: slot[ 3].info = f.get_sint32 (); break; 941 case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
899 case KW_body_neck: slot[ 4].info = f.get_sint32 (); break; 942 case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
900 case KW_body_skill: slot[ 5].info = f.get_sint32 (); break; 943 case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
901 case KW_body_finger: slot[ 6].info = f.get_sint32 (); break; 944 case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
902 case KW_body_shoulder: slot[ 7].info = f.get_sint32 (); break; 945 case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
903 case KW_body_foot: slot[ 8].info = f.get_sint32 (); break; 946 case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
904 case KW_body_hand: slot[ 9].info = f.get_sint32 (); break; 947 case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
905 case KW_body_wrist: slot[10].info = f.get_sint32 (); break; 948 case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
906 case KW_body_waist: slot[11].info = f.get_sint32 (); break; 949 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
907 case KW_can_apply: 950 case KW_can_apply:
908 break; 951 break;
909 952
910 case KW_connected: 953 case KW_connected:
911 add_button_link (this, map, f.get_sint32 ()); 954 add_button_link (this, map, f.get_sint32 ());
… …
926 randomitems = 0; 969 randomitems = 0;
927 break; 970 break;
928 971
929 case KW_msg: 972 case KW_msg:
930 f.get_ml (KW_endmsg, msg); 973 f.get_ml (KW_endmsg, msg);
931 //TODO: allow longer messages
932 if (strlen (msg) >= HUGE_BUF)
933 {
934 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
935 msg = "ERROR, please report: string too long, winged.\n";
936 }
937 break; 974 break;
938 975
939 case KW_lore: 976 case KW_lore:
940 f.get_ml (KW_endlore, lore); 977 f.get_ml (KW_endlore, lore);
941 //TODO: allow longer messages
942 /* Just print a warning so we can be reasonably safe
943 * about not overflowing the buffer.
944 */
945 if (strlen (lore) > (HUGE_BUF / 2))
946 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
947 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
948 break; 978 break;
949 979
950 case KW_editable: 980 case KW_editable:
951 case KW_editor_folder: 981 case KW_editor_folder:
952 break; 982 break;
953 983
954 case KW_end: 984 case KW_end:
955 check_loaded_object (this);
956
957 if (!loading_arch) 985 if (!loading_arch)
958 instantiate (); 986 instantiate ();
959 987
960 f.next (); 988 f.next ();
961 return true; 989 return true;
… …
993 f.next (); 1021 f.next ();
994 1022
995 object *op = object::create (); 1023 object *op = object::create ();
996 1024
997 op->map = map; 1025 op->map = map;
998 arch->clone.copy_to (op); 1026 arch->copy_to (op);
999 // copy_to activates, this should be fixed properly 1027 // copy_to activates, this should be fixed properly
1000 op->deactivate (); 1028 op->deactivate ();
1001 1029
1002 if (!op->parse_kv (f)) 1030 if (!op->parse_kv (f))
1003 { 1031 {
1004 op->destroy (true); 1032 op->destroy (true);
1005 return 0; 1033 return 0;
1006 } 1034 }
1007 1035
1036 op->post_load_check ();
1008 return op; 1037 return op;
1009} 1038}
1010 1039
1011/* This takes a buffer, scans it for variables, and sets those variables 1040/* This takes a buffer, scans it for variables, and sets those variables
1012 * as appropriate in op. 1041 * as appropriate in op.
… …
1017int 1046int
1018set_variable (object *op, char *buf) 1047set_variable (object *op, char *buf)
1019{ 1048{
1020 object_thawer f (buf, (AV *)0); 1049 object_thawer f (buf, (AV *)0);
1021 1050
1022 f.next ();
1023 return op->parse_kv (f); 1051 return op->parse_kv (f);
1024} 1052}
1025 1053
1026/* This returns a string of the integer movement type */ 1054/* This returns a string of the integer movement type */
1027#if 0 1055#if 0
… …
1089 * the 15'th element of this array should match that name. 1117 * the 15'th element of this array should match that name.
1090 * If an entry is NULL, that is a flag not to loaded/saved. 1118 * If an entry is NULL, that is a flag not to loaded/saved.
1091 */ 1119 */
1092 static const keyword flag_names [NUM_FLAGS] = { 1120 static const keyword flag_names [NUM_FLAGS] = {
1093 KW_alive, 1121 KW_alive,
1094 KW_wiz,
1095 KW_NULL, 1122 KW_NULL,
1096 KW_NULL, 1123 KW_NULL,
1097 KW_was_wiz, 1124 KW_NULL,
1125 KW_NULL,
1098 KW_applied, 1126 KW_applied,
1099 KW_unpaid, 1127 KW_unpaid,
1100 KW_can_use_shield, 1128 KW_can_use_shield,
1101 KW_no_pick, 1129 KW_no_pick,
1102 KW_NULL, // walk_on 1130 KW_NULL, // walk_on
… …
1233 1261
1234 /* We don't need to worry about the arch's extra fields - they 1262 /* We don't need to worry about the arch's extra fields - they
1235 * will get taken care of the copy_to method. 1263 * will get taken care of the copy_to method.
1236 */ 1264 */
1237 1265
1238 { 1266 f.put (KW_uuid, op->uuid.c_str ());
1239 char uids[64];
1240 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1241 f.put (KW_uuid, (const char *)uids);
1242 }
1243 1267
1244#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1268#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1245#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1269#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1270
1271 if (object *owner = op->owner)
1272 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1246 1273
1247 CMP_OUT (name); 1274 CMP_OUT (name);
1248 CMP_OUT (name_pl); 1275 CMP_OUT (name_pl);
1249 CMP_OUT (custom_name); 1276 CMP_OUT (custom_name);
1250 CMP_OUT (title); 1277 CMP_OUT (title);
1251 CMP_OUT (race); 1278 CMP_OUT (race);
1252 CMP_OUT (slaying); 1279 CMP_OUT (slaying);
1253 1280 CMP_OUT (tag);
1254 if (op->msg != tmp->msg)
1255 f.put (KW_msg, KW_endmsg, op->msg);
1256 if (op->lore != tmp->lore)
1257 f.put (KW_lore, KW_endlore, op->lore);
1258
1259 CMP_OUT (other_arch); 1281 CMP_OUT (other_arch);
1260 1282
1283 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1284 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1285
1261 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1286 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1287 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1288 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1262 1289
1263 if (op->animation_id != tmp->animation_id) 1290 if (op->animation_id != tmp->animation_id)
1264 if (op->animation_id) 1291 if (op->animation_id)
1265 { 1292 {
1266 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1293 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1267 1294
1268 if (!QUERY_FLAG (op, FLAG_ANIMATE)) 1295 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1269 f.put (KW_is_animated, (sint32) 0); 1296 f.put (KW_is_animated, (sint32)0);
1270 } 1297 }
1271 else 1298 else
1272 f.put (KW_animation, (const char *) 0); 1299 f.put (KW_animation, (const char *)0);
1273 1300
1274 CMP_OUT2 (str, stats.Str); 1301 CMP_OUT2 (str, stats.Str);
1275 CMP_OUT2 (dex, stats.Dex); 1302 CMP_OUT2 (dex, stats.Dex);
1276 CMP_OUT2 (con, stats.Con); 1303 CMP_OUT2 (con, stats.Con);
1277 CMP_OUT2 (wis, stats.Wis); 1304 CMP_OUT2 (wis, stats.Wis);
… …
1308 CMP_OUT (type); 1335 CMP_OUT (type);
1309 CMP_OUT (subtype); 1336 CMP_OUT (subtype);
1310 CMP_OUT (attacktype); 1337 CMP_OUT (attacktype);
1311 1338
1312 for (i = 0; i < NROFATTACKS; i++) 1339 for (i = 0; i < NROFATTACKS; i++)
1313 if (op->resist[i] != tmp->resist[i]) 1340 if (expect_false (op->resist[i] != tmp->resist[i]))
1314 f.put (resist_save[i], op->resist[i]); 1341 f.put (resist_save[i], op->resist[i]);
1315 1342
1316 CMP_OUT (path_attuned); 1343 CMP_OUT (path_attuned);
1317 CMP_OUT (path_repelled); 1344 CMP_OUT (path_repelled);
1318 CMP_OUT (path_denied); 1345 CMP_OUT (path_denied);
… …
1360 CMP_OUT (move_slow); 1387 CMP_OUT (move_slow);
1361 CMP_OUT (move_slow_penalty); 1388 CMP_OUT (move_slow_penalty);
1362 1389
1363 if (op->flag != tmp->flag) 1390 if (op->flag != tmp->flag)
1364 for (i = 0; i <= NUM_FLAGS; i++) 1391 for (i = 0; i <= NUM_FLAGS; i++)
1365 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1392 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1366 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1393 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1367 1394
1368 // save body locations 1395 // save body locations
1369 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1396 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1370 if (op->slot[i].info != tmp->slot[i].info) 1397 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1371 f.put (body_locations[i].save_name, op->slot[i].info); 1398 f.put (body_locations[i].save_name, op->slot[i].info);
1372} 1399}
1373 1400
1374/* 1401/*
1375 * Dumps all variables in an object to a file. 1402 * Dumps all variables in an object to a file.
… …
1377 * the only place this is not set is when saving the player. 1404 * the only place this is not set is when saving the player.
1378 */ 1405 */
1379bool 1406bool
1380object::write (object_freezer &f) 1407object::write (object_freezer &f)
1381{ 1408{
1382 /* Even if the object does have an owner, it would seem that we should 1409 archetype *at = arch ? arch : archetype::empty;
1383 * still save it.
1384 */
1385 if (owner)
1386 return true;
1387 1410
1388 archetype *at = arch ? (archetype *)arch : empty_archetype;
1389
1390 f.put (KW_arch, at->name); 1411 f.put (KW_arch, at->archname);
1391 write_diff (f, this, &at->clone); 1412 write_diff (f, this, at);
1392 1413
1393 for (object *tmp = inv; tmp; tmp = tmp->below) 1414 for (object *tmp = inv; tmp; tmp = tmp->below)
1394 tmp->write (f); 1415 tmp->write (f);
1395 1416
1396 f.put (this); 1417 f.put (this);
… …
1401 1422
1402///////////////////////////////////////////////////////////////////////////// 1423/////////////////////////////////////////////////////////////////////////////
1403 1424
1404// generic resource file load, 1425// generic resource file load,
1405// currently supports: region, treasures, archetypes 1426// currently supports: region, treasures, archetypes
1427bool
1406bool load_resource_file (const char *filename) 1428load_resource_file_ (const char *filename)
1407{ 1429{
1408 object_thawer f (filename); 1430 object_thawer f (filename);
1409
1410 bool success = false;
1411 bool seen_arch = false;
1412
1413 f.next ();
1414 1431
1415 for (;;) 1432 for (;;)
1416 { 1433 {
1417 switch (f.kw) 1434 switch (f.kw)
1418 { 1435 {
1419 case KW_region: 1436 case KW_region:
1420 if (!region::read (f)) 1437 if (!region::read (f))
1421 goto finish; 1438 return false;
1422 break; 1439 break;
1423 1440
1424 case KW_treasure: 1441 case KW_treasure:
1425 case KW_treasureone: 1442 case KW_treasureone:
1426 if (!treasurelist::read (f)) 1443 if (!treasurelist::read (f))
1427 goto finish; 1444 return false;
1428 break; 1445 break;
1429 1446
1430 case KW_object: 1447 case KW_object:
1431 seen_arch = true;
1432 if (!archetype::read (f)) 1448 if (!archetype::read (f))
1433 goto finish; 1449 return false;
1434 break; 1450 break;
1435 1451
1436 case KW_EOF: 1452 case KW_EOF:
1437 success = true; 1453 return true;
1438 goto finish;
1439 1454
1440 default: 1455 default:
1441 if (!f.parse_error ("resource file")) 1456 if (!f.parse_error ("resource file"))
1442 goto finish; 1457 return false;
1443 1458
1444 f.next (); 1459 f.next ();
1445 break; 1460 break;
1446 } 1461 }
1447 } 1462 }
1448
1449finish:
1450 if (seen_arch)
1451 init_archetype_pointers ();
1452
1453 return success;
1454} 1463}
1455 1464

Diff Legend

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