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.81 by root, Mon May 14 21:32:26 2007 UTC vs.
Revision 1.85 by root, Sat May 26 15:44:02 2007 UTC

… …
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 if (type >= NUM_TYPES)
266 {
267 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ());
268 type = 0;
269 }
270
265 switch (type) 271 switch (type)
266 { 272 {
267 case BOW: 273 case BOW:
268 case WAND: 274 case WAND:
269 case ROD: 275 case ROD:
… …
378 * 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
379 * 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.
380 * 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,
381 * but not the second one. 387 * but not the second one.
382 */ 388 */
389#if 0 //TODO
383 if (ip > 2 * item_power && ip > (item_power + 3)) 390 if (ip > 2 * item_power && ip > (item_power + 3))
384 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
385 } 393 }
386 394
387 /* Old spellcasting object - need to load in the appropiate object */ 395 /* Old spellcasting object - need to load in the appropiate object */
388 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 396 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL ||
389 /* 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 */
… …
509 517
510next: ; 518next: ;
511 } 519 }
512} 520}
513 521
514#define GET_FLAG(op,flag) \ 522#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
515 if (f.get_sint32 ()) \
516 SET_FLAG (op, flag); \
517 else \
518 CLEAR_FLAG (op, flag) \
519 523
520bool 524bool
521object::parse_kv (object_thawer &f) 525object::parse_kv (object_thawer &f)
522{ 526{
523 object *op_inv = inv; 527 object *op_inv = inv;
… …
768 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 772 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
769 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 773 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
770 774
771 break; 775 break;
772 776
773 case KW_wiz:
774 GET_FLAG (this, FLAG_WIZ);
775 //TODO: move to check_object
776 if (QUERY_FLAG (this, FLAG_WIZ))
777 {
778 SET_FLAG (this, FLAG_WAS_WIZ);
779 SET_FLAG (this, FLAG_WIZPASS);
780 SET_FLAG (this, FLAG_WIZCAST);
781 }
782 else
783 {
784 CLEAR_FLAG (this, FLAG_WIZPASS);
785 CLEAR_FLAG (this, FLAG_WIZCAST);
786 }
787 break;
788
789 case KW_friendly: 777 case KW_friendly:
790 if (f.get_sint32 ()) 778 if (f.get_bool ())
791 if (type != PLAYER) 779 if (type != PLAYER)
792 add_friendly_object (this); 780 add_friendly_object (this);
793 781
794 break; 782 break;
795 783
… …
824 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 812 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
825 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 813 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
826 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 814 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
827 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 815 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
828 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 816 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
829 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
830 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;
831 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 818 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
832 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 819 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
833 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;
834 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;
… …
1134 * the 15'th element of this array should match that name. 1121 * the 15'th element of this array should match that name.
1135 * 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.
1136 */ 1123 */
1137 static const keyword flag_names [NUM_FLAGS] = { 1124 static const keyword flag_names [NUM_FLAGS] = {
1138 KW_alive, 1125 KW_alive,
1139 KW_wiz,
1140 KW_NULL, 1126 KW_NULL,
1141 KW_NULL, 1127 KW_NULL,
1142 KW_was_wiz, 1128 KW_NULL,
1129 KW_NULL,
1143 KW_applied, 1130 KW_applied,
1144 KW_unpaid, 1131 KW_unpaid,
1145 KW_can_use_shield, 1132 KW_can_use_shield,
1146 KW_no_pick, 1133 KW_no_pick,
1147 KW_NULL, // walk_on 1134 KW_NULL, // walk_on

Diff Legend

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