Merge branch 'master' into pinned since added PR #1250

apps/opencs/CMakeLists.txt

@@ -70,6 +70,7 @@ opencs_units (view/world
     cellcreator pathgridcreator referenceablecreator startscriptcreator referencecreator scenesubview
     infocreator scriptedit dialoguesubview previewsubview regionmap dragrecordtable nestedtable
     dialoguespinbox recordbuttonbar tableeditidaction scripterrortable extendedcommandconfigurator
+    bodypartcreator
     )
 
 opencs_units_noqt (view/world

apps/opencs/view/render/cameracontroller.cpp

@@ -632,7 +632,7 @@ namespace CSVRender
         getCamera()->getViewMatrix().orthoNormal(getCamera()->getViewMatrix());
     }
 
-    void OrbitCameraController::onActivate()
+    void OrbitCameraController::reset()
     {
         mInitialized = false;
     }

apps/opencs/view/render/cameracontroller.hpp

@@ -63,8 +63,6 @@ namespace CSVRender
 
         protected:
 
-            virtual void onActivate(){}
-
             void addShortcut(CSMPrefs::Shortcut* shortcut);
 
         private:
@@ -159,9 +157,10 @@ namespace CSVRender
 
             void update(double dt);
 
-        private:
+            /// \brief Flag controller to be re-initialized.
+            void reset();
 
-            void onActivate();
+        private:
 
             void initialize();
 

apps/opencs/view/render/unpagedworldspacewidget.cpp

@@ -15,6 +15,7 @@
 #include "../widget/scenetooltoggle.hpp"
 #include "../widget/scenetooltoggle2.hpp"
 
+#include "cameracontroller.hpp"
 #include "mask.hpp"
 #include "tagbase.hpp"
 
