Changeset 1449 for trunk

Timestamp:

06/22/09 20:13:18 (15 months ago)

Author:

ajps

Message:

Move the check for low mana when casting spells back into the 'effect' code from the 'UI'. What was I thinking?

Location:

trunk/src

Files:

• cmd-obj.c (modified) (2 diffs)
• cmd5.c (modified) (3 diffs)

trunk/src/cmd-obj.c

@@ -401 +401 @@
 static void obj_cast(object_type *o_ptr, int item)
 {
-        int spell;
-        const magic_type *s_ptr;
-        int dir;
+        int spell, dir;
 
         cptr verb = ((cp_ptr->spell_book == TV_MAGIC_BOOK) ? "cast" : "recite");
-    cptr noun = ((cp_ptr->spell_book == TV_MAGIC_BOOK) ? "spell" : "prayer");
+        cptr noun = ((cp_ptr->spell_book == TV_MAGIC_BOOK) ? "spell" : "prayer");
 
         /* Track the object kind */
@@ -418 +416 @@
                 if (spell == -2) msg_format("You don't know any %ss in that book.", noun);
                 return;
-        }
-
-        /* Get the spell */
-        s_ptr = &mp_ptr->info[spell];
-        
-        /* Verify "dangerous" spells */
-        if (s_ptr->smana > p_ptr->csp)
-        {
-                /* Warning */
-                msg_format("You do not have enough mana to %s this %s.", verb, noun);
-                
-                /* Flush input */
-                flush();
-                
-                /* Verify */
-                if (!get_check("Attempt it anyway? ")) return;
         }
 

trunk/src/cmd5.c

@@ -569 +569 @@
         int i;
 
-        cptr p = ((cp_ptr->spell_book == TV_MAGIC_BOOK) ? "spell" : "prayer");
+        cptr verb = ((cp_ptr->spell_book == TV_MAGIC_BOOK) ? "cast" : "recite");
+    cptr noun = ((cp_ptr->spell_book == TV_MAGIC_BOOK) ? "spell" : "prayer");
 
         /* Check the player can cast spells at all */
@@ -586 +587 @@
                         if (spell_okay(spell, TRUE, FALSE))
                         {
+                                /* Get the spell */
+                                const magic_type *s_ptr = &mp_ptr->info[spell]; 
+                                
+                                /* Verify "dangerous" spells */
+                                if (s_ptr->smana > p_ptr->csp)
+                                {
+                                        /* Warning */
+                                        msg_format("You do not have enough mana to %s this %s.", verb, noun);
+                                        
+                                        /* Flush input */
+                                        flush();
+                                        
+                                        /* Verify */
+                                        if (!get_check("Attempt it anyway? ")) return;
+                                }
+
                                 /* Cast a spell */
                                 if (spell_cast(spell, dir))
@@ -593 +610 @@
                         {
                                 /* Spell is present, but player incapable. */
-                                msg_format("You cannot cast that %p.", p);
+                                msg_format("You cannot %s that %s.", verb, noun);
                         }