OSDN Git Service

アリーナで、くさび だけを投げられるようにした。
authormogami <mogami@0568b783-4c39-0410-ac80-bf13821ea2a2>
Fri, 17 May 2002 20:11:20 +0000 (20:11 +0000)
committermogami <mogami@0568b783-4c39-0410-ac80-bf13821ea2a2>
Fri, 17 May 2002 20:11:20 +0000 (20:11 +0000)
src/cmd2.c
src/dungeon.c

index 16b07d6..64c7da7 100644 (file)
@@ -4129,11 +4129,25 @@ bool do_cmd_throw_aux(int mult, bool boomerang, int shuriken)
                msg_print("Hmmm, it seems to be cursed.");
 #endif
 
-
                /* Nope */
                return FALSE;
        }
 
+       if (p_ptr->inside_arena)
+       {
+               if (o_ptr->tval != 5)
+               {
+#ifdef JP
+                       msg_print("¥¢¥ê¡¼¥Ê¤Ç¤Ï¥¢¥¤¥Æ¥à¤ò»È¤¨¤Ê¤¤¡ª");
+#else
+                       msg_print("You're in the arena now. This is hand-to-hand!");
+#endif
+                       msg_print(NULL);
+
+                       /* Nope */
+                       return FALSE;
+               }
+       }
 
        /* Get local object */
        q_ptr = &forge;
index 7c811c4..ded519f 100644 (file)
@@ -4523,18 +4523,7 @@ msg_print("
                {
                        if (!p_ptr->wild_mode)
                        {
-                       if (!p_ptr->inside_arena)
                                do_cmd_throw();
-                       else
-                       {
-#ifdef JP
-msg_print("¥¢¥ê¡¼¥Ê¤Ç¤Ï¥¢¥¤¥Æ¥à¤ò»È¤¨¤Ê¤¤¡ª");
-#else
-                               msg_print("You're in the arena now. This is hand-to-hand!");
-#endif
-
-                               msg_print(NULL);
-                       }
                        }
                        break;
                }