CRYO: Rework Citadel structure, some renaming

1 files changed, 10 insertions, 67 deletions

diff --git a/engines/cryo/staticdata.cpp b/engines/cryo/staticdata.cpp
index 37051c53e9..9565a551c2 100644
--- a/engines/cryo/staticdata.cpp
+++ b/engines/cryo/staticdata.cpp
@@ -102,7 +102,7 @@ char kPersoRoomBankTable[] = {
 };
 
 // area transition descriptors
-goto_t gotos[] = {
+Goto gotos[] = {
 // area, oldarea, vid, time, valleyVid
 	{  0,  1,   0,  2,  20 },
 	{  0,  1, 162,  3, 168 },
@@ -429,73 +429,16 @@ perso_t kPersons[] = {
 	{ 0x628, 237, PersonMask::pmEve   , PersonId::pidEve               ,                                                0, 78, 10, 0, 0,  7,  35, 0, 0 }
 };
 
-cita_t cita_list[] = {
-	{
-		1,
-		{
-			163, 182,   0, 0,
-			124, 147, 193, 0,
-			0,   0,   0, 0,
-			0,   0,   0, 0
-		}
-	},
-	{
-		48,
-		{
-			285, 286,   0, 0,
-			287, 288, 284, 0,
-			114, 115,   0, 0,
-			116, 117, 113, 0
-		}
-	},
-	{
-		63,
-		{
-			290, 291,   0, 0,
-			292, 293, 289, 0,
-			119, 120,   0, 0,
-			121, 122, 118, 0
-		}
-	},
-	{
-		95,
-		{
-			295, 296,   0, 0,
-			297, 298, 294, 0,
-			124, 125,   0, 0,
-			126, 127, 123, 0
-		}
-	},
-	{
-		127,
-		{
-			300, 301,   0, 0,
-			302, 303, 299, 0,
-			129, 130,   0, 0,
-			131, 132, 128, 0
-		}
-	},
-	{
-		159,
-		{
-			305, 306,   0, 0,
-			307, 308, 304, 0,
-			134, 135,   0, 0,
-			136, 137, 133, 0
-		}
-	},
-	{
-		255,
-		{
-			310, 311,   0, 0,
-			312, 313, 309, 0,
-			139, 140,   0, 0,
-			141, 142, 138, 0
-		}
-	}
+Citadel _citadelList[] = {
+	{   1, { 163, 182, 0, 0, 124, 147, 193, 0 }, {   0,   0, 0, 0,   0,   0,   0, 0 } },
+	{  48, { 285, 286, 0, 0, 287, 288, 284, 0 }, { 114, 115, 0, 0, 116, 117, 113, 0 } },
+	{  63, { 290, 291, 0, 0, 292, 293, 289, 0 }, { 119, 120, 0, 0, 121, 122, 118, 0 } },
+	{  95, { 295, 296, 0, 0, 297, 298, 294, 0 }, { 124, 125, 0, 0, 126, 127, 123, 0 } },
+	{ 127, { 300, 301, 0, 0, 302, 303, 299, 0 }, { 129, 130, 0, 0, 131, 132, 128, 0 } },
+	{ 159, { 305, 306, 0, 0, 307, 308, 304, 0 }, { 134, 135, 0, 0, 136, 137, 133, 0 } },
+	{ 255, { 310, 311, 0, 0, 312, 313, 309, 0 }, { 139, 140, 0, 0, 141, 142, 138, 0 } }
 };
 
-
 int16 tab_2CB16[] = { 2075, 2080, 2119, -1};
 
 uint8 tab_2CB1E[8][4] = {
@@ -554,7 +497,7 @@ byte tab_persxx[][5] = {   //TODO: struc?
 	{ 0xFF                }
 };
 
-area_t kAreasTable[] = {
+Area kAreasTable[] = {
 	{ Areas::arMo           , AreaType::atCitadel,                           0,   0, 0,  1, 0, 0},
 	{ Areas::arTausCave     , AreaType::atCave   ,                           0, 112, 0,  2, 0, 0},
 	{ Areas::arChamaar      , AreaType::atValley ,                           0, 133, 0,  3, 0, 0},