From: habu <habu@0568b783-4c39-0410-ac80-bf13821ea2a2>
Date: Wed, 6 Mar 2002 09:37:33 +0000 (+0000)
Subject: EGO_XTRA_* から art_flags への変換をz_older_than()で囲んだ。また、object_type.xtra1は現在全く使われてないのでその旨を... 
X-Git-Tag: v2.1.2~2440
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=92fbb2891adddd1124a2ac37653a4593ed535c48;p=hengband%2Fhengband.git

EGO_XTRA_* から art_flags への変換をz_older_than()で囲んだ。また、object_type.xtra1は現在全く使われてないのでその旨をコメントに書いた。
---

diff --git a/src/load.c b/src/load.c
index 48ba889c3..e87a0c133 100644
--- a/src/load.c
+++ b/src/load.c
@@ -351,23 +351,25 @@ static void rd_item(object_type *o_ptr)
 	rd_byte(&o_ptr->xtra1);
 	rd_byte(&o_ptr->xtra2);
 
-	if (o_ptr->xtra1 == EGO_XTRA_SUSTAIN)
+	if (z_older_than(11, 0, 10))
 	{
-		switch (o_ptr->xtra2 % 6)
+		if (o_ptr->xtra1 == EGO_XTRA_SUSTAIN)
 		{
+			switch (o_ptr->xtra2 % 6)
+			{
 			case 0: o_ptr->art_flags2 |= (TR2_SUST_STR); break;
 			case 1: o_ptr->art_flags2 |= (TR2_SUST_INT); break;
 			case 2: o_ptr->art_flags2 |= (TR2_SUST_WIS); break;
 			case 3: o_ptr->art_flags2 |= (TR2_SUST_DEX); break;
 			case 4: o_ptr->art_flags2 |= (TR2_SUST_CON); break;
 			case 5: o_ptr->art_flags2 |= (TR2_SUST_CHR); break;
+			}
+			o_ptr->xtra2 = 0;
 		}
-		o_ptr->xtra1 = o_ptr->xtra2 = 0;
-	}
-	else if (o_ptr->xtra1 == EGO_XTRA_POWER)
-	{
-		switch (o_ptr->xtra2 % 11)
+		else if (o_ptr->xtra1 == EGO_XTRA_POWER)
 		{
+			switch (o_ptr->xtra2 % 11)
+			{
 			case  0: o_ptr->art_flags2 |= (TR2_RES_BLIND);  break;
 			case  1: o_ptr->art_flags2 |= (TR2_RES_CONF);   break;
 			case  2: o_ptr->art_flags2 |= (TR2_RES_SOUND);  break;
@@ -379,13 +381,13 @@ static void rd_item(object_type *o_ptr)
 			case  8: o_ptr->art_flags2 |= (TR2_RES_POIS);   break;
 			case  9: o_ptr->art_flags2 |= (TR2_RES_DARK);   break;
 			case 10: o_ptr->art_flags2 |= (TR2_RES_LITE);   break;
-		}
-		o_ptr->xtra1 = o_ptr->xtra2 = 0;
-	}		
-	else if (o_ptr->xtra1 == EGO_XTRA_ABILITY)
-	{
-		switch (o_ptr->xtra2 % 8)
+			}
+			o_ptr->xtra2 = 0;
+		}		
+		else if (o_ptr->xtra1 == EGO_XTRA_ABILITY)
 		{
+			switch (o_ptr->xtra2 % 8)
+			{
 			case 0: o_ptr->art_flags3 |= (TR3_FEATHER);     break;
 			case 1: o_ptr->art_flags3 |= (TR3_LITE);        break;
 			case 2: o_ptr->art_flags3 |= (TR3_SEE_INVIS);   break;
@@ -394,8 +396,10 @@ static void rd_item(object_type *o_ptr)
 			case 5: o_ptr->art_flags3 |= (TR3_REGEN);       break;
 			case 6: o_ptr->art_flags2 |= (TR2_FREE_ACT);    break;
 			case 7: o_ptr->art_flags2 |= (TR2_HOLD_LIFE);   break;
+			}
+			o_ptr->xtra2 = 0;
 		}
-		o_ptr->xtra1 = o_ptr->xtra2 = 0;
+		o_ptr->xtra1 = 0;
 	}
 
 	if (z_older_than(10, 2, 3))
diff --git a/src/types.h b/src/types.h
index ed828a197..6d08df264 100644
--- a/src/types.h
+++ b/src/types.h
@@ -491,7 +491,7 @@ struct object_type
 	byte name1;			/* Artifact type, if any */
 	byte name2;			/* Ego-Item type, if any */
 
-	byte xtra1;			/* Extra info type */
+	byte xtra1;			/* Extra info type (now unused) */
 	byte xtra2;			/* Extra info index */
 	byte xtra3;			/* Extra info */
 	s16b xtra4;			/* Extra info */