@@ -92,6 +93,8 @@ bool CSVRender::UnpagedWorldspaceWidget::handleDrop (const std::vector<CSMWorld:
     mCellId = universalIdData.begin()->getId();
 
     mCell.reset (new Cell (getDocument().getData(), mRootNode, mCellId));
+    mCamPositionSet = false;
+    mOrbitCamControl->reset();
 
     update();
     emit cellChanged(*universalIdData.begin());

apps/opencs/view/world/bodypartcreator.cpp

@@ -0,0 +1,54 @@
+#include "bodypartcreator.hpp"
+
+#include <QCheckBox>
+
+#include "../../model/world/data.hpp"
+#include "../../model/world/universalid.hpp"
+
+std::string CSVWorld::BodyPartCreator::getId() const
+{
+    std::string id = CSVWorld::GenericCreator::getId();
+
+    if (mFirstPerson->isChecked())
+    {
+        id += ".1st";
+    }
+
+    return id;
+}
+
+CSVWorld::BodyPartCreator::BodyPartCreator(
+    CSMWorld::Data& data,
+    QUndoStack& undoStack,
+    const CSMWorld::UniversalId& id
+) : GenericCreator(data, undoStack, id)
+{
+    mFirstPerson = new QCheckBox("First Person", this);
+    insertBeforeButtons(mFirstPerson, false);
+
+    connect(mFirstPerson, SIGNAL(clicked(bool)), this, SLOT(checkboxClicked()));
+}
+
+std::string CSVWorld::BodyPartCreator::getErrors() const
+{
+    std::string errors;
+
+    std::string id = getId();
+    if (getData().hasId(id))
+    {
+        errors = "ID is already in use";
+    }
+
+    return errors;
+}
+
+void CSVWorld::BodyPartCreator::reset()
+{
+    CSVWorld::GenericCreator::reset();
+    mFirstPerson->setChecked(false);
+}
+
+void CSVWorld::BodyPartCreator::checkboxClicked()
+{
+    update();
+}

apps/opencs/view/world/bodypartcreator.hpp

@@ -0,0 +1,47 @@
+#ifndef BODYPARTCREATOR_HPP
+#define BODYPARTCREATOR_HPP
+
+class QCheckBox;
+
+#include "genericcreator.hpp"
+
+namespace CSMWorld
+{
+    class Data;
+    class UniversalId;
+}
+
+namespace CSVWorld
+{
+    /// \brief Record creator for body parts.
+    class BodyPartCreator : public GenericCreator
+    {
+        Q_OBJECT
+
+        QCheckBox *mFirstPerson;
+
+        private:
+
+            /// \return ID entered by user.
+            virtual std::string getId() const;
+
+        public:
+
+            BodyPartCreator(
+                CSMWorld::Data& data,
+                QUndoStack& undoStack,
+                const CSMWorld::UniversalId& id);
+
+            /// \return Error description for current user input.
+            virtual std::string getErrors() const;
+
+            /// \brief Clear ID and checkbox input widgets.
+            virtual void reset();
+
+        private slots:
+
+            void checkboxClicked();
+    };
+}
+
+#endif // BODYPARTCREATOR_HPP

apps/opencs/view/world/infocreator.cpp

@@ -45,14 +45,20 @@ CSVWorld::InfoCreator::InfoCreator (CSMWorld::Data& data, QUndoStack& undoStack,
     const CSMWorld::UniversalId& id, CSMWorld::IdCompletionManager& completionManager)
 : GenericCreator (data, undoStack, id)
 {
-    QLabel *label = new QLabel ("Topic", this);
-    insertBeforeButtons (label, false);
-
+    // Determine if we're dealing with topics or journals.
     CSMWorld::ColumnBase::Display displayType = CSMWorld::ColumnBase::Display_Topic;
+    QString labelText = "Topic";
     if (getCollectionId().getType() == CSMWorld::UniversalId::Type_JournalInfos)
     {
         displayType = CSMWorld::ColumnBase::Display_Journal;
+        labelText = "Journal";
     }
+
+    QLabel *label = new QLabel (labelText, this);
+    insertBeforeButtons (label, false);
+
+    // Add topic/journal ID input with auto-completion.
+    // Only existing topic/journal IDs are accepted so no ID validation is performed.
     mTopic = new CSVWidget::DropLineEdit(displayType, this);
     mTopic->setCompleter(completionManager.getCompleter(displayType).get());
     insertBeforeButtons (mTopic, true);

apps/opencs/view/world/pathgridcreator.cpp

@@ -10,7 +10,6 @@
 #include "../../model/world/idtable.hpp"
 
 #include "../widget/droplineedit.hpp"
-#include "idvalidator.hpp"
 
 std::string CSVWorld::PathgridCreator::getId() const
 {
@@ -28,20 +27,19 @@ CSVWorld::PathgridCreator::PathgridCreator(
     CSMWorld::Data& data,
     QUndoStack& undoStack,
     const CSMWorld::UniversalId& id,
-    CSMWorld::IdCompletionManager& completionManager,
-    bool relaxedIdRules
-) : GenericCreator(data, undoStack, id, relaxedIdRules)
+    CSMWorld::IdCompletionManager& completionManager
+) : GenericCreator(data, undoStack, id)
 {
     setManualEditing(false);
 
-    QLabel *label = new QLabel("Cell ID", this);
+    QLabel *label = new QLabel("Cell", this);
     insertBeforeButtons(label, false);
 
     // Add cell ID input with auto-completion.
+    // Only existing cell IDs are accepted so no ID validation is performed.
     CSMWorld::ColumnBase::Display displayType = CSMWorld::ColumnBase::Display_Cell;
     mCell = new CSVWidget::DropLineEdit(displayType, this);
     mCell->setCompleter(completionManager.getCompleter(displayType).get());
-    mCell->setValidator(new IdValidator(relaxedIdRules, this));
     insertBeforeButtons(mCell, true);
 
     connect(mCell, SIGNAL (textChanged(const QString&)), this, SLOT (cellChanged()));
@@ -65,8 +63,6 @@ std::string CSVWorld::PathgridCreator::getErrors() const
     std::string cellId = getId();
 
     // Check user input for any errors.
-    // The last two checks, cell with existing pathgrid and non-existent cell,
-    // shouldn't be needed but we absolutely want to make sure they never happen.
     std::string errors;
     if (cellId.empty())
     {

apps/opencs/view/world/pathgridcreator.hpp

@@ -44,8 +44,7 @@ namespace CSVWorld
                 CSMWorld::Data& data,
                 QUndoStack& undoStack,
                 const CSMWorld::UniversalId& id,
-                CSMWorld::IdCompletionManager& completionManager,
-                bool relaxedIdRules = false);
+                CSMWorld::IdCompletionManager& completionManager);
 
             /// \brief Set cell ID input widget to ID of record to be cloned.
             /// \param originId Cell ID to be cloned.

apps/opencs/view/world/referencecreator.cpp

@@ -35,6 +35,8 @@ CSVWorld::ReferenceCreator::ReferenceCreator (CSMWorld::Data& data, QUndoStack&
     QLabel *label = new QLabel ("Cell", this);
     insertBeforeButtons (label, false);
 
+    // Add cell ID input with auto-completion.
+    // Only existing cell IDs are accepted so no ID validation is performed.
     mCell = new CSVWidget::DropLineEdit(CSMWorld::ColumnBase::Display_Cell, this);
     mCell->setCompleter(completionManager.getCompleter(CSMWorld::ColumnBase::Display_Cell).get());
     insertBeforeButtons (mCell, true);

apps/opencs/view/world/startscriptcreator.cpp

@@ -29,15 +29,16 @@ CSVWorld::StartScriptCreator::StartScriptCreator(
     QUndoStack &undoStack,
     const CSMWorld::UniversalId &id,
     CSMWorld::IdCompletionManager& completionManager
-) : GenericCreator(data, undoStack, id, true)
+) : GenericCreator(data, undoStack, id)
 {
     setManualEditing(false);
 
     // Add script ID input label.
-    QLabel *label = new QLabel("Script ID", this);
+    QLabel *label = new QLabel("Script", this);
     insertBeforeButtons(label, false);
 
     // Add script ID input with auto-completion.
+    // Only existing script IDs are accepted so no ID validation is performed.
     CSMWorld::ColumnBase::Display displayType = CSMWorld::ColumnBase::Display_Script;
     mScript = new CSVWidget::DropLineEdit(displayType, this);
     mScript->setCompleter(completionManager.getCompleter(displayType).get());

apps/opencs/view/world/subviews.cpp

@@ -17,6 +17,7 @@
 #include "infocreator.hpp"
 #include "pathgridcreator.hpp"
 #include "previewsubview.hpp"
+#include "bodypartcreator.hpp"
 
 void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
 {
@@ -41,7 +42,6 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
         CSMWorld::UniversalId::Type_Birthsigns,
         CSMWorld::UniversalId::Type_Spells,
         CSMWorld::UniversalId::Type_Enchantments,
-        CSMWorld::UniversalId::Type_BodyParts,
         CSMWorld::UniversalId::Type_SoundGens,
 
         CSMWorld::UniversalId::Type_None // end marker
@@ -51,6 +51,9 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
         manager.add (sTableTypes[i],
             new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<GenericCreator> >);
 
+    manager.add (CSMWorld::UniversalId::Type_BodyParts,
+        new CSVDoc::SubViewFactoryWithCreator<TableSubView, CreatorFactory<BodyPartCreator> >);
+
     manager.add (CSMWorld::UniversalId::Type_StartScripts,
         new CSVDoc::SubViewFactoryWithCreator<TableSubView, StartScriptCreatorFactory>);
 
@@ -129,7 +132,6 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
         CSMWorld::UniversalId::Type_Sound,
         CSMWorld::UniversalId::Type_Faction,
         CSMWorld::UniversalId::Type_Enchantment,
-        CSMWorld::UniversalId::Type_BodyPart,
         CSMWorld::UniversalId::Type_SoundGen,
 
         CSMWorld::UniversalId::Type_None // end marker
@@ -140,6 +142,9 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
             new CSVDoc::SubViewFactoryWithCreator<DialogueSubView,
             CreatorFactory<GenericCreator> > (false));
 
+    manager.add (CSMWorld::UniversalId::Type_BodyPart,
+        new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, CreatorFactory<BodyPartCreator> > (false));
+
     manager.add (CSMWorld::UniversalId::Type_StartScript,
         new CSVDoc::SubViewFactoryWithCreator<DialogueSubView, StartScriptCreatorFactory>(false));
 

apps/openmw/mwclass/creature.cpp

@@ -323,6 +323,9 @@ namespace MWClass
         if (MWMechanics::blockMeleeAttack(ptr, victim, weapon, damage, attackStrength))
             damage = 0;
 
+        if (victim == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState())
+            damage = 0;
+
         MWMechanics::diseaseContact(victim, ptr);
 
         victim.getClass().onHit(victim, damage, healthdmg, weapon, ptr, hitPosition, true);
@@ -371,6 +374,11 @@ namespace MWClass
                 ptr.getRefData().getLocals().setVarByInt(script, "onpchitme", 1);
         }
 
+        bool godmode = object == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
+
+        if (godmode)
+            damage = 0;
+
         if (!successful)
         {
             // Missed
@@ -405,7 +413,7 @@ namespace MWClass
 
             if(ishealth)
             {
-                if (!attacker.isEmpty())
+                if (!attacker.isEmpty() && !godmode)
                 {
                     damage = scaleDamage(damage, attacker, ptr);
                     MWBase::Environment::get().getWorld()->spawnBloodEffect(ptr, hitPosition);

apps/openmw/mwclass/npc.cpp

@@ -651,6 +651,9 @@ namespace MWClass
         if (MWMechanics::blockMeleeAttack(ptr, victim, weapon, damage, attackStrength))
             damage = 0;
 
+        if (victim == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState())
+            damage = 0;
+
         MWMechanics::diseaseContact(victim, ptr);
 
         othercls.onHit(victim, damage, healthdmg, weapon, ptr, hitPosition, true);
@@ -717,6 +720,11 @@ namespace MWClass
         if (damage < 0.001f)
             damage = 0;
 
+        bool godmode = ptr == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
+
+        if (godmode)
+            damage = 0;
+
         if (damage > 0.0f && !attacker.isEmpty())
         {
             // 'ptr' is losing health. Play a 'hit' voiced dialog entry if not already saying
@@ -802,7 +810,7 @@ namespace MWClass
 
         if (ishealth)
         {
-            if (!attacker.isEmpty())
+            if (!attacker.isEmpty() && !godmode)
                 damage = scaleDamage(damage, attacker, ptr);
 
             if (damage > 0.0f)

apps/openmw/mwgui/mapwindow.cpp

@@ -777,6 +777,12 @@ namespace MWGui
         mLastScrollWindowCoordinates = currentCoordinates;
     }
 
+    void MapWindow::setVisible(bool visible)
+    {
+        WindowBase::setVisible(visible);
+        mButton->setVisible(visible && MWBase::Environment::get().getWindowManager()->isGuiMode());
+    }
+
     void MapWindow::renderGlobalMap()
     {
         mGlobalMapRender->render();

apps/openmw/mwgui/mapwindow.hpp

@@ -204,6 +204,7 @@ namespace MWGui
         void setCellName(const std::string& cellName);
 
         virtual void setAlpha(float alpha);
+        void setVisible(bool visible);
 
         void renderGlobalMap();
 

apps/openmw/mwgui/recharge.cpp

@@ -12,6 +12,7 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/soundmanager.hpp"
 
 #include "../mwworld/containerstore.hpp"
 #include "../mwworld/class.hpp"
@@ -137,10 +138,16 @@ void Recharge::onItemClicked(MyGUI::Widget *sender, const MWWorld::Ptr& item)
         item.getCellRef().setEnchantmentCharge(
             std::min(item.getCellRef().getEnchantmentCharge() + restored, static_cast<float>(enchantment->mData.mCharge)));
 
+        MWBase::Environment::get().getSoundManager()->playSound("Enchant Success",1,1);
+
         player.getClass().getContainerStore(player).restack(item);
 
         player.getClass().skillUsageSucceeded (player, ESM::Skill::Enchant, 0);
     }
+    else
+    {
+        MWBase::Environment::get().getSoundManager()->playSound("Enchant Fail",1,1);
+    }
 
     gem.getContainerStore()->remove(gem, 1, player);
 

apps/openmw/mwgui/repair.cpp

@@ -11,6 +11,7 @@
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
 #include "../mwbase/windowmanager.hpp"
+#include "../mwbase/soundmanager.hpp"
 
 #include "../mwmechanics/actorutil.hpp"
 
@@ -62,6 +63,8 @@ void Repair::exit()
 
 void Repair::startRepairItem(const MWWorld::Ptr &item)
 {
+    MWBase::Environment::get().getSoundManager()->playSound("Item Repair Up",1,1);
+
     mRepair.setTool(item);
 
     mToolIcon->setItem(item);

apps/openmw/mwmechanics/actors.cpp

@@ -815,7 +815,10 @@ namespace MWMechanics
                     timeLeft = 0.0f;
                 stats.setTimeToStartDrowning(timeLeft);
             }
-            if(timeLeft == 0.0f)
+
+            bool godmode = ptr == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
+
+            if(timeLeft == 0.0f && !godmode)
             {
                 // If drowning, apply 3 points of damage per second
                 static const float fSuffocationDamage = world->getStore().get<ESM::GameSetting>().find("fSuffocationDamage")->getFloat();

apps/openmw/mwmechanics/character.cpp

@@ -1574,6 +1574,8 @@ void CharacterController::update(float duration)
 
     updateMagicEffects();
 
+    bool godmode = mPtr == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
+
     if(!cls.isActor())
         updateAnimQueue();
     else if(!cls.getCreatureStats(mPtr).isDead())
@@ -1691,8 +1693,12 @@ void CharacterController::update(float duration)
         }
         fatigueLoss *= duration;
         DynamicStat<float> fatigue = cls.getCreatureStats(mPtr).getFatigue();
-        fatigue.setCurrent(fatigue.getCurrent() - fatigueLoss, fatigue.getCurrent() < 0);
-        cls.getCreatureStats(mPtr).setFatigue(fatigue);
+
+        if (!godmode)
+        {
+            fatigue.setCurrent(fatigue.getCurrent() - fatigueLoss, fatigue.getCurrent() < 0);
+            cls.getCreatureStats(mPtr).setFatigue(fatigue);
+        }
 
         if(sneak || inwater || flying)
             vec.z() = 0.0f;
@@ -1748,8 +1754,12 @@ void CharacterController::update(float duration)
                 if (normalizedEncumbrance > 1)
                     normalizedEncumbrance = 1;
                 const float fatigueDecrease = fatigueJumpBase + (1 - normalizedEncumbrance) * fatigueJumpMult;
-                fatigue.setCurrent(fatigue.getCurrent() - fatigueDecrease);
-                cls.getCreatureStats(mPtr).setFatigue(fatigue);
+
+                if (!godmode)
+                {
+                    fatigue.setCurrent(fatigue.getCurrent() - fatigueDecrease);
+                    cls.getCreatureStats(mPtr).setFatigue(fatigue);
+                }
             }
         }
         else if(mJumpState == JumpState_InAir)
@@ -1760,16 +1770,22 @@ void CharacterController::update(float duration)
 
             float height = cls.getCreatureStats(mPtr).land();
             float healthLost = getFallDamage(mPtr, height);
+
+            bool godmode = mPtr == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState(); 
+
             if (healthLost > 0.0f)
             {
                 const float fatigueTerm = cls.getCreatureStats(mPtr).getFatigueTerm();
 
                 // inflict fall damages
-                DynamicStat<float> health = cls.getCreatureStats(mPtr).getHealth();
-                float realHealthLost = static_cast<float>(healthLost * (1.0f - 0.25f * fatigueTerm));
-                health.setCurrent(health.getCurrent() - realHealthLost);
-                cls.getCreatureStats(mPtr).setHealth(health);
-                cls.onHit(mPtr, realHealthLost, true, MWWorld::Ptr(), MWWorld::Ptr(), osg::Vec3f(), true);
+                if (!godmode)
+                {
+                    DynamicStat<float> health = cls.getCreatureStats(mPtr).getHealth();
+                    float realHealthLost = static_cast<float>(healthLost * (1.0f - 0.25f * fatigueTerm));
+                    health.setCurrent(health.getCurrent() - realHealthLost);
+                    cls.getCreatureStats(mPtr).setHealth(health);
+                    cls.onHit(mPtr, realHealthLost, true, MWWorld::Ptr(), MWWorld::Ptr(), osg::Vec3f(), true);
+                }
 
                 const int acrobaticsSkill = cls.getSkill(mPtr, ESM::Skill::Acrobatics);
                 if (healthLost > (acrobaticsSkill * fatigueTerm))

apps/openmw/mwmechanics/combat.cpp

@@ -327,11 +327,17 @@ namespace MWMechanics
         {
             int weaphealth = weapon.getClass().getItemHealth(weapon);
 
-            const float fWeaponDamageMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fWeaponDamageMult")->getFloat();
-            float x = std::max(1.f, fWeaponDamageMult * damage);
+            bool godmode = attacker == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
 
-            weaphealth -= std::min(int(x), weaphealth);
-            weapon.getCellRef().setCharge(weaphealth);
+            // weapon condition does not degrade when godmode is on
+            if (!godmode)
+            {
+                const float fWeaponDamageMult = MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>().find("fWeaponDamageMult")->getFloat();
+                float x = std::max(1.f, fWeaponDamageMult * damage);
+
+                weaphealth -= std::min(int(x), weaphealth);
+                weapon.getCellRef().setCharge(weaphealth);
+            }
 
             // Weapon broken? unequip it
             if (weaphealth == 0)
@@ -405,11 +411,17 @@ namespace MWMechanics
         CreatureStats& stats = attacker.getClass().getCreatureStats(attacker);
         MWMechanics::DynamicStat<float> fatigue = stats.getFatigue();
         const float normalizedEncumbrance = attacker.getClass().getNormalizedEncumbrance(attacker);
-        float fatigueLoss = fFatigueAttackBase + normalizedEncumbrance * fFatigueAttackMult;
-        if (!weapon.isEmpty())
-            fatigueLoss += weapon.getClass().getWeight(weapon) * attackStrength * fWeaponFatigueMult;
-        fatigue.setCurrent(fatigue.getCurrent() - fatigueLoss);
-        stats.setFatigue(fatigue);
+
+        bool godmode = attacker == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
+
+        if (!godmode)
+        {
+            float fatigueLoss = fFatigueAttackBase + normalizedEncumbrance * fFatigueAttackMult;
+            if (!weapon.isEmpty())
+                fatigueLoss += weapon.getClass().getWeight(weapon) * attackStrength * fWeaponFatigueMult;
+            fatigue.setCurrent(fatigue.getCurrent() - fatigueLoss);
+            stats.setFatigue(fatigue);
+        }
     }
 
     bool isEnvironmentCompatible(const MWWorld::Ptr& attacker, const MWWorld::Ptr& victim)

apps/openmw/mwmechanics/repair.cpp

@@ -99,6 +99,9 @@ void Repair::repair(const MWWorld::Ptr &itemToRepair)
             if (Misc::StringUtils::ciEqual(iter->getCellRef().getRefId(), mTool.getCellRef().getRefId()))
             {
                 mTool = *iter;
+
+                MWBase::Environment::get().getSoundManager()->playSound("Item Repair Up",1,1);
+
                 break;
             }
         }

apps/openmw/mwmechanics/spellcasting.cpp

@@ -46,11 +46,6 @@ namespace MWMechanics
 
     float getSpellSuccessChance (const ESM::Spell* spell, const MWWorld::Ptr& actor, int* effectiveSchool, bool cap)
     {
-        CreatureStats& stats = actor.getClass().getCreatureStats(actor);
-
-        if (stats.getMagicEffects().get(ESM::MagicEffect::Silence).getMagnitude())
-            return 0;
-
         float y = std::numeric_limits<float>::max();
         float lowestSkill = 0;
 
@@ -80,6 +75,13 @@ namespace MWMechanics
             }
         }
 
+        bool godmode = actor == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
+
+        CreatureStats& stats = actor.getClass().getCreatureStats(actor);
+
+        if (stats.getMagicEffects().get(ESM::MagicEffect::Silence).getMagnitude()&& !godmode)
+            return 0;
+
         if (spell->mData.mType == ESM::Spell::ST_Power)
             return stats.getSpells().canUsePower(spell) ? 100 : 0;
 
@@ -89,6 +91,11 @@ namespace MWMechanics
         if (spell->mData.mFlags & ESM::Spell::F_Always)
             return 100;
 
+        if (godmode)
+        {
+            return 100;
+        }
+
         float castBonus = -stats.getMagicEffects().get(ESM::MagicEffect::Sound).getMagnitude();
 
         int actorWillpower = stats.getAttribute(ESM::Attribute::Willpower).getModified();
@@ -709,14 +716,19 @@ namespace MWMechanics
 
         mStack = false;
 
+        bool godmode = mCaster == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
+
         // Check if there's enough charge left
         if (enchantment->mData.mType == ESM::Enchantment::WhenUsed || enchantment->mData.mType == ESM::Enchantment::WhenStrikes)
         {
-            const int castCost = getEffectiveEnchantmentCastCost(static_cast<float>(enchantment->mData.mCost), mCaster);
+            int castCost = getEffectiveEnchantmentCastCost(static_cast<float>(enchantment->mData.mCost), mCaster);
 
             if (item.getCellRef().getEnchantmentCharge() == -1)
                 item.getCellRef().setEnchantmentCharge(static_cast<float>(enchantment->mData.mCharge));
 
+            if (godmode)
+                castCost = 0;
+
             if (item.getCellRef().getEnchantmentCharge() < castCost)
             {
                 if (mCaster == getPlayer())
@@ -746,8 +758,10 @@ namespace MWMechanics
             if (mCaster == getPlayer())
                 mCaster.getClass().skillUsageSucceeded (mCaster, ESM::Skill::Enchant, 1);
         }
-        if (enchantment->mData.mType == ESM::Enchantment::CastOnce)
+        if (enchantment->mData.mType == ESM::Enchantment::CastOnce && !godmode)
+        {
             item.getContainerStore()->remove(item, 1, mCaster);
+        }
         else if (enchantment->mData.mType != ESM::Enchantment::WhenStrikes)
         {
             if (mCaster == getPlayer())
@@ -797,44 +811,50 @@ namespace MWMechanics
 
         int school = 0;
 
+        bool godmode = mCaster == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState();
+
         if (mCaster.getClass().isActor() && !mAlwaysSucceed)
         {
             school = getSpellSchool(spell, mCaster);
 
             CreatureStats& stats = mCaster.getClass().getCreatureStats(mCaster);
 
-            // Reduce fatigue (note that in the vanilla game, both GMSTs are 0, and there's no fatigue loss)
-            static const float fFatigueSpellBase = store.get<ESM::GameSetting>().find("fFatigueSpellBase")->getFloat();
-            static const float fFatigueSpellMult = store.get<ESM::GameSetting>().find("fFatigueSpellMult")->getFloat();
-            DynamicStat<float> fatigue = stats.getFatigue();
-            const float normalizedEncumbrance = mCaster.getClass().getNormalizedEncumbrance(mCaster);
-            float fatigueLoss = spell->mData.mCost * (fFatigueSpellBase + normalizedEncumbrance * fFatigueSpellMult);
-            fatigue.setCurrent(fatigue.getCurrent() - fatigueLoss); stats.setFatigue(fatigue);
+            if (!godmode)
+            {
+                // Reduce fatigue (note that in the vanilla game, both GMSTs are 0, and there's no fatigue loss)
+                static const float fFatigueSpellBase = store.get<ESM::GameSetting>().find("fFatigueSpellBase")->getFloat();
+                static const float fFatigueSpellMult = store.get<ESM::GameSetting>().find("fFatigueSpellMult")->getFloat();
+                DynamicStat<float> fatigue = stats.getFatigue();
+                const float normalizedEncumbrance = mCaster.getClass().getNormalizedEncumbrance(mCaster);
 
-            bool fail = false;
+                float fatigueLoss = spell->mData.mCost * (fFatigueSpellBase + normalizedEncumbrance * fFatigueSpellMult);
+                fatigue.setCurrent(fatigue.getCurrent() - fatigueLoss); stats.setFatigue(fatigue);
 
-            // Check success
-            if (!(mCaster == getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState()))
-            {
-                float successChance = getSpellSuccessChance(spell, mCaster);
-                if (Misc::Rng::roll0to99() >= successChance)
+                bool fail = false;
+
+                // Check success
+                if (!(mCaster == getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState()))
                 {
-                    if (mCaster == getPlayer())
-                        MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicSkillFail}");
-                    fail = true;
+                    float successChance = getSpellSuccessChance(spell, mCaster);
+                    if (Misc::Rng::roll0to99() >= successChance)
+                    {
+                        if (mCaster == getPlayer())
+                            MWBase::Environment::get().getWindowManager()->messageBox("#{sMagicSkillFail}");
+                        fail = true;
+                    }
                 }
-            }
 
-            if (fail)
-            {
-                // Failure sound
-                static const std::string schools[] = {
-                    "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
-                };
+                if (fail)
+                {
+                    // Failure sound
+                    static const std::string schools[] = {
+                        "alteration", "conjuration", "destruction", "illusion", "mysticism", "restoration"
+                    };
 
-                MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
-                sndMgr->playSound3D(mCaster, "Spell Failure " + schools[school], 1.0f, 1.0f);
-                return false;
+                    MWBase::SoundManager *sndMgr = MWBase::Environment::get().getSoundManager();
+                    sndMgr->playSound3D(mCaster, "Spell Failure " + schools[school], 1.0f, 1.0f);
+                    return false;
+                }
             }
 
             // A power can be used once per 24h
@@ -1042,6 +1062,8 @@ namespace MWMechanics
 
         bool receivedMagicDamage = false;
 
+        bool godmode = actor == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState(); 
+
         switch (effectKey.mId)
         {
         case ESM::MagicEffect::DamageAttribute:
@@ -1064,21 +1086,34 @@ namespace MWMechanics
             adjustDynamicStat(creatureStats, effectKey.mId-ESM::MagicEffect::RestoreHealth, magnitude);
             break;
         case ESM::MagicEffect::DamageHealth:
-            receivedMagicDamage = true;
-            adjustDynamicStat(creatureStats, effectKey.mId-ESM::MagicEffect::DamageHealth, -magnitude);
-            break;
+            if (!godmode)
+            {
+                receivedMagicDamage = true;
+                adjustDynamicStat(creatureStats, effectKey.mId-ESM::MagicEffect::DamageHealth, -magnitude);
+            }
         case ESM::MagicEffect::DamageMagicka:
         case ESM::MagicEffect::DamageFatigue:
-            adjustDynamicStat(creatureStats, effectKey.mId-ESM::MagicEffect::DamageHealth, -magnitude);
+            if (!godmode)
+            {
+                adjustDynamicStat(creatureStats, effectKey.mId-ESM::MagicEffect::DamageHealth, -magnitude);
+            }
+
             break;
+
         case ESM::MagicEffect::AbsorbHealth:
-            if (magnitude > 0.f)
-                receivedMagicDamage = true;
-            adjustDynamicStat(creatureStats, effectKey.mId-ESM::MagicEffect::AbsorbHealth, -magnitude);
-            break;
+            if (!godmode)
+            {
+                if (magnitude > 0.f)
+                    receivedMagicDamage = true;
+                adjustDynamicStat(creatureStats, effectKey.mId-ESM::MagicEffect::AbsorbHealth, -magnitude);
+            }
         case ESM::MagicEffect::AbsorbMagicka:
         case ESM::MagicEffect::AbsorbFatigue:
-            adjustDynamicStat(creatureStats, effectKey.mId-ESM::MagicEffect::AbsorbHealth, -magnitude);
+            if (!godmode)
+            {
+                adjustDynamicStat(creatureStats, effectKey.mId-ESM::MagicEffect::AbsorbHealth, -magnitude);
+            }
+
             break;
 
         case ESM::MagicEffect::DisintegrateArmor:
@@ -1123,9 +1158,13 @@ namespace MWMechanics
             if (weather > 1)
                 damageScale *= fMagicSunBlockedMult;
 
-            adjustDynamicStat(creatureStats, 0, -magnitude * damageScale);
-            if (magnitude * damageScale > 0.f)
-                receivedMagicDamage = true;
+            if (!godmode)
+            {
+                adjustDynamicStat(creatureStats, 0, -magnitude * damageScale);
+                if (magnitude * damageScale > 0.f)
+                    receivedMagicDamage = true;
+            }
+
             break;
         }
 
@@ -1134,8 +1173,12 @@ namespace MWMechanics
         case ESM::MagicEffect::FrostDamage:
         case ESM::MagicEffect::Poison:
         {
-            adjustDynamicStat(creatureStats, 0, -magnitude);
-            receivedMagicDamage = true;
+            if (!godmode)
+            {
+                adjustDynamicStat(creatureStats, 0, -magnitude);
+                receivedMagicDamage = true;
+            }
+
             break;
         }
 

apps/openmw/mwworld/worldimp.cpp

@@ -2340,12 +2340,16 @@ namespace MWWorld
             MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
             if (stats.isDead())
                 continue;
+
+            mPhysics->markAsNonSolid (object);
+
+            if (actor == getPlayerPtr() && MWBase::Environment::get().getWorld()->getGodModeState())
+                return;
+
             MWMechanics::DynamicStat<float> health = stats.getHealth();
             health.setCurrent(health.getCurrent()-healthPerSecond*MWBase::Environment::get().getFrameDuration());
             stats.setHealth(health);
 
-            mPhysics->markAsNonSolid (object);
-
             if (healthPerSecond > 0.0f)
             {
                 if (actor == getPlayerPtr())
@@ -2370,12 +2374,16 @@ namespace MWWorld
             MWMechanics::CreatureStats& stats = actor.getClass().getCreatureStats(actor);
             if (stats.isDead())
                 continue;
+
+            mPhysics->markAsNonSolid (object);
+
+            if (actor == getPlayerPtr() && MWBase::Environment::get().getWorld()->getGodModeState())
+                return;
+
             MWMechanics::DynamicStat<float> health = stats.getHealth();
             health.setCurrent(health.getCurrent()-healthPerSecond*MWBase::Environment::get().getFrameDuration());
             stats.setHealth(health);
 
-            mPhysics->markAsNonSolid (object);
-
             if (healthPerSecond > 0.0f)
             {
                 if (actor == getPlayerPtr())

components/compiler/exprparser.cpp

@@ -311,22 +311,6 @@ namespace Compiler
                 return true;
             }
 
-            // die in a fire, Morrowind script compiler!
-            if (const Extensions *extensions = getContext().getExtensions())
-            {
-                if (getContext().isJournalId (name2))
-                {
-                    // JournalID used as an argument. Use the index of that JournalID
-                    Generator::pushString (mCode, mLiterals, name2);
-                    int keyword = extensions->searchKeyword ("getjournalindex");
-                    extensions->generateFunctionCode (keyword, mCode, mLiterals, mExplicit, 0);
-                    mNextOperand = false;
-                    mOperands.push_back ('l');
-
-                    return true;
-                }
-            }
-
             if (mExplicit.empty() && getContext().isId (name2))
             {
                 mExplicit = name2;

components/misc/resourcehelpers.cpp

@@ -127,9 +127,7 @@ std::string Misc::ResourceHelpers::correctBookartPath(const std::string &resPath
 std::string Misc::ResourceHelpers::correctActorModelPath(const std::string &resPath, const VFS::Manager* vfs)
 {
     std::string mdlname = resPath;
-    std::string::size_type p = mdlname.rfind('\\');
-    if(p == std::string::npos)
-        p = mdlname.rfind('/');
+    std::string::size_type p = mdlname.find_last_of("/\\");
     if(p != std::string::npos)
         mdlname.insert(mdlname.begin()+p+1, 'x');
     else

files/openmw.cfg

@@ -8,3 +8,6 @@ resources=${OPENMW_RESOURCE_FILES}
 script-blacklist=Museum
 script-blacklist=MockChangeScript
 script-blacklist=doortestwarp
+script-blacklist=WereChange2Script
+script-blacklist=wereDreamScript2
+script-blacklist=wereDreamScript3

files/openmw.cfg.local

@@ -9,3 +9,6 @@ resources=./resources
 script-blacklist=Museum
 script-blacklist=MockChangeScript
 script-blacklist=doortestwarp
+script-blacklist=WereChange2Script
+script-blacklist=wereDreamScript2
+script-blacklist=wereDreamScript3