libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 14:50:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ACCESS: Fix compilation warning by adding a dummy inventory combo array for Martian

Browse Source
This commit is contained in:
Strangerke 2014-11-10 01:12:39 +01:00 committed by Paul Gilbert
parent 304db8ee6f
commit dd2bfdd47f
3 changed files with 61 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engines/access/inventory.cpp
View File

@ -69,6 +69,7 @@ InventoryManager::InventoryManager(AccessEngine *vm) : Manager(vm) {
break;
case GType_MartianMemorandum:
names = Martian::INVENTORY_NAMES;
combineP = &Martian::COMBO_TABLE[0][0];
_inv.resize(54);
break;
default:

58
engines/access/martian/martian_resources.cpp
View File

@ -659,6 +659,64 @@ const byte *CHAR_TABLE[] = {
CHAR_TABLE26, CHAR_TABLE27
};
// TODO: Fix that array
const int COMBO_TABLE[54][4] = {
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 },
{ -1, -1, -1, -1 }
};
} // End of namespace Martian
} // End of namespace Access

2
engines/access/martian/martian_resources.h
View File

@ -43,6 +43,8 @@ extern const int ROOM_NUMB;
extern const byte *CHAR_TABLE[];
extern const int COMBO_TABLE[54][4];
} // End of namespace Martian
} // End of namespace Access