aboutsummaryrefslogtreecommitdiff
path: root/engines/cryo
diff options
context:
space:
mode:
authorFilippos Karapetis2017-02-10 03:11:14 +0200
committerFilippos Karapetis2017-02-10 04:33:37 +0200
commit2fd2eeed1c21047744c9d79b1283c52c009b5406 (patch)
treedf843598cf197120a171c1f1bfa2cf495fab10d5 /engines/cryo
parent6ff7ef95d73c29051a675d03bdccd42f0a5a215b (diff)
downloadscummvm-rg350-2fd2eeed1c21047744c9d79b1283c52c009b5406.tar.gz
scummvm-rg350-2fd2eeed1c21047744c9d79b1283c52c009b5406.tar.bz2
scummvm-rg350-2fd2eeed1c21047744c9d79b1283c52c009b5406.zip
CRYO: Add explicit sizes to some static data arrays
Makes it easier to move them to a data file
Diffstat (limited to 'engines/cryo')
-rw-r--r--engines/cryo/staticdata.cpp26
1 files changed, 9 insertions, 17 deletions
diff --git a/engines/cryo/staticdata.cpp b/engines/cryo/staticdata.cpp
index 1184791850..ad33ce3cef 100644
--- a/engines/cryo/staticdata.cpp
+++ b/engines/cryo/staticdata.cpp
@@ -25,7 +25,7 @@
namespace Cryo {
-Follower followerList[] = {
+Follower followerList[15] = {
// char, X, sx, sy, ex, ey,bank,
{ PersonId::pidGregor, 5, 211, 9, 320, 176, 228, 0, 0 },
{ PersonId::pidEloi, 4, 162, 47, 223, 176, 228, 112, 78 },
@@ -44,15 +44,7 @@ Follower followerList[] = {
{ -1, -1, -1, -1, -1, -1, -1, -1, -1 }
};
-
-/*
- Labyrinth of Mo
-
- | | | | | | | |
-
-*/
-
-byte kLabyrinthPath[] = {
+byte kLabyrinthPath[70] = {
// each nibble tells which direction to choose to exit the labyrinth
0x11, 0x11, 0x11, 0x22, 0x33, 0x55, 0x25, 0x44, 0x25, 0x11, 0x11, 0x11,
0x11, 0x35, 0x55, 0x45, 0x45, 0x44, 0x44, 0x34, 0x44, 0x34, 0x32, 0x52,
@@ -64,7 +56,7 @@ byte kLabyrinthPath[] = {
char kDinoSpeedForCitaLevel[16] = { 1, 2, 3, 4, 4, 5, 6, 7, 8, 9 };
-char kTabletView[] = { //TODO: make as struct?
+char kTabletView[12] = { //TODO: make as struct?
// opposite tablet id, video id
Objects::obUnused10, 83,
Objects::obUnused10, 84,
@@ -75,7 +67,7 @@ char kTabletView[] = { //TODO: make as struct?
};
// special character backgrounds for specific rooms
-char kPersoRoomBankTable[] = {
+char kPersoRoomBankTable[84] = {
// first entry is default bank, then pairs of [roomNum, bankNum], terminated by -1
0, 3, 33, -1,
21, 17, 35, -1,
@@ -102,7 +94,7 @@ char kPersoRoomBankTable[] = {
};
// area transition descriptors
-Goto gotos[] = {
+Goto gotos[130] = {
// area, oldarea, vid, time, valleyVid
{ 0, 1, 0, 2, 20 },
{ 0, 1, 162, 3, 168 },
@@ -236,7 +228,7 @@ Goto gotos[] = {
{ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },
};
-object_t _objects[] = {
+object_t _objects[42] = {
//id,fl,loc,masklow,maskhi,ct
{ 1, 0, 3, 1, 0, 0}, // Eve's Way Stone
{ 2, 0, 3, 2, 0, 0}, // Thau's Seashell
@@ -371,7 +363,7 @@ perso_t kPersons[] = {
{ 0x628, 237, PersonMask::pmEve , PersonId::pidEve , 0, 78, 10, 0, 0, 7, 35, 0, 0 }
};
-Citadel _citadelList[] = {
+Citadel _citadelList[7] = {
{ 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 } },
@@ -381,7 +373,7 @@ Citadel _citadelList[] = {
{ 255, { 310, 311, 0, 0, 312, 313, 309, 0 }, { 139, 140, 0, 0, 141, 142, 138, 0 } }
};
-prect_t _characterRects[] = { //TODO: just an array of int16s?
+prect_t _characterRects[19] = { // TODO: just an array of int16s?
{ 93, 69, 223, 176},
{ 102, 86, 162, 126},
{ 88, 103, 168, 163},
@@ -403,7 +395,7 @@ prect_t _characterRects[] = { //TODO: just an array of int16s?
{ 188, 83, 251, 158}
};
-byte _characterArray[][5] = { //TODO: struc?
+byte _characterArray[][5] = { // TODO: struc?
{ 8, 15, 23, 25, 0xFF},
{ 0, 9, 0xFF },
{ 0, 9, 0xFF },