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.80 by root, Sat May 12 16:06:41 2007 UTC vs.
Revision 1.82 by root, Thu May 17 14:14:54 2007 UTC

266 { 266 {
267 case BOW: 267 case BOW:
268 case WAND: 268 case WAND:
269 case ROD: 269 case ROD:
270 case HORN: 270 case HORN:
271 case SKILL_TOOL:
272 if (slot [body_range].info != -1) 271 if (slot [body_range].info != -1)
273 { 272 {
274 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); 273 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
275 slot [body_range].info = -1; 274 slot [body_range].info = -1;
276 } 275 }
767 GET_FLAG (this, FLAG_IDENTIFIED); 766 GET_FLAG (this, FLAG_IDENTIFIED);
768 //TODO: move to check_object or so 767 //TODO: move to check_object or so
769 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 768 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
770 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 769 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
771 770
772 break;
773
774 case KW_wiz:
775 GET_FLAG (this, FLAG_WIZ);
776 //TODO: move to check_object
777 if (QUERY_FLAG (this, FLAG_WIZ))
778 {
779 SET_FLAG (this, FLAG_WAS_WIZ);
780 SET_FLAG (this, FLAG_WIZPASS);
781 SET_FLAG (this, FLAG_WIZCAST);
782 }
783 else
784 {
785 CLEAR_FLAG (this, FLAG_WIZPASS);
786 CLEAR_FLAG (this, FLAG_WIZCAST);
787 }
788 break; 771 break;
789 772
790 case KW_friendly: 773 case KW_friendly:
791 if (f.get_sint32 ()) 774 if (f.get_sint32 ())
792 if (type != PLAYER) 775 if (type != PLAYER)
825 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 808 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
826 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 809 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
827 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 810 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
828 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 811 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
829 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 812 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
830 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
831 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; 813 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
832 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 814 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
833 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 815 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
834 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 816 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
835 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 817 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
1135 * the 15'th element of this array should match that name. 1117 * the 15'th element of this array should match that name.
1136 * 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.
1137 */ 1119 */
1138 static const keyword flag_names [NUM_FLAGS] = { 1120 static const keyword flag_names [NUM_FLAGS] = {
1139 KW_alive, 1121 KW_alive,
1140 KW_wiz,
1141 KW_NULL, 1122 KW_NULL,
1142 KW_NULL, 1123 KW_NULL,
1143 KW_was_wiz, 1124 KW_NULL,
1125 KW_NULL,
1144 KW_applied, 1126 KW_applied,
1145 KW_unpaid, 1127 KW_unpaid,
1146 KW_can_use_shield, 1128 KW_can_use_shield,
1147 KW_no_pick, 1129 KW_no_pick,
1148 KW_NULL, // walk_on 1130 KW_NULL, // walk_on

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines