aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorjohndoe1232014-02-16 00:37:14 +0100
committerjohndoe1232014-02-16 00:37:14 +0100
commit608485729b52e401865c7f189af2aa2e39021597 (patch)
treeed9bd44144881a34f2924f2bc02a02c0b4f3fc4d /engines
parent3aba8da16b2385fb257034d6d45013b3e1b44af8 (diff)
downloadscummvm-rg350-608485729b52e401865c7f189af2aa2e39021597.tar.gz
scummvm-rg350-608485729b52e401865c7f189af2aa2e39021597.tar.bz2
scummvm-rg350-608485729b52e401865c7f189af2aa2e39021597.zip
BBVS: Make kAnimationsTbl and kObjKindAnimTables const in BBAnt minigame
Diffstat (limited to 'engines')
-rw-r--r--engines/bbvs/minigames/bbant.cpp16
-rw-r--r--engines/bbvs/minigames/bbant.h2
-rw-r--r--engines/bbvs/minigames/bbant_anims.cpp6
3 files changed, 12 insertions, 12 deletions
diff --git a/engines/bbvs/minigames/bbant.cpp b/engines/bbvs/minigames/bbant.cpp
index 03d507e575..abecf22aff 100644
--- a/engines/bbvs/minigames/bbant.cpp
+++ b/engines/bbvs/minigames/bbant.cpp
@@ -644,7 +644,7 @@ void MinigameBbAnt::removeStompObj(Obj *obj) {
void MinigameBbAnt::insertBugObj(int kind, int animIndexIncr, int always0, int x, int y, int field30, int always1) {
Obj *obj = getFreeObject();
if (obj) {
- const ObjAnimation **objKindAnimTable = getObjKindAnimTable(kind);
+ const ObjAnimation * const *objKindAnimTable = getObjKindAnimTable(kind);
obj->field30 = field30;
obj->animIndexIncr = animIndexIncr;
obj->kind = kind;
@@ -691,7 +691,7 @@ void MinigameBbAnt::updateBugObjAnim(int objIndex) {
obj->animIndexIncr = 6;
break;
}
- const ObjAnimation **objKindAnimTable = getObjKindAnimTable(obj->kind);
+ const ObjAnimation * const *objKindAnimTable = getObjKindAnimTable(obj->kind);
obj->xIncr = kPosIncrTbl1[obj->animIndexIncr].x << 16;
obj->yIncr = kPosIncrTbl1[obj->animIndexIncr].y << 16;
obj->anim = objKindAnimTable[obj->animIndexIncr];
@@ -710,7 +710,7 @@ void MinigameBbAnt::updateObjAnim2(int objIndex) {
obj->animIndexIncr += 4;
if (obj->animIndexIncr >= 8)
obj->animIndexIncr %= 8;
- const ObjAnimation **objKindAnimTable = getObjKindAnimTable(obj->kind);
+ const ObjAnimation * const *objKindAnimTable = getObjKindAnimTable(obj->kind);
obj->xIncr = kPosIncrTbl1[obj->animIndex + obj->animIndexIncr].x << 16;
obj->yIncr = kPosIncrTbl1[obj->animIndex + obj->animIndexIncr].y << 16;
obj->anim = objKindAnimTable[obj->animIndex + obj->animIndexIncr];
@@ -742,7 +742,7 @@ void MinigameBbAnt::updateObjAnim3(int objIndex) {
obj->animIndexIncr = 7;
if (obj->animIndexIncr > 7)
obj->animIndexIncr = 0;
- const ObjAnimation **objKindAnimTable = getObjKindAnimTable(obj->kind);
+ const ObjAnimation * const *objKindAnimTable = getObjKindAnimTable(obj->kind);
obj->xIncr = kPosIncrTbl1[obj->animIndexIncr].x << 16;
obj->yIncr = kPosIncrTbl1[obj->animIndexIncr].y << 16;
obj->anim = objKindAnimTable[obj->animIndexIncr];
@@ -786,7 +786,7 @@ void MinigameBbAnt::updateBugObj1(int objIndex) {
playSound(kSoundTbl2[_vm->getRandom(3)]);
}
flag1 = false;
- const ObjAnimation **objKindAnimTable = getObjKindAnimTable(obj->kind);
+ const ObjAnimation * const *objKindAnimTable = getObjKindAnimTable(obj->kind);
obj->hasSmoke = false;
obj->status = 4;
obj->xIncr = 0;
@@ -833,7 +833,7 @@ void MinigameBbAnt::updateBugObj1(int objIndex) {
case 4:
if (flag1) {
- const ObjAnimation **objKindAnimTable = getObjKindAnimTable(obj->kind);
+ const ObjAnimation * const *objKindAnimTable = getObjKindAnimTable(obj->kind);
obj->status = 6;
obj->xIncr = 0;
obj->yIncr = 0;
@@ -845,7 +845,7 @@ void MinigameBbAnt::updateBugObj1(int objIndex) {
case 6:
if (flag1) {
- const ObjAnimation **objKindAnimTable = getObjKindAnimTable(obj->kind);
+ const ObjAnimation * const *objKindAnimTable = getObjKindAnimTable(obj->kind);
obj->status = 7;
obj->xIncr = kPosIncrTbl2[obj->animIndexIncr].x << 16;
obj->yIncr = kPosIncrTbl2[obj->animIndexIncr].y << 16;
@@ -976,7 +976,7 @@ void MinigameBbAnt::updateFootObj(int objIndex) {
Obj *bugObj = &_objects[i];
if (bugObj->kind >= 1 && bugObj->kind <= 5) {
bugObj->counter = _vm->getRandom(200) + 360;
- const ObjAnimation **objKindAnimTable = getObjKindAnimTable(bugObj->kind);
+ const ObjAnimation * const *objKindAnimTable = getObjKindAnimTable(bugObj->kind);
if (bugObj->status == 8) {
bugObj->hasSmoke = false;
bugObj->xIncr = 0;
diff --git a/engines/bbvs/minigames/bbant.h b/engines/bbvs/minigames/bbant.h
index 8600a45719..b9ead3a87b 100644
--- a/engines/bbvs/minigames/bbant.h
+++ b/engines/bbvs/minigames/bbant.h
@@ -101,7 +101,7 @@ public:
const ObjAnimation *getAnimation(int animIndex);
const ObjInit *getObjInit(int index);
- const ObjAnimation **getObjKindAnimTable(int kind);
+ const ObjAnimation * const *getObjKindAnimTable(int kind);
const ObjAnimation *getObjAnim(int index);
void buildDrawList0(DrawList &drawList);
diff --git a/engines/bbvs/minigames/bbant_anims.cpp b/engines/bbvs/minigames/bbant_anims.cpp
index 9527b7aa4e..c9223adca1 100644
--- a/engines/bbvs/minigames/bbant_anims.cpp
+++ b/engines/bbvs/minigames/bbant_anims.cpp
@@ -730,9 +730,9 @@ static const MinigameBbAnt::ObjInit kObjInits[] = {
{&kAnimations[152], &kAnimations[153], &kAnimations[154], 145, 165},
{&kAnimations[155], &kAnimations[156], &kAnimations[157], 110, 175}
};
-static const ObjAnimation *kAnimationsTbl[] = {&kAnimations[0], &kAnimations[1], &kAnimations[2], &kAnimations[3], &kAnimations[4], &kAnimations[5], &kAnimations[6], &kAnimations[7], &kAnimations[16], &kAnimations[17], &kAnimations[18], &kAnimations[19], &kAnimations[20], &kAnimations[21], &kAnimations[22], &kAnimations[23], &kAnimations[24], &kAnimations[25], &kAnimations[26], &kAnimations[27], &kAnimations[28], &kAnimations[29], &kAnimations[30], &kAnimations[31], &kAnimations[32], &kAnimations[33], &kAnimations[42], &kAnimations[43], &kAnimations[44], &kAnimations[45], &kAnimations[46], &kAnimations[47], &kAnimations[48], &kAnimations[49], &kAnimations[50], &kAnimations[51], &kAnimations[52], &kAnimations[53], &kAnimations[54], &kAnimations[55], &kAnimations[56], &kAnimations[57], &kAnimations[58], &kAnimations[59], &kAnimations[68], &kAnimations[69], &kAnimations[70], &kAnimations[71], &kAnimations[72], &kAnimations[73], &kAnimations[74], &kAnimations[75], &kAnimations[76], &kAnimations[77], &kAnimations[78], &kAnimations[79], &kAnimations[80], &kAnimations[81], &kAnimations[82], &kAnimations[83], &kAnimations[84], &kAnimations[85], &kAnimations[94], &kAnimations[95], &kAnimations[96], &kAnimations[97], &kAnimations[98], &kAnimations[99], &kAnimations[100], &kAnimations[101], &kAnimations[102], &kAnimations[103], &kAnimations[104], &kAnimations[105], &kAnimations[106], &kAnimations[107], &kAnimations[108], &kAnimations[109], &kAnimations[110], &kAnimations[111], &kAnimations[120], &kAnimations[121], &kAnimations[122], &kAnimations[123], &kAnimations[124], &kAnimations[125], &kAnimations[126], &kAnimations[127], &kAnimations[128], &kAnimations[129]};
+static const ObjAnimation * const kAnimationsTbl[] = {&kAnimations[0], &kAnimations[1], &kAnimations[2], &kAnimations[3], &kAnimations[4], &kAnimations[5], &kAnimations[6], &kAnimations[7], &kAnimations[16], &kAnimations[17], &kAnimations[18], &kAnimations[19], &kAnimations[20], &kAnimations[21], &kAnimations[22], &kAnimations[23], &kAnimations[24], &kAnimations[25], &kAnimations[26], &kAnimations[27], &kAnimations[28], &kAnimations[29], &kAnimations[30], &kAnimations[31], &kAnimations[32], &kAnimations[33], &kAnimations[42], &kAnimations[43], &kAnimations[44], &kAnimations[45], &kAnimations[46], &kAnimations[47], &kAnimations[48], &kAnimations[49], &kAnimations[50], &kAnimations[51], &kAnimations[52], &kAnimations[53], &kAnimations[54], &kAnimations[55], &kAnimations[56], &kAnimations[57], &kAnimations[58], &kAnimations[59], &kAnimations[68], &kAnimations[69], &kAnimations[70], &kAnimations[71], &kAnimations[72], &kAnimations[73], &kAnimations[74], &kAnimations[75], &kAnimations[76], &kAnimations[77], &kAnimations[78], &kAnimations[79], &kAnimations[80], &kAnimations[81], &kAnimations[82], &kAnimations[83], &kAnimations[84], &kAnimations[85], &kAnimations[94], &kAnimations[95], &kAnimations[96], &kAnimations[97], &kAnimations[98], &kAnimations[99], &kAnimations[100], &kAnimations[101], &kAnimations[102], &kAnimations[103], &kAnimations[104], &kAnimations[105], &kAnimations[106], &kAnimations[107], &kAnimations[108], &kAnimations[109], &kAnimations[110], &kAnimations[111], &kAnimations[120], &kAnimations[121], &kAnimations[122], &kAnimations[123], &kAnimations[124], &kAnimations[125], &kAnimations[126], &kAnimations[127], &kAnimations[128], &kAnimations[129]};
-static const ObjAnimation **kObjKindAnimTables[] = {
+static const ObjAnimation * const * const kObjKindAnimTables[] = {
0, &kAnimationsTbl[0],
&kAnimationsTbl[18], &kAnimationsTbl[36],
&kAnimationsTbl[54], &kAnimationsTbl[72]
@@ -746,7 +746,7 @@ const MinigameBbAnt::ObjInit *MinigameBbAnt::getObjInit(int index) {
return &kObjInits[index];
}
-const ObjAnimation **MinigameBbAnt::getObjKindAnimTable(int kind) {
+const ObjAnimation * const *MinigameBbAnt::getObjKindAnimTable(int kind) {
return kObjKindAnimTables[kind];
}