From c75ff0515e144ab4c6a1c5d55d65508b32b3ef4d Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 28 Apr 2010 22:23:34 +0000
Subject: SAGA: Avoid global constructor for pieceOrigins array

svn-id: r48842
---
 engines/saga/itedata.cpp | 32 ++++++++++++++++----------------
 engines/saga/itedata.h   |  3 ++-
 engines/saga/puzzle.cpp  |  3 +--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/engines/saga/itedata.cpp b/engines/saga/itedata.cpp
index 7f323b5587..7503818319 100644
--- a/engines/saga/itedata.cpp
+++ b/engines/saga/itedata.cpp
@@ -428,22 +428,22 @@ const char *ITEinterfaceTextStrings[][53] = {
 	}
 };
 
-Point pieceOrigins[PUZZLE_PIECES] = {
-	Point(268,  18),
-	Point(270,  51),
-	Point( 19,  51),
-	Point( 73,   0),
-	Point(  0,  34),
-	Point(215,   0),
-	Point(159,   0),
-	Point(  9,  69),
-	Point(288,  18),
-	Point(112,   0),
-	Point( 27,  88),
-	Point( 43,   0),
-	Point(  0,   0),
-	Point(262,   0),
-	Point(271, 103)
+const RawPoint pieceOrigins[PUZZLE_PIECES] = {
+	{ 268,  18 },
+	{ 270,  51 },
+	{  19,  51 },
+	{  73,   0 },
+	{   0,  34 },
+	{ 215,   0 },
+	{ 159,   0 },
+	{   9,  69 },
+	{ 288,  18 },
+	{ 112,   0 },
+	{  27,  88 },
+	{  43,   0 },
+	{   0,   0 },
+	{ 262,   0 },
+	{ 271, 103 }
 };
 
 const char *pieceNames[][PUZZLE_PIECES] = {
diff --git a/engines/saga/itedata.h b/engines/saga/itedata.h
index 6d0f5a9d70..71041902bc 100644
--- a/engines/saga/itedata.h
+++ b/engines/saga/itedata.h
@@ -92,7 +92,8 @@ extern const char *ITEinterfaceTextStrings[][53];
 
 #define PUZZLE_PIECES 15
 
-extern Point pieceOrigins[PUZZLE_PIECES];
+struct RawPoint { int x, y; };
+extern const RawPoint pieceOrigins[PUZZLE_PIECES];
 extern const char *pieceNames[][PUZZLE_PIECES];
 
 #define NUM_SOLICIT_REPLIES 5
diff --git a/engines/saga/puzzle.cpp b/engines/saga/puzzle.cpp
index efce5fcb58..957ab3c8b6 100644
--- a/engines/saga/puzzle.cpp
+++ b/engines/saga/puzzle.cpp
@@ -556,8 +556,7 @@ void Puzzle::giveHint() {
 			sprintf(hintBuf, optionsStr[_lang][kROHint], pieceNames[_lang][piece]);
 
 			_vm->_actor->nonActorSpeech(_hintBox, &hintPtr, 1, PUZZLE_TOOL_SOUNDS + _hintSpeaker + piece * 3, 0);
-		}
-		else {
+		} else {
 				//	If no pieces are in the wrong place
 			_vm->_actor->nonActorSpeech(_hintBox, &hintStr[_lang][3], 1, PUZZLE_HINT_SOUNDS + 3 * 3 + _hintSpeaker, 0);
 		}
-- 
cgit v1.2.3