Merge remote-tracking branch 'mckibbenta/tgm'

apps/openmw/mwclass/npc.cpp

@@ -397,9 +397,10 @@ namespace MWClass
                     MWBase::Environment::get().getWindowManager()->messageBox("#{sTargetCriticalStrike}");
                     MWBase::Environment::get().getSoundManager()->playSound3D(victim, "critical damage", 1.0f, 1.0f);
                 }
-                weapon.getCellRef().mCharge -= std::min(std::max(1,
-                                                                 (int)(damage * gmst.find("fWeaponDamageMult")->getFloat())),
-                                                        weapon.getCellRef().mCharge);
+                
+                if (!MWBase::Environment::get().getWorld()->getGodModeState())
+                    weapon.getCellRef().mCharge -= std::min(std::max(1,
+                        (int)(damage * gmst.find("fWeaponDamageMult")->getFloat())), weapon.getCellRef().mCharge);
             }
             healthdmg = true;
         }

apps/openmw/mwmechanics/actors.cpp

@@ -276,7 +276,8 @@ namespace MWMechanics
                 }
 
                 // If it's the player and God Mode is turned on, keep it alive
-                if(iter->first.getRefData().getHandle()=="player" && MWBase::Environment::get().getWorld()->getGodModeState())
+                if(iter->first.getRefData().getHandle()=="player" && 
+                    MWBase::Environment::get().getWorld()->getGodModeState())
                 {
                     MWMechanics::DynamicStat<float> stat(stats.getHealth());