[Scummvm-git-logs] scummvm master -> d017c3688094b9854fbddfc3bd4e9094df4a168d

[a-yyg]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d017c36880 SAGA2: Fix more global constructors


Commit: d017c3688094b9854fbddfc3bd4e9094df4a168d
    https://github.com/scummvm/scummvm/commit/d017c3688094b9854fbddfc3bd4e9094df4a168d
Author: a/ (yuri.kgpps at gmail.com)
Date: 2021-07-02T02:31:36+09:00

Commit Message:
SAGA2: Fix more global constructors

Changed paths:
    engines/saga2/speldata.cpp
    engines/saga2/spelvals.h


diff --git a/engines/saga2/speldata.cpp b/engines/saga2/speldata.cpp
index 51bc647fce..5c830b1de4 100644
--- a/engines/saga2/speldata.cpp
+++ b/engines/saga2/speldata.cpp
@@ -59,32 +59,32 @@ const int32 maxSpellColorMaps = 32;
 /* const */     // For some reason, MVC can't handle constant static classes.
 // ( Note: It would be better to use a SIN/COS table anyway than
 // a table of points, since that allows more than 24 directions ).
-TilePoint WallVectors[8] = {
-	TilePoint(2, 0, 0), TilePoint(1, 1, 0), TilePoint(0, 2, 0),
-	TilePoint(-1, 2, 0), TilePoint(-2, 0, 0), TilePoint(-1, -1, 0),
-	TilePoint(0, -2, 0), TilePoint(1, -1, 0)
+StaticTilePoint WallVectors[8] = {
+	{2, 0, 0}, {1, 1, 0}, {0, 2, 0},
+	{-1, 2, 0}, {-2, 0, 0}, {-1, -1, 0},
+	{0, -2, 0}, {1, -1, 0}
 };
 
-TilePoint FireballVectors[24] = {
-	TilePoint(4, 0, 0), TilePoint(4, 1, 0), TilePoint(3, 2, 0),
-	TilePoint(3, 3, 0), TilePoint(2, 3, 0), TilePoint(1, 4, 0),
-	TilePoint(0, 4, 0), TilePoint(-1, 4, 0), TilePoint(-2, 3, 0),
-	TilePoint(-3, 3, 0), TilePoint(-3, 2, 0), TilePoint(-4, 1, 0),
-	TilePoint(-4, 0, 0), TilePoint(-4, -1, 0), TilePoint(-3, -2, 0),
-	TilePoint(-3, -3, 0), TilePoint(-2, -3, 0), TilePoint(-1, -4, 0),
-	TilePoint(0, -4, 0), TilePoint(1, -4, 0), TilePoint(2, -3, 0),
-	TilePoint(3, -3, 0), TilePoint(3, -2, 0), TilePoint(4, -1, 0)
+StaticTilePoint FireballVectors[24] = {
+	{4, 0, 0}, {4, 1, 0}, {3, 2, 0},
+	{3, 3, 0}, {2, 3, 0}, {1, 4, 0},
+	{0, 4, 0}, {-1, 4, 0}, {-2, 3, 0},
+	{-3, 3, 0}, {-3, 2, 0}, {-4, 1, 0},
+	{-4, 0, 0}, {-4, -1, 0}, {-3, -2, 0},
+	{-3, -3, 0}, {-2, -3, 0}, {-1, -4, 0},
+	{0, -4, 0}, {1, -4, 0}, {2, -3, 0},
+	{3, -3, 0}, {3, -2, 0}, {4, -1, 0}
 };
 
-TilePoint SquareSpellVectors[32] = {
-	TilePoint(4, 0, 0), TilePoint(4, 1, 0), TilePoint(4, 2, 0), TilePoint(4, 3, 0),
-	TilePoint(4, 4, 0), TilePoint(3, 4, 0), TilePoint(2, 4, 0), TilePoint(1, 4, 0),
-	TilePoint(0, 4, 0), TilePoint(-1, 4, 0), TilePoint(-2, 4, 0), TilePoint(-3, 4, 0),
-	TilePoint(-4, 4, 0), TilePoint(-4, 3, 0), TilePoint(-4, 2, 0), TilePoint(-4, 1, 0),
-	TilePoint(-4, 0, 0), TilePoint(-4, -1, 0), TilePoint(-4, -2, 0), TilePoint(-4, -3, 0),
-	TilePoint(-4, -4, 0), TilePoint(-3, -4, 0), TilePoint(-2, -4, 0), TilePoint(-1, -4, 0),
-	TilePoint(0, -4, 0), TilePoint(1, -4, 0), TilePoint(2, -4, 0), TilePoint(3, -4, 0),
-	TilePoint(4, -4, 0), TilePoint(4, -3, 0), TilePoint(4, -2, 0), TilePoint(4, -1, 0)
+StaticTilePoint SquareSpellVectors[32] = {
+	{4, 0, 0}, {4, 1, 0}, {4, 2, 0}, {4, 3, 0},
+	{4, 4, 0}, {3, 4, 0}, {2, 4, 0}, {1, 4, 0},
+	{0, 4, 0}, {-1, 4, 0}, {-2, 4, 0}, {-3, 4, 0},
+	{-4, 4, 0}, {-4, 3, 0}, {-4, 2, 0}, {-4, 1, 0},
+	{-4, 0, 0}, {-4, -1, 0}, {-4, -2, 0}, {-4, -3, 0},
+	{-4, -4, 0}, {-3, -4, 0}, {-2, -4, 0}, {-1, -4, 0},
+	{0, -4, 0}, {1, -4, 0}, {2, -4, 0}, {3, -4, 0},
+	{4, -4, 0}, {4, -3, 0}, {4, -2, 0}, {4, -1, 0}
 };
 
 /* ===================================================================== *
diff --git a/engines/saga2/spelvals.h b/engines/saga2/spelvals.h
index 8ebf708ec2..572d22a93e 100644
--- a/engines/saga2/spelvals.h
+++ b/engines/saga2/spelvals.h
@@ -68,9 +68,9 @@ const int16 wallInnerRadius = 16;
  * ===================================================================== */
 
 // ball shaped spell shapes
-extern TilePoint WallVectors[];
-extern TilePoint FireballVectors[];
-extern TilePoint SquareSpellVectors[];
+extern StaticTilePoint WallVectors[];
+extern StaticTilePoint FireballVectors[];
+extern StaticTilePoint SquareSpellVectors[];
 
 /* ===================================================================== *
    Spell shape math explanations