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.115 by root, Sun May 4 19:14:23 2008 UTC vs.
Revision 1.122 by root, Mon Sep 15 00:16:19 2008 UTC

… …
385 if (ip > 2 * item_power && ip > (item_power + 3)) 385 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); 386 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
387#endif 387#endif
388 } 388 }
389 389
390 /* Old spellcasting object - need to load in the appropiate object */ 390 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
391 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 391 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
392 if ((type == ROD
393 || type == WAND
394 || type == SCROLL
395 || type == HORN
396 || type == FIREWALL
392 /* 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 */
393 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 398 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
399 && !inv
400 && !loading_arch
401 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
402 // TODO: at least one watchout-comments is redundant - investigate/remove
394 { 403 {
404 // TODO: fix firewall object on map
395 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' 405 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
396 * in that spell was stored in sp. 406 * in that spell was stored in sp.
397 */ 407 */
398 LOG (llevError, "old spellcasting object found: %s", debug_desc ()); 408 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
399 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 409 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
400 insert_ob_in_ob (tmp, this); 410 insert_ob_in_ob (tmp, this);
401 randomitems = NULL; /* So another spell isn't created for this object */ 411 randomitems = 0;
402 } 412 }
403 413
404 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 414 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
405 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 415 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
406 { 416 {
… …
550 case KW_race: f.get_ornull (race); break; 560 case KW_race: f.get_ornull (race); break;
551 case KW_slaying: f.get_ornull (slaying); break; 561 case KW_slaying: f.get_ornull (slaying); break;
552 case KW_tag: f.get_ornull (tag); break; 562 case KW_tag: f.get_ornull (tag); break;
553 563
554 case KW_arch: 564 case KW_arch:
555 {
556 object *tmp = object::read (f); 565 if (object *tmp = object::read (f))
557 tmp->deactivate ();
558
559 { 566 {
567 tmp->deactivate ();
568
560 // was: insert_ob_in_ob (tmp, op); 569 // was: insert_ob_in_ob (tmp, op);
561 // but manually adding it can improve map loading times a lot 570 // but manually adding it can improve map loading times a lot
562 // also, appending instead of prepending keeps the 571 // also, appending instead of prepending keeps the
563 // save ordering the same between repeated load/saves. 572 // save ordering the same between repeated load/saves.
564 // and finally we do not want any funny effects 573 // and finally we do not want any funny effects
… …
581 590
582 tmp->below = 0; 591 tmp->below = 0;
583 tmp->env = this; 592 tmp->env = this;
584 op_inv = tmp; 593 op_inv = tmp;
585 } 594 }
586 } 595 else
596 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
597
587 continue; 598 continue;
588 599
589 case KW_other_arch: 600 case KW_other_arch:
590 if (loading_arch == this) 601 if (loading_arch == this)
591 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); 602 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
… …
607 CLEAR_FLAG (this, FLAG_ANIMATE); 618 CLEAR_FLAG (this, FLAG_ANIMATE);
608 animation_id = 0; 619 animation_id = 0;
609 620
610 const char *str = f.get_str (); 621 const char *str = f.get_str ();
611 if (str && (animation_id = find_animation (str))) 622 if (str && (animation_id = find_animation (str)))
612 SET_FLAG (this, FLAG_ANIMATE); 623 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
613 } 624 }
614 break; 625 break;
615 626
616 case KW_last_heal: f.get (last_heal); break; 627 case KW_last_heal: f.get (last_heal); break;
617 case KW_last_sp: f.get (last_sp); break; 628 case KW_last_sp: f.get (last_sp); break;
… …
921 case KW_expmul: f.get (expmul); break; 932 case KW_expmul: f.get (expmul); break;
922 case KW_glow_radius: f.get (glow_radius); break; 933 case KW_glow_radius: f.get (glow_radius); break;
923 case KW_weapontype: f.get (weapontype); break; 934 case KW_weapontype: f.get (weapontype); break;
924 case KW_tooltype: f.get (tooltype); break; 935 case KW_tooltype: f.get (tooltype); break;
925 case KW_casting_time: f.get (casting_time); break; 936 case KW_casting_time: f.get (casting_time); break;
937
938 // elevation is deprecated
926 case KW_elevation: f.get (elevation); break; 939 case KW_elevation: break;
940
927 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 941 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
928 case KW_client_type: f.get (client_type); break; 942 case KW_client_type: f.get (client_type); break;
929 case KW_duration: f.get (duration); break; 943 case KW_duration: f.get (duration); break;
930 case KW_range: f.get (range); break; 944 case KW_range: f.get (range); break;
931 case KW_range_modifier: f.get (range_modifier); break; 945 case KW_range_modifier: f.get (range_modifier); break;
… …
1298 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1312 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1299 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1313 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1300 1314
1301 if (op->animation_id != tmp->animation_id) 1315 if (op->animation_id != tmp->animation_id)
1302 if (op->animation_id) 1316 if (op->animation_id)
1317 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1318 else
1303 { 1319 {
1304 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1320 f.put (KW_animation, (const char *)0);
1305 1321 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1306 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1307 f.put (KW_is_animated, (sint32)0);
1308 } 1322 }
1309 else
1310 f.put (KW_animation, (const char *)0);
1311 1323
1312 CMP_OUT2 (str, stats.Str); 1324 CMP_OUT2 (str, stats.Str);
1313 CMP_OUT2 (dex, stats.Dex); 1325 CMP_OUT2 (dex, stats.Dex);
1314 CMP_OUT2 (con, stats.Con); 1326 CMP_OUT2 (con, stats.Con);
1315 CMP_OUT2 (wis, stats.Wis); 1327 CMP_OUT2 (wis, stats.Wis);
… …
1379 CMP_OUT (pick_up); 1391 CMP_OUT (pick_up);
1380 CMP_OUT (will_apply); 1392 CMP_OUT (will_apply);
1381 CMP_OUT (smoothlevel); 1393 CMP_OUT (smoothlevel);
1382 CMP_OUT (weapontype); 1394 CMP_OUT (weapontype);
1383 CMP_OUT (tooltype); 1395 CMP_OUT (tooltype);
1384 CMP_OUT (elevation);
1385 CMP_OUT (client_type); 1396 CMP_OUT (client_type);
1386 CMP_OUT (item_power); 1397 CMP_OUT (item_power);
1387 CMP_OUT (duration); 1398 CMP_OUT (duration);
1388 CMP_OUT (range); 1399 CMP_OUT (range);
1389 CMP_OUT (range_modifier); 1400 CMP_OUT (range_modifier);

Diff Legend

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