From 0b240ff4a09d2966a181f4368a4a881398bfe379 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko <sev@scummvm.org>
Date: Mon, 30 May 2016 13:58:43 +0200
Subject: [PATCH] SCUMM HE: Fixed initialization in Moonbase AI

---
 engines/scumm/he/moonbase/ai_main.cpp              | 2 +-
 engines/scumm/he/moonbase/ai_targetacquisition.cpp | 9 +++++++++
 engines/scumm/he/moonbase/ai_targetacquisition.h   | 2 +-
 engines/scumm/he/moonbase/ai_traveller.cpp         | 2 ++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/engines/scumm/he/moonbase/ai_main.cpp b/engines/scumm/he/moonbase/ai_main.cpp
index fa13b33d3df7..98a577bdbadc 100644
--- a/engines/scumm/he/moonbase/ai_main.cpp
+++ b/engines/scumm/he/moonbase/ai_main.cpp
@@ -2110,7 +2110,7 @@ int *AI::energizeTarget(int &targetX, int &targetY, int index) {
 								break;
 							}
 
-							testDist = ((((n - attempt) / n) * .5) + .5) * (getDistance(getHubX(nextUnit), getHubY(nextUnit), targetX, targetY) / .8);
+							testDist = (((((double)n - (double)attempt) / n) * .5) + .5) * (getDistance(getHubX(nextUnit), getHubY(nextUnit), targetX, targetY) / .8);
 							xPos = getHubX(nextUnit) + testDist * cos(degToRad(testAngle));
 							yPos = getHubY(nextUnit) + testDist * sin(degToRad(testAngle));
 						}
diff --git a/engines/scumm/he/moonbase/ai_targetacquisition.cpp b/engines/scumm/he/moonbase/ai_targetacquisition.cpp
index 02c49dc1a7c5..313ea7a41146 100644
--- a/engines/scumm/he/moonbase/ai_targetacquisition.cpp
+++ b/engines/scumm/he/moonbase/ai_targetacquisition.cpp
@@ -320,6 +320,15 @@ void Sortie::printEnemyDefenses() {
 	}
 }
 
+Defender::Defender(AI *ai) : _ai(ai) {
+	_sourceX = _sourceY = 0;
+	_targetX = _targetY = 0;
+	_sourceUnit = 0;
+	_power = 0;
+	_angle = 0;
+	_unit = 0;
+}
+
 int Defender::calculateDefenseUnitPosition(int targetX, int targetY, int index) {
 	int currentPlayer = _ai->getCurrentPlayer();
 
diff --git a/engines/scumm/he/moonbase/ai_targetacquisition.h b/engines/scumm/he/moonbase/ai_targetacquisition.h
index 9afe0f50ab1b..5e6cfed8bc24 100644
--- a/engines/scumm/he/moonbase/ai_targetacquisition.h
+++ b/engines/scumm/he/moonbase/ai_targetacquisition.h
@@ -112,7 +112,7 @@ class Defender {
 	AI *_ai;
 
 public:
-	Defender(AI *ai) : _ai(ai) {}
+	Defender(AI *ai);
 	void setSourceX(int sourceX) { _sourceX = sourceX; }
 	void setSourceY(int sourceY) { _sourceY = sourceY; }
 	void setTargetX(int targetX) { _targetX = targetX; }
diff --git a/engines/scumm/he/moonbase/ai_traveller.cpp b/engines/scumm/he/moonbase/ai_traveller.cpp
index b1c9985b9d10..d6eea67b41a2 100644
--- a/engines/scumm/he/moonbase/ai_traveller.cpp
+++ b/engines/scumm/he/moonbase/ai_traveller.cpp
@@ -46,6 +46,8 @@ Traveller::Traveller(AI *ai) : _ai(ai) {
 	_waterSourceY = 0;
 	_waterDestX = 0;
 	_waterDestY = 0;
+
+	_posX = _posY = 0;
 }
 
 Traveller::Traveller(int originX, int originY, AI *ai) : _ai(ai) {