mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-11 07:34:34 +00:00
Code Issues Releases Wiki Activity

Revert autoformat changes

Browse source
This commit is contained in:
Aussiemon 2025-04-15 17:56:48 -06:00 committed by Aussiemon
parent a77a8904e5
commit 23dc226dff
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwmechanics/actors.cpp
View file

@ -184,7 +184,7 @@ namespace
MWWorld::ContainerStoreIterator gem = container.end(); MWWorld::ContainerStoreIterator gem = container.end();
float gemCapacity = std::numeric_limits<float>::max(); float gemCapacity = std::numeric_limits<float>::max();
for (auto it = container.begin(MWWorld::ContainerStore::Type_Miscellaneous); it != container.end(); for (auto it = container.begin(MWWorld::ContainerStore::Type_Miscellaneous); it != container.end();
++it) ++it)
{ {
if (it->getClass().isSoulGem(*it)) if (it->getClass().isSoulGem(*it))
{ {
@ -1149,7 +1149,8 @@ namespace MWMechanics
if (playerStats.getBounty() >= cutoff * iCrimeThresholdMultiplier) if (playerStats.getBounty() >= cutoff * iCrimeThresholdMultiplier)
{ {
mechanicsManager->startCombat(ptr, player, &cachedAllies.getActorsSidingWith(player)); mechanicsManager->startCombat(ptr, player, &cachedAllies.getActorsSidingWith(player));
creatureStats.setHitAttemptActorId(playerClass.getCreatureStats(player) creatureStats.setHitAttemptActorId(
playerClass.getCreatureStats(player)
.getActorId()); // Stops the guard from quitting combat if player is unreachable .getActorId()); // Stops the guard from quitting combat if player is unreachable
} }
else else