From dab72b45db77e9fbbb6f51d64ac61f38c9f734bb Mon Sep 17 00:00:00 2001
From: Grigorii Latyshev <grigorii.latyshev@cern.ch>
Date: Tue, 28 Nov 2017 23:14:57 +0100
Subject: [PATCH] Move mana reducing code back

---
 apps/openmw/mwmechanics/spellcasting.cpp | 5 -----
 apps/openmw/mwworld/worldimp.cpp         | 7 +++++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
index 19afc11ec..5cab750db 100644
--- a/apps/openmw/mwmechanics/spellcasting.cpp
+++ b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -889,11 +889,6 @@ namespace MWMechanics
                             MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicSkillFail}");
                         fail = true;
                     }
-
-                    // Reduce mana
-                    MWMechanics::DynamicStat<float> magicka = stats.getMagicka();
-                    magicka.setCurrent(magicka.getCurrent() - spell->mData.mCost);
-                    stats.setMagicka(magicka);
                 }
 
                 if (fail)
diff --git a/apps/openmw/mwworld/worldimp.cpp b/apps/openmw/mwworld/worldimp.cpp
index 83971eadf..9c7fba9fa 100644
--- a/apps/openmw/mwworld/worldimp.cpp
+++ b/apps/openmw/mwworld/worldimp.cpp
@@ -2718,6 +2718,13 @@ namespace MWWorld
                 message = "#{sPowerAlreadyUsed}";
                 fail = true;
             }
+
+            // Reduce mana
+            if (!fail && !godmode)
+            {
+                magicka.setCurrent(magicka.getCurrent() - spell->mData.mCost);
+                stats.setMagicka(magicka);
+            }
         }
 
         if (isPlayer && fail)