aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/he/moonbase/ai_main.cpp2
-rw-r--r--engines/scumm/he/moonbase/ai_node.h2
-rw-r--r--engines/scumm/he/moonbase/ai_tree.cpp5
3 files changed, 4 insertions, 5 deletions
diff --git a/engines/scumm/he/moonbase/ai_main.cpp b/engines/scumm/he/moonbase/ai_main.cpp
index 501aab5912..1a191a1328 100644
--- a/engines/scumm/he/moonbase/ai_main.cpp
+++ b/engines/scumm/he/moonbase/ai_main.cpp
@@ -726,7 +726,7 @@ int masterControlProgram(const int paramCount, const int *params) {
// Here to scope tempLaunchAction
int *tempLaunchAction = NULL;
- int errCod;
+ int errCod = 0;
_acquireTarget++;
diff --git a/engines/scumm/he/moonbase/ai_node.h b/engines/scumm/he/moonbase/ai_node.h
index 454b98e0b5..0a60dee9ca 100644
--- a/engines/scumm/he/moonbase/ai_node.h
+++ b/engines/scumm/he/moonbase/ai_node.h
@@ -28,7 +28,7 @@
namespace Scumm {
const float SUCCESS = -1;
-const float FAILURE = 1e20;
+const float FAILURE = 1e20f;
class IContainedObject {
private:
diff --git a/engines/scumm/he/moonbase/ai_tree.cpp b/engines/scumm/he/moonbase/ai_tree.cpp
index 2335d567e9..efbf3e3a99 100644
--- a/engines/scumm/he/moonbase/ai_tree.cpp
+++ b/engines/scumm/he/moonbase/ai_tree.cpp
@@ -80,7 +80,7 @@ Tree::~Tree() {
while (pNodeItr != NULL) {
// If any children are left, move to one of them
if (!(pNodeItr->getChildren().empty())) {
- int size = (pNodeItr->getChildren()).size();
+ //int size = (pNodeItr->getChildren()).size();
pNodeItr = pNodeItr->popChild();
} else {
// Delete this node, and move up to the parent for further processing
@@ -157,11 +157,10 @@ Node *Tree::aStarSearch_singlePassInit() {
Node *Tree::aStarSearch_singlePass(Node **currentNode) {
currentNode = NULL;
- float currentT;
-
Node *retNode = NULL;
#if 0
+ float currentT;
static int maxTime = 0;
if (currentChildIndex == 1) {