Fix bug that swap body part and armor side

Yankes · Feb 5, 2017 · b2125b7 · b2125b7
1 parent 1ea4348
commit b2125b7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/Extended.txt b/Extended.txt
@@ -140,6 +140,7 @@ Add some missed scripts.[br/]
 Add damage type param to unit damage script.[br/]
 [br/]
 3.6b:[br/]
+Fix critical bug in unit damage function.[br/]
 [br/]
 
 [examples]

diff --git a/src/Savegame/BattleUnit.cpp b/src/Savegame/BattleUnit.cpp
@@ -1160,16 +1160,16 @@ int BattleUnit::damage(Position relative, int power, const RuleDamageType *type,
 		work.execute(this->getArmor()->getEventUnitHitScript(), args);
 
 		power = args.getFirst();
-		side = (UnitSide)args.getSecond();
-		bodypart = (UnitBodyPart)args.getThird();
-		if (side >= SIDE_MAX)
-		{
-			side = {};
-		}
+		bodypart = (UnitBodyPart)args.getSecond();
+		side = (UnitSide)args.getThird();
 		if (bodypart >= BODYPART_MAX)
 		{
 			bodypart = {};
 		}
+		if (side >= SIDE_MAX)
+		{
+			side = {};
+		}
 	}
 
 	{